Rudimentary template support, excluding tagging.

Added tests and baselines for templates.
Merge branch 'letAndConst' into templates
microsoft · DanielRosenwasser · Oct 31, 2014 · DanielRosenwasser · Oct 31, 2014 · DanielRosenwasser
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5932,6 +5939,12 @@ module ts {
            return getUnionType([type1, type2]);
        }

+        function checkTemplateExpression(node: TemplateExpression): void {
+            forEach((<TemplateExpression>node).templateSpans, templateSpan => {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
+            }
+
+            function getTemplateLiteralAsStringLiteral(node: LiteralExpression): string {
+                return "\"" + escapeString(node.text) + "\"";
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
+            }
+
+            function emitTemplateExpression(node: TemplateExpression): void {
+                if (compilerOptions.target >= ScriptTarget.ES6) {
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
+                }
+
+                var templateNeedsParens = isExpression(node.parent) &&
+                    comparePrecedenceToBinaryPlus(node.parent) !== Comparison.LessThan;
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
+                    // All unary operators have a higher precedence apart from yield.
+                    // Arrow functions and conditionals have a lower precedence, 
+                    // although we convert the former into regular function expressions in ES5 mode,
+                    // and in ES6 mode this function won't get called anyway.
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
+         * a literal component of a TemplateExpression.
+         */
+        function scanTemplateAndSetTokenValue(): SyntaxKind {
+            var isStartOfTemplate = text.charCodeAt(pos) === CharacterCodes.backtick;
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
+            pos++;
+            var start = pos;
+            var contents = ""
+            var resultingToken = SyntaxKind.Unknown;
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
+                case CharacterCodes.singleQuote:
+                    return "\'";
+                case CharacterCodes.doubleQuote:
+                    return "\"";
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
+                    return "\"";
+                case CharacterCodes.x:
+                case CharacterCodes.u:
+                    var ch = scanHexDigits(ch === CharacterCodes.x ? 2 : 4, /*useExactCount*/ true);
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
+         * Unconditionally back up and scan a template expression portion.
+         */
+        function reScanTemplateToken(): SyntaxKind {
+            Debug.assert("'reScanTemplateToken' should only be called on a '}'");
diff --git a/tests/baselines/reference/templateStringInObjectLiteral.errors.txt b/tests/baselines/reference/templateStringInObjectLiteral.errors.txt
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+        `b`: 321
+    ~~~~~~~
+!!! error TS1159: Tagged templates are only available when targeting ECMAScript 6 and higher.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5985,7 +5998,11 @@ module ts {
                    return booleanType;
                case SyntaxKind.NumericLiteral:
                    return numberType;
+                case SyntaxKind.TemplateExpression:
+                    checkTemplateExpression(<TemplateExpression>node);
+                    // fall through