diff --git a/src/harness/unittests/extractTestHelpers.ts b/src/harness/unittests/extractTestHelpers.ts
index 0d739919e1f..1b51cdadc27 100644
--- a/src/harness/unittests/extractTestHelpers.ts
+++ b/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);
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js
index 06dbf2b1751..5e994ae5050 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.js
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts
index 06dbf2b1751..5e994ae5050 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Block.ts
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.js b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.js
index d04cdcd3280..76902f4db93 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.js
+++ b/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;
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.ts b/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.ts
index d04cdcd3280..76902f4db93 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ArrowFunction_Expression.ts
+++ b/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;
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js b/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js
index 65871513e18..8231aa543c4 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.js
+++ b/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/*|]*/;
     }
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts b/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts
index 65871513e18..8231aa543c4 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_BlockScopeMismatch.ts
+++ b/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/*|]*/;
     }
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js b/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js
index 4446502920a..4880ee263c5 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts b/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts
index 4446502920a..4880ee263c5 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_BlockScopes_NoDependencies.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Class.js b/tests/baselines/reference/extractConstant/extractConstant_Class.js
index 6b581141cd6..1e98f8c54d0 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Class.js
+++ b/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;
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Class.ts b/tests/baselines/reference/extractConstant/extractConstant_Class.ts
index eb06cf6c0cf..2c307fc64af 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Class.ts
+++ b/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 {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js
index 6fa63a655f5..fa2611caaf7 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts
index 15c5d22a34b..dc703945af7 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition1.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js
index 3273cfbeaa0..1bd3e03377c 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts
index 777173b0dcd..f95efd91286 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition2.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js
index b990075166e..aaa948b77f5 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts b/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts
index 516a24b8b20..10454eab67f 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ClassInsertionPosition3.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Directive.js b/tests/baselines/reference/extractConstant/extractConstant_Directive.js
index 85b9ff76200..b15099c7dd3 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Directive.js
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Directive.ts b/tests/baselines/reference/extractConstant/extractConstant_Directive.ts
index 85b9ff76200..b15099c7dd3 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Directive.ts
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.js b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.js
index c3ccdde3b4f..f15e53a0ac5 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.js
+++ b/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";
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.ts b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.ts
index c3ccdde3b4f..f15e53a0ac5 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatement.ts
+++ b/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";
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.js b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.js
index b57da0d8e8c..b7993911d03 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.ts b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.ts
index b57da0d8e8c..b7993911d03 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementConsumesLocal.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.js b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.js
index c3ccdde3b4f..447e1a308b7 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.js
+++ b/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";
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.ts b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.ts
index c3ccdde3b4f..447e1a308b7 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementExpression.ts
+++ b/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";
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.js b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.js
index f76af9e9390..51c2c07eed8 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.ts b/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.ts
index f76af9e9390..51c2c07eed8 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_ExpressionStatementInNestedScope.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Function.js b/tests/baselines/reference/extractConstant/extractConstant_Function.js
index cff41806566..68b4f83221f 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Function.js
+++ b/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() {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Function.ts b/tests/baselines/reference/extractConstant/extractConstant_Function.ts
index cff41806566..68b4f83221f 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Function.ts
+++ b/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() {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Method.js b/tests/baselines/reference/extractConstant/extractConstant_Method.js
index 32b74d00576..95b719ade0d 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Method.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Method.ts b/tests/baselines/reference/extractConstant/extractConstant_Method.ts
index 5514b702597..43779492e70 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Method.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.js b/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.js
index 2ccf5932d38..52ea400a0f6 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.js
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.ts b/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.ts
index 2ccf5932d38..52ea400a0f6 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_MultipleHeaders.ts
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Namespace.ts b/tests/baselines/reference/extractConstant/extractConstant_Namespace.ts
index 81a543d29c4..c9937eb1869 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Namespace.ts
+++ b/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 {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Parameters.js b/tests/baselines/reference/extractConstant/extractConstant_Parameters.js
index b90f78d96af..6c657f9d5ed 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Parameters.js
+++ b/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() {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_Parameters.ts b/tests/baselines/reference/extractConstant/extractConstant_Parameters.ts
index b90f78d96af..6c657f9d5ed 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_Parameters.ts
+++ b/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() {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.js b/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.js
index cc897b5c6b9..64620d817c6 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.js
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.ts b/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.ts
index cc897b5c6b9..64620d817c6 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_PinnedComment.ts
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.js b/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.js
index 9ee07c7cd6a..9a3e7322355 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.js
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.ts b/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.ts
index 9ee07c7cd6a..9a3e7322355 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_PinnedCommentAndDocComment.ts
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts b/tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts
index da92e8be933..165852813f0 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_RepeatedSubstitution.ts
+++ b/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 {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.js
index 2197dd13e3a..618407155ee 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.ts
index 2197dd13e3a..618407155ee 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition1.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.js
index 900798c19ab..5d279a42aa1 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.js
+++ b/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/*|]*/;
     }
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.ts
index 900798c19ab..5d279a42aa1 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition2.ts
+++ b/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/*|]*/;
     }
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.js
index 3f2f7089ef3..bf970bf4ec7 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.ts
index 3f2f7089ef3..bf970bf4ec7 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition3.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js
index 4c7c2a50217..b8eeb8cdfa5 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.js
+++ b/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/*|]*/;
     }
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts
index 4c7c2a50217..b8eeb8cdfa5 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition4.ts
+++ b/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/*|]*/;
     }
 }
         
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js
index 4b9647fa445..9ecdbd05502 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.js
+++ b/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/*|]*/) {
         }
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts
index 4b9647fa445..9ecdbd05502 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition5.ts
+++ b/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/*|]*/) {
         }
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.js
index 0c81cb756a1..b39af4525a1 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.js
+++ b/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==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.ts
index 44a3456fc23..82d48157720 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition6.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.js b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.js
index f23db0c4aa9..0eb1d12fd48 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.js
+++ b/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/*|]*/;
         }
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.ts b/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.ts
index 6867685d6db..42651d6340b 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_StatementInsertionPosition7.ts
+++ b/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/*|]*/;
         }
     }
 }
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TopLevel.js b/tests/baselines/reference/extractConstant/extractConstant_TopLevel.js
index fc83d32123e..a6eeb89b7e9 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_TopLevel.js
+++ b/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;
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TopLevel.ts b/tests/baselines/reference/extractConstant/extractConstant_TopLevel.ts
index fc83d32123e..a6eeb89b7e9 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_TopLevel.ts
+++ b/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;
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.js b/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.js
index e5f87e5d8b8..5479d022a01 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.js
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.ts b/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.ts
index e5f87e5d8b8..5479d022a01 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_TripleSlash.ts
+++ b/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==
 
