CR feedback to use template strings.

CyrusNajmabadi · CyrusNajmabadi · commit 990bbb2dce86 · 2015-02-19T15:52:37.000-08:00
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -88,11 +88,11 @@ module ts {
         if (diagnostic.file) {
             var loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
 
-            output += diagnostic.file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + "): ";
+            output += `${ diagnostic.file.fileName }(${ loc.line + 1 },${ loc.character + 1 }): `;
         }
 
         var category = DiagnosticCategory[diagnostic.category].toLowerCase();
-        output += category + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) + sys.newLine;
+        output += `${ category } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) }${ sys.newLine }`;
 
         sys.write(output);
     }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -114,7 +114,7 @@ module ts {
     export function nodePosToString(node: Node): string {
         var file = getSourceFileOfNode(node);
         var loc = getLineAndCharacterOfPosition(file, node.pos);
-        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
+        return `${ file.fileName }(${ loc.line + 1 },${ loc.character + 1 })`;
     }
 
     export function getStartPosOfNode(node: Node): number {
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -396,7 +396,7 @@ module FourSlash {
 
             var lineStarts = ts.computeLineStarts(this.getFileContent(this.activeFile.fileName));
             var lineCharPos = ts.computeLineAndCharacterOfPosition(lineStarts, pos);
-            this.scenarioActions.push('<MoveCaretToLineAndChar LineNumber="' + (lineCharPos.line + 1) + '" CharNumber="' + (lineCharPos.character + 1) + '" />');
+            this.scenarioActions.push(`<MoveCaretToLineAndChar LineNumber=${ lineCharPos.line + 1 } CharNumber=${ lineCharPos.character + 1 } />`);
         }
 
         public moveCaretRight(count = 1) {

Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,11 @@ module ts {`
`88`	`88`	`if (diagnostic.file) {`
`89`	`89`	`var loc = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);`
`90`	`90`
`91`		`- output += diagnostic.file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + "): ";`
	`91`	+ output += `${ diagnostic.file.fileName }(${ loc.line + 1 },${ loc.character + 1 }): `;
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`var category = DiagnosticCategory[diagnostic.category].toLowerCase();`
`95`		`- output += category + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) + sys.newLine;`
	`95`	+ output += `${ category } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) }${ sys.newLine }`;
`96`	`96`
`97`	`97`	`sys.write(output);`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ module ts {`
`114`	`114`	`export function nodePosToString(node: Node): string {`
`115`	`115`	`var file = getSourceFileOfNode(node);`
`116`	`116`	`var loc = getLineAndCharacterOfPosition(file, node.pos);`
`117`		`- return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";`
	`117`	+ return `${ file.fileName }(${ loc.line + 1 },${ loc.character + 1 })`;
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`export function getStartPosOfNode(node: Node): number {`
Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ module FourSlash {`
`396`	`396`
`397`	`397`	`var lineStarts = ts.computeLineStarts(this.getFileContent(this.activeFile.fileName));`
`398`	`398`	`var lineCharPos = ts.computeLineAndCharacterOfPosition(lineStarts, pos);`
`399`		`- this.scenarioActions.push('<MoveCaretToLineAndChar LineNumber="' + (lineCharPos.line + 1) + '" CharNumber="' + (lineCharPos.character + 1) + '" />');`
	`399`	+ this.scenarioActions.push(`<MoveCaretToLineAndChar LineNumber=${ lineCharPos.line + 1 } CharNumber=${ lineCharPos.character + 1 } />`);
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`public moveCaretRight(count = 1) {`