Remove template strings in checker.ts (microsoft#18016)

Andy · web-flow · commit 934da9fb39d3 · 2017-08-28T15:03:34.000-07:00
* Remove template strings in checker.ts

* Inline function
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3086,7 +3086,7 @@ namespace ts {
         }
 
         function literalTypeToString(type: LiteralType) {
-            return type.flags & TypeFlags.StringLiteral ? `"${escapeString((<StringLiteralType>type).value)}"` : "" + (<NumberLiteralType>type).value;
+            return type.flags & TypeFlags.StringLiteral ? '"' + escapeString((<StringLiteralType>type).value) + '"' : "" + (<NumberLiteralType>type).value;
         }
 
         function getNameOfSymbol(symbol: Symbol): string {
@@ -6263,7 +6263,7 @@ namespace ts {
             if (isExternalModuleNameRelative(moduleName)) {
                 return undefined;
             }
-            const symbol = getSymbol(globals, `"${moduleName}"` as __String, SymbolFlags.ValueModule);
+            const symbol = getSymbol(globals, '"' + moduleName + '"' as __String, SymbolFlags.ValueModule);
             // merged symbol is module declaration symbol combined with all augmentations
             return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;
         }
@@ -15862,7 +15862,7 @@ namespace ts {
                     min = Math.min(min, getMinTypeArgumentCount(sig.typeParameters));
                     max = Math.max(max, length(sig.typeParameters));
                 }
-                const paramCount = min < max ? `${min}-${max}` : min;
+                const paramCount = min < max ? min + "-" + max : min;
                 diagnostics.add(createDiagnosticForNode(node, Diagnostics.Expected_0_type_arguments_but_got_1, paramCount, typeArguments.length));
             }
             else if (args) {
@@ -15875,7 +15875,7 @@ namespace ts {
                 const hasRestParameter = some(signatures, sig => sig.hasRestParameter);
                 const hasSpreadArgument = getSpreadArgumentIndex(args) > -1;
                 const paramCount = hasRestParameter ? min :
-                    min < max ? `${min}-${max}` :
+                    min < max ? min + "-" + max :
                     min;
                 const argCount = args.length - (hasSpreadArgument ? 1 : 0);
                 const error = hasRestParameter && hasSpreadArgument ? Diagnostics.Expected_at_least_0_arguments_but_got_a_minimum_of_1 :
@@ -25089,7 +25089,7 @@ namespace ts {
                 }
                 if (diagnosticMessage) {
                     const withMinus = isPrefixUnaryExpression(node.parent) && node.parent.operator === SyntaxKind.MinusToken;
-                    const literal = `${withMinus ? "-" : ""}0o${node.text}`;
+                    const literal = (withMinus ? "-" : "") + "0o" + node.text;
                     return grammarErrorOnNode(withMinus ? node.parent : node, diagnosticMessage, literal);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -3086,7 +3086,7 @@ namespace ts {`
`3086`	`3086`	`}`
`3087`	`3087`
`3088`	`3088`	`function literalTypeToString(type: LiteralType) {`
`3089`		- return type.flags & TypeFlags.StringLiteral ? `"${escapeString((<StringLiteralType>type).value)}"` : "" + (<NumberLiteralType>type).value;
	`3089`	`+ return type.flags & TypeFlags.StringLiteral ? '"' + escapeString((<StringLiteralType>type).value) + '"' : "" + (<NumberLiteralType>type).value;`
`3090`	`3090`	`}`
`3091`	`3091`
`3092`	`3092`	`function getNameOfSymbol(symbol: Symbol): string {`
`@@ -6263,7 +6263,7 @@ namespace ts {`
`6263`	`6263`	`if (isExternalModuleNameRelative(moduleName)) {`
`6264`	`6264`	`return undefined;`
`6265`	`6265`	`}`
`6266`		- const symbol = getSymbol(globals, `"${moduleName}"` as __String, SymbolFlags.ValueModule);
	`6266`	`+ const symbol = getSymbol(globals, '"' + moduleName + '"' as __String, SymbolFlags.ValueModule);`
`6267`	`6267`	`// merged symbol is module declaration symbol combined with all augmentations`
`6268`	`6268`	`return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;`
`6269`	`6269`	`}`
`@@ -15862,7 +15862,7 @@ namespace ts {`
`15862`	`15862`	`min = Math.min(min, getMinTypeArgumentCount(sig.typeParameters));`
`15863`	`15863`	`max = Math.max(max, length(sig.typeParameters));`
`15864`	`15864`	`}`
`15865`		- const paramCount = min < max ? `${min}-${max}` : min;
	`15865`	`+ const paramCount = min < max ? min + "-" + max : min;`
`15866`	`15866`	`diagnostics.add(createDiagnosticForNode(node, Diagnostics.Expected_0_type_arguments_but_got_1, paramCount, typeArguments.length));`
`15867`	`15867`	`}`
`15868`	`15868`	`else if (args) {`
`@@ -15875,7 +15875,7 @@ namespace ts {`
`15875`	`15875`	`const hasRestParameter = some(signatures, sig => sig.hasRestParameter);`
`15876`	`15876`	`const hasSpreadArgument = getSpreadArgumentIndex(args) > -1;`
`15877`	`15877`	`const paramCount = hasRestParameter ? min :`
`15878`		- min < max ? `${min}-${max}` :
	`15878`	`+ min < max ? min + "-" + max :`
`15879`	`15879`	`min;`
`15880`	`15880`	`const argCount = args.length - (hasSpreadArgument ? 1 : 0);`
`15881`	`15881`	`const error = hasRestParameter && hasSpreadArgument ? Diagnostics.Expected_at_least_0_arguments_but_got_a_minimum_of_1 :`
`@@ -25089,7 +25089,7 @@ namespace ts {`
`25089`	`25089`	`}`
`25090`	`25090`	`if (diagnosticMessage) {`
`25091`	`25091`	`const withMinus = isPrefixUnaryExpression(node.parent) && node.parent.operator === SyntaxKind.MinusToken;`
`25092`		- const literal = `${withMinus ? "-" : ""}0o${node.text}`;
	`25092`	`+ const literal = (withMinus ? "-" : "") + "0o" + node.text;`
`25093`	`25093`	`return grammarErrorOnNode(withMinus ? node.parent : node, diagnosticMessage, literal);`
`25094`	`25094`	`}`
`25095`	`25095`	`}`