diff --git a/tests/baselines/reference/extractConstant/extractConstant_TypeParameters.ts b/tests/baselines/reference/extractConstant/extractConstant_TypeParameters.ts
index f9367ab787c..8e6ff785278 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_TypeParameters.ts
+++ b/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) {
diff --git a/tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.js b/tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.js
index 18bb4afc28f..7112dc6313d 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.js
+++ b/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;
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.ts b/tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.ts
index 18bb4afc28f..7112dc6313d 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_VariableList_MultipleLines.ts
+++ b/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;
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_VariableList_const.js b/tests/baselines/reference/extractConstant/extractConstant_VariableList_const.js
index 161e5a6a02f..5dd37a7213f 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_VariableList_const.js
+++ b/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;
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_VariableList_const.ts b/tests/baselines/reference/extractConstant/extractConstant_VariableList_const.ts
index 161e5a6a02f..5dd37a7213f 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_VariableList_const.ts
+++ b/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;
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_VariableList_let.js b/tests/baselines/reference/extractConstant/extractConstant_VariableList_let.js
index bc05b13ba7e..9a65c59c78a 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_VariableList_let.js
+++ b/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;
\ No newline at end of file
diff --git a/tests/baselines/reference/extractConstant/extractConstant_VariableList_let.ts b/tests/baselines/reference/extractConstant/extractConstant_VariableList_let.ts
index bc05b13ba7e..9a65c59c78a 100644
--- a/tests/baselines/reference/extractConstant/extractConstant_VariableList_let.ts
+++ b/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;
\ No newline at end of file
diff --git a/tests/baselines/reference/extractFunction/extractFunction1.ts b/tests/baselines/reference/extractFunction/extractFunction1.ts
index 74303bbf3e1..8243644e1ef 100644
--- a/tests/baselines/reference/extractFunction/extractFunction1.ts
+++ b/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();/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction10.ts b/tests/baselines/reference/extractFunction/extractFunction10.ts
index 65fbc9fb4c9..a15381c1a18 100644
--- a/tests/baselines/reference/extractFunction/extractFunction10.ts
+++ b/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;/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction11.ts b/tests/baselines/reference/extractFunction/extractFunction11.ts
index 55472063055..d07a1826439 100644
--- a/tests/baselines/reference/extractFunction/extractFunction11.ts
+++ b/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;/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction12.ts b/tests/baselines/reference/extractFunction/extractFunction12.ts
index c8f066657a2..37274bdcc87 100644
--- a/tests/baselines/reference/extractFunction/extractFunction12.ts
+++ b/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;/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction13.ts b/tests/baselines/reference/extractFunction/extractFunction13.ts
index c40f29711f4..4987039d5da 100644
--- a/tests/baselines/reference/extractFunction/extractFunction13.ts
+++ b/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();/*|]*/
                 }
             }
         }
