Use getTextOfNode over getTextOfNodeFromSourceText(getSourceFileOfNode(node)) (microsoft#22387)

Andy · web-flow · commit 55bffba5fd93 · 2018-03-08T07:52:35.000-08:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1996,7 +1996,7 @@ namespace ts {
 
         /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
         function isUseStrictPrologueDirective(node: ExpressionStatement): boolean {
-            const nodeText = getTextOfNodeFromSourceText(file.text, node.expression);
+            const nodeText = getSourceTextOfNodeFromSourceFile(file, node.expression);
 
             // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
             // string to contain unicode escapes (as per ES5).
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -22851,8 +22851,7 @@ namespace ts {
                                      return "quit";
                                  }
                                  if (current.kind === SyntaxKind.LabeledStatement && (<LabeledStatement>current).label.escapedText === node.label.escapedText) {
-                                     const sourceFile = getSourceFileOfNode(node);
-                                     grammarErrorOnNode(node.label, Diagnostics.Duplicate_label_0, getTextOfNodeFromSourceText(sourceFile.text, node.label));
+                                     grammarErrorOnNode(node.label, Diagnostics.Duplicate_label_0, getTextOfNode(node.label));
                                      return true;
                                  }
                              });
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -314,20 +314,15 @@ namespace ts {
     }
 
     export function getSourceTextOfNodeFromSourceFile(sourceFile: SourceFile, node: Node, includeTrivia = false): string {
-        if (nodeIsMissing(node)) {
-            return "";
-        }
-
-        const text = sourceFile.text;
-        return text.substring(includeTrivia ? node.pos : skipTrivia(text, node.pos), node.end);
+        return getTextOfNodeFromSourceText(sourceFile.text, node, includeTrivia);
     }
 
-    export function getTextOfNodeFromSourceText(sourceText: string, node: Node): string {
+    export function getTextOfNodeFromSourceText(sourceText: string, node: Node, includeTrivia = false): string {
         if (nodeIsMissing(node)) {
             return "";
         }
 
-        return sourceText.substring(skipTrivia(sourceText, node.pos), node.end);
+        return sourceText.substring(includeTrivia ? node.pos : skipTrivia(sourceText, node.pos), node.end);
     }
 
     export function getTextOfNode(node: Node, includeTrivia = false): string {
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
@@ -72,8 +72,7 @@ class TypeWriterWalker {
     private writeTypeOrSymbol(node: ts.Node, isSymbolWalk: boolean): TypeWriterResult {
         const actualPos = ts.skipTrivia(this.currentSourceFile.text, node.pos);
         const lineAndCharacter = this.currentSourceFile.getLineAndCharacterOfPosition(actualPos);
-        const sourceText = ts.getTextOfNodeFromSourceText(this.currentSourceFile.text, node);
-
+        const sourceText = ts.getSourceTextOfNodeFromSourceFile(this.currentSourceFile, node);
 
         if (!isSymbolWalk) {
             // Workaround to ensure we output 'C' instead of 'typeof C' for base class expressions

Original file line number	Diff line number	Diff line change
`@@ -22851,8 +22851,7 @@ namespace ts {`
`22851`	`22851`	`return "quit";`
`22852`	`22852`	`}`
`22853`	`22853`	`if (current.kind === SyntaxKind.LabeledStatement && (<LabeledStatement>current).label.escapedText === node.label.escapedText) {`
`22854`		`- const sourceFile = getSourceFileOfNode(node);`
`22855`		`- grammarErrorOnNode(node.label, Diagnostics.Duplicate_label_0, getTextOfNodeFromSourceText(sourceFile.text, node.label));`
	`22854`	`+ grammarErrorOnNode(node.label, Diagnostics.Duplicate_label_0, getTextOfNode(node.label));`
`22856`	`22855`	`return true;`
`22857`	`22856`	`}`
`22858`	`22857`	`});`
Original file line number	Diff line number	Diff line change
`@@ -314,20 +314,15 @@ namespace ts {`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`export function getSourceTextOfNodeFromSourceFile(sourceFile: SourceFile, node: Node, includeTrivia = false): string {`
`317`		`- if (nodeIsMissing(node)) {`
`318`		`- return "";`
`319`		`- }`
`320`		`-`
`321`		`- const text = sourceFile.text;`
`322`		`- return text.substring(includeTrivia ? node.pos : skipTrivia(text, node.pos), node.end);`
	`317`	`+ return getTextOfNodeFromSourceText(sourceFile.text, node, includeTrivia);`
`323`	`318`	`}`
`324`	`319`
`325`		`- export function getTextOfNodeFromSourceText(sourceText: string, node: Node): string {`
	`320`	`+ export function getTextOfNodeFromSourceText(sourceText: string, node: Node, includeTrivia = false): string {`
`326`	`321`	`if (nodeIsMissing(node)) {`
`327`	`322`	`return "";`
`328`	`323`	`}`
`329`	`324`
`330`		`- return sourceText.substring(skipTrivia(sourceText, node.pos), node.end);`
	`325`	`+ return sourceText.substring(includeTrivia ? node.pos : skipTrivia(sourceText, node.pos), node.end);`
`331`	`326`	`}`
`332`	`327`
`333`	`328`	`export function getTextOfNode(node: Node, includeTrivia = false): string {`