Fix fourslash baselines

amcasey · amcasey · commit ece4e4f70181 · 2017-09-12T18:11:12.000-07:00
40e4591 was out of date in a way that didn't register as a conflict.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace NS {`
`6`	`6`	`}`
`7`	`7`	`function M3() { }`
`8`	`8`	`}`
`9`		`-// ==SCOPE::function 'M2'==`
	`9`	`+// ==SCOPE::inner function in function 'M2'==`
`10`	`10`	`namespace NS {`
`11`	`11`	`function M1() { }`
`12`	`12`	`function M2() {`
`@@ -18,7 +18,7 @@ namespace NS {`
`18`	`18`	`}`
`19`	`19`	`function M3() { }`
`20`	`20`	`}`
`21`		`-// ==SCOPE::namespace 'NS'==`
	`21`	`+// ==SCOPE::function in namespace 'NS'==`
`22`	`22`	`namespace NS {`
`23`	`23`	`function M1() { }`
`24`	`24`	`function M2() {`
`@@ -30,7 +30,7 @@ namespace NS {`
`30`	`30`
`31`	`31`	`function M3() { }`
`32`	`32`	`}`
`33`		`-// ==SCOPE::global scope==`
	`33`	`+// ==SCOPE::function in global scope==`
`34`	`34`	`namespace NS {`
`35`	`35`	`function M1() { }`
`36`	`36`	`function M2() {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ function Outer() {`
`6`	`6`	`}`
`7`	`7`	`function M3() { }`
`8`	`8`	`}`
`9`		`-// ==SCOPE::function 'M2'==`
	`9`	`+// ==SCOPE::inner function in function 'M2'==`
`10`	`10`	`function Outer() {`
`11`	`11`	`function M1() { }`
`12`	`12`	`function M2() {`
`@@ -18,7 +18,7 @@ function Outer() {`
`18`	`18`	`}`
`19`	`19`	`function M3() { }`
`20`	`20`	`}`
`21`		`-// ==SCOPE::function 'Outer'==`
	`21`	`+// ==SCOPE::inner function in function 'Outer'==`
`22`	`22`	`function Outer() {`
`23`	`23`	`function M1() { }`
`24`	`24`	`function M2() {`
`@@ -30,7 +30,7 @@ function Outer() {`
`30`	`30`
`31`	`31`	`function M3() { }`
`32`	`32`	`}`
`33`		`-// ==SCOPE::global scope==`
	`33`	`+// ==SCOPE::function in global scope==`
`34`	`34`	`function Outer() {`
`35`	`35`	`function M1() { }`
`36`	`36`	`function M2() {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ function M2() {`
`4`	`4`	`return 1;`
`5`	`5`	`}`
`6`	`6`	`function M3() { }`
`7`		`-// ==SCOPE::function 'M2'==`
	`7`	`+// ==SCOPE::inner function in function 'M2'==`
`8`	`8`	`function M1() { }`
`9`	`9`	`function M2() {`
`10`	`10`	`return newFunction();`
`@@ -14,7 +14,7 @@ function M2() {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`function M3() { }`
`17`		`-// ==SCOPE::global scope==`
	`17`	`+// ==SCOPE::function in global scope==`
`18`	`18`	`function M1() { }`
`19`	`19`	`function M2() {`
`20`	`20`	`return newFunction();`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class C {`
`6`	`6`	`}`
`7`	`7`	`M3() { }`
`8`	`8`	`}`
`9`		`-// ==SCOPE::class 'C'==`
	`9`	`+// ==SCOPE::method in class 'C'==`
`10`	`10`	`class C {`
`11`	`11`	`M1() { }`
`12`	`12`	`M2() {`
`@@ -18,7 +18,7 @@ class C {`
`18`	`18`
`19`	`19`	`M3() { }`
`20`	`20`	`}`
`21`		`-// ==SCOPE::global scope==`
	`21`	`+// ==SCOPE::function in global scope==`
`22`	`22`	`class C {`
`23`	`23`	`M1() { }`
`24`	`24`	`M2() {`