diff --git a/tests/baselines/reference/extractFunction/extractFunction14.ts b/tests/baselines/reference/extractFunction/extractFunction14.ts
index 943c8250edd..53cabbe600f 100644
--- a/tests/baselines/reference/extractFunction/extractFunction14.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction15.ts b/tests/baselines/reference/extractFunction/extractFunction15.ts
index b6e3e0f04b6..a09383282aa 100644
--- a/tests/baselines/reference/extractFunction/extractFunction15.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction16.ts b/tests/baselines/reference/extractFunction/extractFunction16.ts
index 223307ff349..79c72f31198 100644
--- a/tests/baselines/reference/extractFunction/extractFunction16.ts
+++ b/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>() {
diff --git a/tests/baselines/reference/extractFunction/extractFunction17.ts b/tests/baselines/reference/extractFunction/extractFunction17.ts
index e1f20af6867..733b1b27623 100644
--- a/tests/baselines/reference/extractFunction/extractFunction17.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction18.ts b/tests/baselines/reference/extractFunction/extractFunction18.ts
index 775a1f3ed15..8c44de12981 100644
--- a/tests/baselines/reference/extractFunction/extractFunction18.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction19.ts b/tests/baselines/reference/extractFunction/extractFunction19.ts
index e9107198b18..3a2723513f4 100644
--- a/tests/baselines/reference/extractFunction/extractFunction19.ts
+++ b/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) {
diff --git a/tests/baselines/reference/extractFunction/extractFunction2.ts b/tests/baselines/reference/extractFunction/extractFunction2.ts
index 201dd173adc..3872812b312 100644
--- a/tests/baselines/reference/extractFunction/extractFunction2.ts
+++ b/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();/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction20.js b/tests/baselines/reference/extractFunction/extractFunction20.js
index 455fee113fb..b65d3dae5da 100644
--- a/tests/baselines/reference/extractFunction/extractFunction20.js
+++ b/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==
diff --git a/tests/baselines/reference/extractFunction/extractFunction20.ts b/tests/baselines/reference/extractFunction/extractFunction20.ts
index 723d8a99ca6..1fe72020ad7 100644
--- a/tests/baselines/reference/extractFunction/extractFunction20.ts
+++ b/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==
diff --git a/tests/baselines/reference/extractFunction/extractFunction21.js b/tests/baselines/reference/extractFunction/extractFunction21.js
index af7928a039f..4454f36ac62 100644
--- a/tests/baselines/reference/extractFunction/extractFunction21.js
+++ b/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() {
diff --git a/tests/baselines/reference/extractFunction/extractFunction21.ts b/tests/baselines/reference/extractFunction/extractFunction21.ts
index b0469d81384..530a10bea95 100644
--- a/tests/baselines/reference/extractFunction/extractFunction21.ts
+++ b/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() {
diff --git a/tests/baselines/reference/extractFunction/extractFunction22.js b/tests/baselines/reference/extractFunction/extractFunction22.js
index 09fbc7a5b82..60891105c6e 100644
--- a/tests/baselines/reference/extractFunction/extractFunction22.js
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction22.ts b/tests/baselines/reference/extractFunction/extractFunction22.ts
index 09fbc7a5b82..60891105c6e 100644
--- a/tests/baselines/reference/extractFunction/extractFunction22.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction23.ts b/tests/baselines/reference/extractFunction/extractFunction23.ts
index 1a0eaf098fd..3092d6490ba 100644
--- a/tests/baselines/reference/extractFunction/extractFunction23.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction23.ts
@@ -2,7 +2,7 @@
 namespace NS {
     function M1() { }
     function M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     function M3() { }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction24.js b/tests/baselines/reference/extractFunction/extractFunction24.js
index 7b80180c5d3..dbac567afc6 100644
--- a/tests/baselines/reference/extractFunction/extractFunction24.js
+++ b/tests/baselines/reference/extractFunction/extractFunction24.js
@@ -2,7 +2,7 @@
 function Outer() {
     function M1() { }
     function M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     function M3() { }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction24.ts b/tests/baselines/reference/extractFunction/extractFunction24.ts
index 7b80180c5d3..dbac567afc6 100644
--- a/tests/baselines/reference/extractFunction/extractFunction24.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction24.ts
@@ -2,7 +2,7 @@
 function Outer() {
     function M1() { }
     function M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     function M3() { }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction25.js b/tests/baselines/reference/extractFunction/extractFunction25.js
index 3233c404307..8afa266246d 100644
--- a/tests/baselines/reference/extractFunction/extractFunction25.js
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction25.ts b/tests/baselines/reference/extractFunction/extractFunction25.ts
index 3233c404307..8afa266246d 100644
--- a/tests/baselines/reference/extractFunction/extractFunction25.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction26.js b/tests/baselines/reference/extractFunction/extractFunction26.js
index ccc4bacb477..c05af641d4b 100644
--- a/tests/baselines/reference/extractFunction/extractFunction26.js
+++ b/tests/baselines/reference/extractFunction/extractFunction26.js
@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction26.ts b/tests/baselines/reference/extractFunction/extractFunction26.ts
index 6f4d85c7801..37eba24bfde 100644
--- a/tests/baselines/reference/extractFunction/extractFunction26.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction26.ts
@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction27.js b/tests/baselines/reference/extractFunction/extractFunction27.js
index 1f894d17bad..96bca6b24c5 100644
--- a/tests/baselines/reference/extractFunction/extractFunction27.js
+++ b/tests/baselines/reference/extractFunction/extractFunction27.js
@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     constructor() { }
     M3() { }
diff --git a/tests/baselines/reference/extractFunction/extractFunction27.ts b/tests/baselines/reference/extractFunction/extractFunction27.ts
index 3426c4ec5c3..335d74e002d 100644
--- a/tests/baselines/reference/extractFunction/extractFunction27.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction27.ts
@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     constructor() { }
     M3() { }
diff --git a/tests/baselines/reference/extractFunction/extractFunction28.js b/tests/baselines/reference/extractFunction/extractFunction28.js
index d205edbd4bf..a82b864448d 100644
--- a/tests/baselines/reference/extractFunction/extractFunction28.js
+++ b/tests/baselines/reference/extractFunction/extractFunction28.js
@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
     constructor() { }
diff --git a/tests/baselines/reference/extractFunction/extractFunction28.ts b/tests/baselines/reference/extractFunction/extractFunction28.ts
index b6e94cb47c5..bde2661f934 100644
--- a/tests/baselines/reference/extractFunction/extractFunction28.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction28.ts
@@ -2,7 +2,7 @@
 class C {
     M1() { }
     M2() {
-        return 1;
+        /*[#|*/return 1;/*|]*/
     }
     M3() { }
     constructor() { }
diff --git a/tests/baselines/reference/extractFunction/extractFunction29.ts b/tests/baselines/reference/extractFunction/extractFunction29.ts
index 9baea5870f5..492db8e6df9 100644
--- a/tests/baselines/reference/extractFunction/extractFunction29.ts
+++ b/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 {
diff --git a/tests/baselines/reference/extractFunction/extractFunction3.ts b/tests/baselines/reference/extractFunction/extractFunction3.ts
index b5ae7592157..9c4c1aaa9d7 100644
--- a/tests/baselines/reference/extractFunction/extractFunction3.ts
+++ b/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();/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction30.ts b/tests/baselines/reference/extractFunction/extractFunction30.ts
index 35b86b668ff..b57b48c30a9 100644
--- a/tests/baselines/reference/extractFunction/extractFunction30.ts
+++ b/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>() {
diff --git a/tests/baselines/reference/extractFunction/extractFunction31.ts b/tests/baselines/reference/extractFunction/extractFunction31.ts
index 77120091828..d7252a14011 100644
--- a/tests/baselines/reference/extractFunction/extractFunction31.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction32.ts b/tests/baselines/reference/extractFunction/extractFunction32.ts
index 529b81e8f9b..4070763b79f 100644
--- a/tests/baselines/reference/extractFunction/extractFunction32.ts
+++ b/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'==
diff --git a/tests/baselines/reference/extractFunction/extractFunction33.js b/tests/baselines/reference/extractFunction/extractFunction33.js
index fd716646e66..46c0f176b56 100644
--- a/tests/baselines/reference/extractFunction/extractFunction33.js
+++ b/tests/baselines/reference/extractFunction/extractFunction33.js
@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F() {
-    function G() { }
+    /*[#|*/function G() { }/*|]*/
 }
 // ==SCOPE::Extract to inner function in function 'F'==
 function F() {
diff --git a/tests/baselines/reference/extractFunction/extractFunction33.ts b/tests/baselines/reference/extractFunction/extractFunction33.ts
index fd716646e66..46c0f176b56 100644
--- a/tests/baselines/reference/extractFunction/extractFunction33.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction33.ts
@@ -1,6 +1,6 @@
 // ==ORIGINAL==
 function F() {
-    function G() { }
+    /*[#|*/function G() { }/*|]*/
 }
 // ==SCOPE::Extract to inner function in function 'F'==
 function F() {
diff --git a/tests/baselines/reference/extractFunction/extractFunction4.ts b/tests/baselines/reference/extractFunction/extractFunction4.ts
index 6ef3e843ee1..4108976b6b3 100644
--- a/tests/baselines/reference/extractFunction/extractFunction4.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction4.ts
@@ -4,12 +4,12 @@ namespace A {
     }
     namespace B {
         async function a(z: number, z1: any) {
-        
+        /*[#|*/
             let y = 5;
             if (z) {
                 await z1;
             }
-            return foo();
+            return foo();/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction5.ts b/tests/baselines/reference/extractFunction/extractFunction5.ts
index e2f72721b95..3122ba24553 100644
--- a/tests/baselines/reference/extractFunction/extractFunction5.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction5.ts
@@ -6,11 +6,11 @@ namespace A {
     namespace B {
         function a() {
             let a = 1;
-        
+        /*[#|*/
             let y = 5;
             let z = x;
             a = y;
-            foo();
+            foo();/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction6.ts b/tests/baselines/reference/extractFunction/extractFunction6.ts
index 6b4852dc722..f6c94216b46 100644
--- a/tests/baselines/reference/extractFunction/extractFunction6.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction6.ts
@@ -6,11 +6,11 @@ namespace A {
     namespace B {
         function a() {
             let a = 1;
-        
+        /*[#|*/
             let y = 5;
             let z = x;
             a = y;
-            return foo();
+            return foo();/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction7.ts b/tests/baselines/reference/extractFunction/extractFunction7.ts
index 9712cedda8d..91377868e0f 100644
--- a/tests/baselines/reference/extractFunction/extractFunction7.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction7.ts
@@ -8,11 +8,11 @@ namespace A {
     namespace B {
         function a() {
             let a = 1;
-        
+        /*[#|*/
             let y = 5;
             let z = x;
             a = y;
-            return C.foo();
+            return C.foo();/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction9.ts b/tests/baselines/reference/extractFunction/extractFunction9.ts
index 9c1f81edf45..7db12096cbc 100644
--- a/tests/baselines/reference/extractFunction/extractFunction9.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction9.ts
@@ -3,8 +3,8 @@ namespace A {
     export interface I { x: number };
     namespace B {
         function a() {
-            let a1: I = { x: 1 };
-            return a1.x + 10;
+            /*[#|*/let a1: I = { x: 1 };
+            return a1.x + 10;/*|]*/
         }
     }
 }
diff --git a/tests/baselines/reference/extractFunction/extractFunction_RepeatedSubstitution.ts b/tests/baselines/reference/extractFunction/extractFunction_RepeatedSubstitution.ts
index 080f694360d..68cc7d2248a 100644
--- a/tests/baselines/reference/extractFunction/extractFunction_RepeatedSubstitution.ts
+++ b/tests/baselines/reference/extractFunction/extractFunction_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 function in namespace 'X'==
 namespace X {