From ece4e4f701813855371e8302a1ac82c3a65a5f70 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Tue, 12 Sep 2017 18:11:12 -0700
Subject: [PATCH] Fix fourslash baselines

40e459117aeb0b792a23d6805af884b594dd42c4 was out of date in a way that
didn't register as a conflict.
---
 tests/baselines/reference/extractMethod/extractMethod23.ts | 6 +++---
 tests/baselines/reference/extractMethod/extractMethod24.ts | 6 +++---
 tests/baselines/reference/extractMethod/extractMethod25.ts | 4 ++--
 tests/baselines/reference/extractMethod/extractMethod26.ts | 4 ++--
 tests/baselines/reference/extractMethod/extractMethod27.ts | 4 ++--
 tests/baselines/reference/extractMethod/extractMethod28.ts | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/baselines/reference/extractMethod/extractMethod23.ts b/tests/baselines/reference/extractMethod/extractMethod23.ts
index 8bc3db86cc..0c56434447 100644
--- a/tests/baselines/reference/extractMethod/extractMethod23.ts
+++ b/tests/baselines/reference/extractMethod/extractMethod23.ts
@@ -6,7 +6,7 @@ namespace NS {
     }
     function M3() { }
 }
-// ==SCOPE::function 'M2'==
+// ==SCOPE::inner function in function 'M2'==
 namespace NS {
     function M1() { }
     function M2() {
@@ -18,7 +18,7 @@ namespace NS {
     }
     function M3() { }
 }
-// ==SCOPE::namespace 'NS'==
+// ==SCOPE::function in namespace 'NS'==
 namespace NS {
     function M1() { }
     function M2() {
@@ -30,7 +30,7 @@ namespace NS {
 
     function M3() { }
 }
-// ==SCOPE::global scope==
+// ==SCOPE::function in global scope==
 namespace NS {
     function M1() { }
     function M2() {
diff --git a/tests/baselines/reference/extractMethod/extractMethod24.ts b/tests/baselines/reference/extractMethod/extractMethod24.ts
index ec6d6cd3f1..0b33289708 100644
--- a/tests/baselines/reference/extractMethod/extractMethod24.ts
+++ b/tests/baselines/reference/extractMethod/extractMethod24.ts
@@ -6,7 +6,7 @@ function Outer() {
     }
     function M3() { }
 }
-// ==SCOPE::function 'M2'==
+// ==SCOPE::inner function in function 'M2'==
 function Outer() {
     function M1() { }
     function M2() {
@@ -18,7 +18,7 @@ function Outer() {
     }
     function M3() { }
 }
-// ==SCOPE::function 'Outer'==
+// ==SCOPE::inner function in function 'Outer'==
 function Outer() {
     function M1() { }
     function M2() {
@@ -30,7 +30,7 @@ function Outer() {
 
     function M3() { }
 }
-// ==SCOPE::global scope==
+// ==SCOPE::function in global scope==
 function Outer() {
     function M1() { }
     function M2() {
diff --git a/tests/baselines/reference/extractMethod/extractMethod25.ts b/tests/baselines/reference/extractMethod/extractMethod25.ts
index a7a971315a..c77ec1abbf 100644
--- a/tests/baselines/reference/extractMethod/extractMethod25.ts
+++ b/tests/baselines/reference/extractMethod/extractMethod25.ts
@@ -4,7 +4,7 @@ function M2() {
     return 1;
 }
 function M3() { }
-// ==SCOPE::function 'M2'==
+// ==SCOPE::inner function in function 'M2'==
 function M1() { }
 function M2() {
     return newFunction();
@@ -14,7 +14,7 @@ function M2() {
     }
 }
 function M3() { }
-// ==SCOPE::global scope==
+// ==SCOPE::function in global scope==
 function M1() { }
 function M2() {
     return newFunction();
diff --git a/tests/baselines/reference/extractMethod/extractMethod26.ts b/tests/baselines/reference/extractMethod/extractMethod26.ts
index d0619ea9b0..84dc82f7fe 100644
--- a/tests/baselines/reference/extractMethod/extractMethod26.ts
+++ b/tests/baselines/reference/extractMethod/extractMethod26.ts
@@ -6,7 +6,7 @@ class C {
     }
     M3() { }
 }
-// ==SCOPE::class 'C'==
+// ==SCOPE::method in class 'C'==
 class C {
     M1() { }
     M2() {
@@ -18,7 +18,7 @@ class C {
 
     M3() { }
 }
-// ==SCOPE::global scope==
+// ==SCOPE::function in global scope==
 class C {
     M1() { }
     M2() {
diff --git a/tests/baselines/reference/extractMethod/extractMethod27.ts b/tests/baselines/reference/extractMethod/extractMethod27.ts
index 9f1f1e84a7..ce21f1e1fe 100644
--- a/tests/baselines/reference/extractMethod/extractMethod27.ts
+++ b/tests/baselines/reference/extractMethod/extractMethod27.ts
@@ -7,7 +7,7 @@ class C {
     constructor() { }
     M3() { }
 }
-// ==SCOPE::class 'C'==
+// ==SCOPE::method in class 'C'==
 class C {
     M1() { }
     M2() {
@@ -20,7 +20,7 @@ class C {
 
     M3() { }
 }
-// ==SCOPE::global scope==
+// ==SCOPE::function in global scope==
 class C {
     M1() { }
     M2() {
diff --git a/tests/baselines/reference/extractMethod/extractMethod28.ts b/tests/baselines/reference/extractMethod/extractMethod28.ts
index 9b97e58154..e3d0fc3b9e 100644
--- a/tests/baselines/reference/extractMethod/extractMethod28.ts
+++ b/tests/baselines/reference/extractMethod/extractMethod28.ts
@@ -7,7 +7,7 @@ class C {
     M3() { }
     constructor() { }
 }
-// ==SCOPE::class 'C'==
+// ==SCOPE::method in class 'C'==
 class C {
     M1() { }
     M2() {
@@ -20,7 +20,7 @@ class C {
     M3() { }
     constructor() { }
 }
-// ==SCOPE::global scope==
+// ==SCOPE::function in global scope==
 class C {
     M1() { }
     M2() {