Include range markers in Extract Constant/Function baselines

src/harness/unittests/extractTestHelpers.ts

@@ -135,7 +135,7 @@ namespace ts {
             Harness.Baseline.runBaseline(`${baselineFolder}/${caption}${extension}`, () => {
                 const data: string[] = [];
                 data.push(`// ==ORIGINAL==`);
-                data.push(sourceFile.text);
+                data.push(text.replace("[#|", "/*[#|*/").replace("|]", "/*|]*/"));
                 for (const action of actions) {
                     const { renameLocation, edits } = refactor.extractSymbol.getEditsForAction(context, action.name);
                     assert.lengthOf(edits, 1);

tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 
 const f = () => {
-    return 2 + 1;
+    return /*[#|*/2 + 1/*|]*/;
 };
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 
 const f = () => {
-    return 2 + 1;
+    return /*[#|*/2 + 1/*|]*/;
 };
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.js

@@ -1,5 +1,5 @@
 // ==ORIGINAL==
-const f = () => 2 + 1;
+const f = () => /*[#|*/2 + 1/*|]*/;
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
 

tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.ts

@@ -1,5 +1,5 @@
 // ==ORIGINAL==
-const f = () => 2 + 1;
+const f = () => /*[#|*/2 + 1/*|]*/;
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 2 + 1;
 

tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js

@@ -2,7 +2,7 @@
 
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
-        const x = i + 1;
+        const x = /*[#|*/i + 1/*|]*/;
     }
 }
         

tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts

@@ -2,7 +2,7 @@
 
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
-        const x = i + 1;
+        const x = /*[#|*/i + 1/*|]*/;
     }
 }
         

tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 for (let i = 0; i < 10; i++) {
     for (let j = 0; j < 10; j++) {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_Class.js

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 class C {
-    x = 1;
+    x = /*[#|*/1/*|]*/;
 }
 // ==SCOPE::Extract to constant in global scope==
 const newLocal = 1;

tests/baselines/reference/extractConstant/extractConstant_Class.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 class C {
-    x = 1;
+    x = /*[#|*/1/*|]*/;
 }
 // ==SCOPE::Extract to readonly field in class 'C'==
 class C {

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js

@@ -5,7 +5,7 @@ class C {
     M1() { }
     M2() { }
     M3() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts

@@ -5,7 +5,7 @@ class C {
     M1() { }
     M2() { }
     M3() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js

@@ -5,7 +5,7 @@ class C {
     b = 2;
     M2() { }
     M3() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts

@@ -5,7 +5,7 @@ class C {
     b = 2;
     M2() { }
     M3() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js

@@ -5,7 +5,7 @@ class C {
     b = 2;
     M2() { }
     M3() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts

@@ -5,7 +5,7 @@ class C {
     b = 2;
     M2() { }
     M3() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_Directive.js

@@ -2,7 +2,7 @@
 
 "strict";
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_Directive.ts

@@ -2,7 +2,7 @@
 
 "strict";
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.js

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-"hello";
+/*[#|*/"hello";/*|]*/
 // ==SCOPE::Extract to constant in enclosing scope==
 const /*RENAME*/newLocal = "hello";

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.ts

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-"hello";
+/*[#|*/"hello";/*|]*/
 // ==SCOPE::Extract to constant in enclosing scope==
 const /*RENAME*/newLocal = "hello";

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.js

@@ -2,7 +2,7 @@
 
 function F() {
     let i = 0;
-    i++;
+    /*[#|*/i++/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.ts

@@ -2,7 +2,7 @@
 
 function F() {
     let i = 0;
-    i++;
+    /*[#|*/i++/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.js

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-"hello";
+/*[#|*/"hello"/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const /*RENAME*/newLocal = "hello";

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.ts

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-"hello";
+/*[#|*/"hello"/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const /*RENAME*/newLocal = "hello";

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.js

@@ -2,7 +2,7 @@
 
 let i = 0;
 function F() {
-    i++;
+    /*[#|*/i++/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.ts

@@ -2,7 +2,7 @@
 
 let i = 0;
 function F() {
-    i++;
+    /*[#|*/i++/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_Function.js

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F() {
-    let x = 1;
+    let x = /*[#|*/1/*|]*/;
 }
 // ==SCOPE::Extract to constant in enclosing scope==
 function F() {

tests/baselines/reference/extractConstant/extractConstant_Function.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F() {
-    let x = 1;
+    let x = /*[#|*/1/*|]*/;
 }
 // ==SCOPE::Extract to constant in enclosing scope==
 function F() {

tests/baselines/reference/extractConstant/extractConstant_Method.js

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 class C {
     M() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_Method.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 class C {
     M() {
-        let x = 1;
+        let x = /*[#|*/1/*|]*/;
     }
 }
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.js

@@ -6,7 +6,7 @@
 
 "strict";
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.ts

@@ -6,7 +6,7 @@
 
 "strict";
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_Namespace.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 namespace N {
-    let x = 1;
+    let x = /*[#|*/1/*|]*/;
 }
 // ==SCOPE::Extract to constant in enclosing scope==
 namespace N {

tests/baselines/reference/extractConstant/extractConstant_Parameters.js

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 function F() {
     let w = 1;
-    let x = w + 1;
+    let x = /*[#|*/w + 1/*|]*/;
 }
 // ==SCOPE::Extract to constant in enclosing scope==
 function F() {

tests/baselines/reference/extractConstant/extractConstant_Parameters.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 function F() {
     let w = 1;
-    let x = w + 1;
+    let x = /*[#|*/w + 1/*|]*/;
 }
 // ==SCOPE::Extract to constant in enclosing scope==
 function F() {

tests/baselines/reference/extractConstant/extractConstant_PinnedComment.js

@@ -2,7 +2,7 @@
 
 /*! Copyright */
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_PinnedComment.ts

@@ -2,7 +2,7 @@
 
 /*! Copyright */
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.js

@@ -3,7 +3,7 @@
 /*! Copyright */
 
 /* About x */
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.ts

@@ -3,7 +3,7 @@
 /*! Copyright */
 
 /* About x */
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 namespace X {
     export const j = 10;
-    export const y = j * j;
+    export const y = /*[#|*/j * j/*|]*/;
 }
 // ==SCOPE::Extract to constant in enclosing scope==
 namespace X {

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.js

@@ -2,7 +2,7 @@
 
 const i = 0;
 for (let j = 0; j < 10; j++) {
-    const x = i + 1;
+    const x = /*[#|*/i + 1/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.ts

@@ -2,7 +2,7 @@
 
 const i = 0;
 for (let j = 0; j < 10; j++) {
-    const x = i + 1;
+    const x = /*[#|*/i + 1/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.js

@@ -3,7 +3,7 @@
 const i = 0;
 function F() {
     for (let j = 0; j < 10; j++) {
-        const x = i + 1;
+        const x = /*[#|*/i + 1/*|]*/;
     }
 }
         

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.ts

@@ -3,7 +3,7 @@
 const i = 0;
 function F() {
     for (let j = 0; j < 10; j++) {
-        const x = i + 1;
+        const x = /*[#|*/i + 1/*|]*/;
     }
 }
         

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.js

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 
 for (let j = 0; j < 10; j++) {
-    const x = 2 + 1;
+    const x = /*[#|*/2 + 1/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 
 for (let j = 0; j < 10; j++) {
-    const x = 2 + 1;
+    const x = /*[#|*/2 + 1/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in enclosing scope==

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js

@@ -2,7 +2,7 @@
 
 function F() {
     for (let j = 0; j < 10; j++) {
-        const x = 2 + 1;
+        const x = /*[#|*/2 + 1/*|]*/;
     }
 }
         

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts

@@ -2,7 +2,7 @@
 
 function F() {
     for (let j = 0; j < 10; j++) {
-        const x = 2 + 1;
+        const x = /*[#|*/2 + 1/*|]*/;
     }
 }
         

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js

@@ -2,7 +2,7 @@
 
 function F0() {
     function F1() {
-        function F2(x = 2 + 1) {
+        function F2(x = /*[#|*/2 + 1/*|]*/) {
         }
     }
 }

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts

@@ -2,7 +2,7 @@
 
 function F0() {
     function F1() {
-        function F2(x = 2 + 1) {
+        function F2(x = /*[#|*/2 + 1/*|]*/) {
         }
     }
 }

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.js

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 
 class C {
-    x = 2 + 1;
+    x = /*[#|*/2 + 1/*|]*/;
 }
         
 // ==SCOPE::Extract to constant in global scope==

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 
 class C {
-    x = 2 + 1;
+    x = /*[#|*/2 + 1/*|]*/;
 }
         
 // ==SCOPE::Extract to readonly field in class 'C'==

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.js

@@ -4,7 +4,7 @@ const i = 0;
 class C {
     M() {
         for (let j = 0; j < 10; j++) {
-            x = i + 1;
+            x = /*[#|*/i + 1/*|]*/;
         }
     }
 }

tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.ts

@@ -4,7 +4,7 @@ const i = 0;
 class C {
     M() {
         for (let j = 0; j < 10; j++) {
-            x = i + 1;
+            x = /*[#|*/i + 1/*|]*/;
         }
     }
 }

tests/baselines/reference/extractConstant/extractConstant_TopLevel.js

@@ -1,5 +1,5 @@
 // ==ORIGINAL==
-let x = 1;
+let x = /*[#|*/1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const newLocal = 1;
 

tests/baselines/reference/extractConstant/extractConstant_TopLevel.ts

@@ -1,5 +1,5 @@
 // ==ORIGINAL==
-let x = 1;
+let x = /*[#|*/1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const newLocal = 1;
 

tests/baselines/reference/extractConstant/extractConstant_TripleSlash.js

@@ -2,7 +2,7 @@
 
 /// <reference path="path.js"/>
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_TripleSlash.ts

@@ -2,7 +2,7 @@
 
 /// <reference path="path.js"/>
 
-const x = 2 + 1;
+const x = /*[#|*/2 + 1/*|]*/;
         
 // ==SCOPE::Extract to constant in enclosing scope==
 

tests/baselines/reference/extractConstant/extractConstant_TypeParameters.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F<T>(t: T) {
-    let x = t + 1;
+    let x = /*[#|*/t + 1/*|]*/;
 }
 // ==SCOPE::Extract to constant in enclosing scope==
 function F<T>(t: T) {

tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.js

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 const /*About A*/a = 1,
-    /*About B*/b = a + 1;
+    /*About B*/b = /*[#|*/a + 1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const /*About A*/a = 1,
     /*About B*/newLocal = a + 1, b = /*RENAME*/newLocal;

tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 const /*About A*/a = 1,
-    /*About B*/b = a + 1;
+    /*About B*/b = /*[#|*/a + 1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const /*About A*/a = 1,
     /*About B*/newLocal = a + 1, b = /*RENAME*/newLocal;

tests/baselines/reference/extractConstant/extractConstant_VariableList_const.js

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-const a = 1, b = a + 1;
+const a = 1, b = /*[#|*/a + 1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const a = 1, newLocal = a + 1, b = /*RENAME*/newLocal;

tests/baselines/reference/extractConstant/extractConstant_VariableList_const.ts

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-const a = 1, b = a + 1;
+const a = 1, b = /*[#|*/a + 1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 const a = 1, newLocal = a + 1, b = /*RENAME*/newLocal;

tests/baselines/reference/extractConstant/extractConstant_VariableList_let.js

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-let a = 1, b = a + 1;
+let a = 1, b = /*[#|*/a + 1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 let a = 1, newLocal = a + 1, b = /*RENAME*/newLocal;

tests/baselines/reference/extractConstant/extractConstant_VariableList_let.ts

@@ -1,4 +1,4 @@
 // ==ORIGINAL==
-let a = 1, b = a + 1;
+let a = 1, b = /*[#|*/a + 1/*|]*/;
 // ==SCOPE::Extract to constant in enclosing scope==
 let a = 1, newLocal = a + 1, b = /*RENAME*/newLocal;

tests/baselines/reference/extractFunction/extractFunction1.ts

@@ -6,11 +6,11 @@ namespace A {
     namespace B {
         function a() {
             let a = 1;
-        
+        /*[#|*/
             let y = 5;
             let z = x;
             a = y;
-            foo();
+            foo();/*|]*/
         }
     }
 }

tests/baselines/reference/extractFunction/extractFunction10.ts

@@ -4,8 +4,8 @@ namespace A {
     class C {
         a() {
             let z = 1;
-            let a1: I = { x: 1 };
-            return a1.x + 10;
+            /*[#|*/let a1: I = { x: 1 };
+            return a1.x + 10;/*|]*/
         }
     }
 }

tests/baselines/reference/extractFunction/extractFunction11.ts

@@ -4,10 +4,10 @@ namespace A {
     class C {
         a() {
             let z = 1;
-            let a1 = { x: 1 };
+            /*[#|*/let a1 = { x: 1 };
             y = 10;
             z = 42;
-            return a1.x + 10;
+            return a1.x + 10;/*|]*/
         }
     }
 }

tests/baselines/reference/extractFunction/extractFunction12.ts

@@ -5,11 +5,11 @@ namespace A {
         b() {}
         a() {
             let z = 1;
-            let a1 = { x: 1 };
+            /*[#|*/let a1 = { x: 1 };
             y = 10;
             z = 42;
             this.b();
-            return a1.x + 10;
+            return a1.x + 10;/*|]*/
         }
     }
 }

tests/baselines/reference/extractFunction/extractFunction13.ts

@@ -4,11 +4,11 @@
         <U2a, U2b>(u2a: U2a, u2b: U2b) => {
             function F2<T2a, T2b>(t2a: T2a, t2b: T2b) {
                 <U3a, U3b>(u3a: U3a, u3b: U3b) => {
-                        t1a.toString();
+                        /*[#|*/t1a.toString();
                         t2a.toString();
                         u1a.toString();
                         u2a.toString();
-                        u3a.toString();
+                        u3a.toString();/*|]*/
                 }
             }
         }

tests/baselines/reference/extractFunction/extractFunction14.ts

@@ -1,8 +1,8 @@
 // ==ORIGINAL==
 function F<T>(t1: T) {
     function G<T>(t2: T) {
-        t1.toString();
-        t2.toString();
+        /*[#|*/t1.toString();
+        t2.toString();/*|]*/
     }
 }
 // ==SCOPE::Extract to inner function in function 'G'==

tests/baselines/reference/extractFunction/extractFunction15.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 function F<T>(t1: T) {
     function G<U extends T[]>(t2: U) {
-        t2.toString();
+        /*[#|*/t2.toString();/*|]*/
     }
 }
 // ==SCOPE::Extract to inner function in function 'G'==

tests/baselines/reference/extractFunction/extractFunction16.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F<T>() {
-    const array: T[] = [];
+    const array: T[] = /*[#|*/[]/*|]*/;
 }
 // ==SCOPE::Extract to inner function in function 'F'==
 function F<T>() {

tests/baselines/reference/extractFunction/extractFunction17.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 class C<T1, T2> {
     M(t1: T1, t2: T2) {
-        t1.toString();
+        /*[#|*/t1.toString()/*|]*/;
     }
 }
 // ==SCOPE::Extract to method in class 'C'==

tests/baselines/reference/extractFunction/extractFunction18.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 class C {
     M<T1, T2>(t1: T1, t2: T2) {
-        t1.toString();
+        /*[#|*/t1.toString()/*|]*/;
     }
 }
 // ==SCOPE::Extract to method in class 'C'==

tests/baselines/reference/extractFunction/extractFunction19.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F<T, U extends T[], V extends U[]>(v: V) {
-    v.toString();
+    /*[#|*/v.toString()/*|]*/;
 }
 // ==SCOPE::Extract to inner function in function 'F'==
 function F<T, U extends T[], V extends U[]>(v: V) {

tests/baselines/reference/extractFunction/extractFunction2.ts

@@ -5,10 +5,10 @@ namespace A {
     }
     namespace B {
         function a() {
-        
+        /*[#|*/
             let y = 5;
             let z = x;
-            return foo();
+            return foo();/*|]*/
         }
     }
 }

tests/baselines/reference/extractFunction/extractFunction20.js

@@ -1,8 +1,8 @@
 // ==ORIGINAL==
 const _ = class {
     a() {
-        let a1 = { x: 1 };
-        return a1.x + 10;
+        /*[#|*/let a1 = { x: 1 };
+        return a1.x + 10;/*|]*/
     }
 }
 // ==SCOPE::Extract to method in anonymous class expression==

tests/baselines/reference/extractFunction/extractFunction20.ts

@@ -1,8 +1,8 @@
 // ==ORIGINAL==
 const _ = class {
     a() {
-        let a1 = { x: 1 };
-        return a1.x + 10;
+        /*[#|*/let a1 = { x: 1 };
+        return a1.x + 10;/*|]*/
     }
 }
 // ==SCOPE::Extract to method in anonymous class expression==

tests/baselines/reference/extractFunction/extractFunction21.js

@@ -1,8 +1,8 @@
 // ==ORIGINAL==
 function foo() {
     let x = 10;
-    x++;
-    return;
+    /*[#|*/x++;
+    return;/*|]*/
 }
 // ==SCOPE::Extract to inner function in function 'foo'==
 function foo() {

tests/baselines/reference/extractFunction/extractFunction21.ts

@@ -1,8 +1,8 @@
 // ==ORIGINAL==
 function foo() {
     let x = 10;
-    x++;
-    return;
+    /*[#|*/x++;
+    return;/*|]*/
 }
 // ==SCOPE::Extract to inner function in function 'foo'==
 function foo() {

tests/baselines/reference/extractFunction/extractFunction22.js

@@ -3,7 +3,7 @@ function test() {
     try {
     }
     finally {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
 }
 // ==SCOPE::Extract to inner function in function 'test'==

tests/baselines/reference/extractFunction/extractFunction22.ts

@@ -3,7 +3,7 @@ function test() {
     try {
     }
     finally {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
 }
 // ==SCOPE::Extract to inner function in function 'test'==

tests/baselines/reference/extractFunction/extractFunction23.ts

@@ -2,7 +2,7 @@
 namespace NS {
     function M1() { }
     function M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     function M3() { }
 }

tests/baselines/reference/extractFunction/extractFunction24.js

@@ -2,7 +2,7 @@
 function Outer() {
     function M1() { }
     function M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     function M3() { }
 }

tests/baselines/reference/extractFunction/extractFunction24.ts

@@ -2,7 +2,7 @@
 function Outer() {
     function M1() { }
     function M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     function M3() { }
 }

tests/baselines/reference/extractFunction/extractFunction25.js

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 function M1() { }
 function M2() {
-    return 1;
+    /*[#|*/return 1;/*|]*/
 }
 function M3() { }
 // ==SCOPE::Extract to inner function in function 'M2'==

tests/baselines/reference/extractFunction/extractFunction25.ts

@@ -1,7 +1,7 @@
 // ==ORIGINAL==
 function M1() { }
 function M2() {
-    return 1;
+    /*[#|*/return 1;/*|]*/
 }
 function M3() { }
 // ==SCOPE::Extract to inner function in function 'M2'==

tests/baselines/reference/extractFunction/extractFunction26.js

@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
 }

tests/baselines/reference/extractFunction/extractFunction26.ts

@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
 }

tests/baselines/reference/extractFunction/extractFunction27.js

@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     constructor() { }
     M3() { }

tests/baselines/reference/extractFunction/extractFunction27.ts

@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     constructor() { }
     M3() { }

tests/baselines/reference/extractFunction/extractFunction28.js

@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
     constructor() { }

tests/baselines/reference/extractFunction/extractFunction28.ts

@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
     constructor() { }

tests/baselines/reference/extractFunction/extractFunction29.ts

@@ -6,11 +6,11 @@ interface UnaryExpression {
 }
 
 function parseUnaryExpression(operator: string): UnaryExpression {
-    return {
+    /*[#|*/return {
         kind: "Unary",
         operator,
         operand: parsePrimaryExpression(),
-    };
+    };/*|]*/
 }
 
 function parsePrimaryExpression(): any {

tests/baselines/reference/extractFunction/extractFunction3.ts

@@ -4,10 +4,10 @@ namespace A {
     }
     namespace B {
         function* a(z: number) {
-        
+        /*[#|*/
             let y = 5;
             yield z;
-            return foo();
+            return foo();/*|]*/
         }
     }
 }

tests/baselines/reference/extractFunction/extractFunction30.ts

@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F<T>() {
-    let t: T;
+    /*[#|*/let t: T;/*|]*/
 }
 // ==SCOPE::Extract to inner function in function 'F'==
 function F<T>() {

tests/baselines/reference/extractFunction/extractFunction31.ts

@@ -5,9 +5,9 @@ namespace N {
 
     () => {
         var f: () => number;
-        f = function (): number {
+        /*[#|*/f = function (): number {
             return value;
-        }
+        }/*|]*/
     }
 }
 // ==SCOPE::Extract to function in namespace 'N'==

tests/baselines/reference/extractFunction/extractFunction32.ts

@@ -4,11 +4,11 @@ namespace N {
     export const value = 1;
 
     () => {
-        var c = class {
+        /*[#|*/var c = class {
             M() {
                 return value;
             }
-        }
+        }/*|]*/
     }
 }
 // ==SCOPE::Extract to function in namespace 'N'==