Merge pull request microsoft#14365 from Microsoft/master-fix14259

yuit · web-flow · commit c404666b1f27 · 2017-02-28T10:51:43.000-08:00
[Master] Fix 14259 : remove assertion
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -14804,7 +14804,6 @@ namespace ts {
 
         function checkMetaProperty(node: MetaProperty) {
             checkGrammarMetaProperty(node);
-            Debug.assert(node.keywordToken === SyntaxKind.NewKeyword && node.name.text === "target", "Unrecognized meta-property.");
             const container = getNewTargetContainer(node);
             if (!container) {
                 error(node, Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
@@ -23021,7 +23020,7 @@ namespace ts {
         function checkGrammarMetaProperty(node: MetaProperty) {
             if (node.keywordToken === SyntaxKind.NewKeyword) {
                 if (node.name.text !== "target") {
-                    return grammarErrorOnNode(node.name, Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_0, node.name.text, tokenToString(node.keywordToken), "target");
+                    return grammarErrorOnNode(node.name, Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.text, tokenToString(node.keywordToken), "target");
                 }
             }
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -3269,7 +3269,7 @@
         "category": "Error",
         "code": 17011
     },
-    "'{0}' is not a valid meta-property for keyword '{1}'. Did you mean '{0}'?": {
+    "'{0}' is not a valid meta-property for keyword '{1}'. Did you mean '{2}'?": {
         "category": "Error",
         "code": 17012
     },
diff --git a/tests/baselines/reference/misspelledNewMetaProperty.errors.txt b/tests/baselines/reference/misspelledNewMetaProperty.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/compiler/misspelledNewMetaProperty.ts(1,20): error TS17012: 'targ' is not a valid meta-property for keyword 'new'. Did you mean 'target'?
+
+
+==== tests/cases/compiler/misspelledNewMetaProperty.ts (1 errors) ====
+    function foo(){new.targ}
+                       ~~~~
+!!! error TS17012: 'targ' is not a valid meta-property for keyword 'new'. Did you mean 'target'?
diff --git a/tests/baselines/reference/misspelledNewMetaProperty.js b/tests/baselines/reference/misspelledNewMetaProperty.js
@@ -0,0 +1,5 @@
+//// [misspelledNewMetaProperty.ts]
+function foo(){new.targ}
+
+//// [misspelledNewMetaProperty.js]
+function foo() { new.targ; }
diff --git a/tests/cases/compiler/misspelledNewMetaProperty.ts b/tests/cases/compiler/misspelledNewMetaProperty.ts
@@ -0,0 +1 @@
+﻿function foo(){new.targ}

Original file line number	Diff line number	Diff line change
`@@ -14804,7 +14804,6 @@ namespace ts {`
`14804`	`14804`
`14805`	`14805`	`function checkMetaProperty(node: MetaProperty) {`
`14806`	`14806`	`checkGrammarMetaProperty(node);`
`14807`		`- Debug.assert(node.keywordToken === SyntaxKind.NewKeyword && node.name.text === "target", "Unrecognized meta-property.");`
`14808`	`14807`	`const container = getNewTargetContainer(node);`
`14809`	`14808`	`if (!container) {`
`14810`	`14809`	`error(node, Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");`
`@@ -23021,7 +23020,7 @@ namespace ts {`
`23021`	`23020`	`function checkGrammarMetaProperty(node: MetaProperty) {`
`23022`	`23021`	`if (node.keywordToken === SyntaxKind.NewKeyword) {`
`23023`	`23022`	`if (node.name.text !== "target") {`
`23024`		`- return grammarErrorOnNode(node.name, Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_0, node.name.text, tokenToString(node.keywordToken), "target");`
	`23023`	`+ return grammarErrorOnNode(node.name, Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.text, tokenToString(node.keywordToken), "target");`
`23025`	`23024`	`}`
`23026`	`23025`	`}`
`23027`	`23026`	`}`