Add tests for yield expressions.

CyrusNajmabadi · Nov 12, 2014 · fad7978 · fad7978
1 parent 99981aa
commit fad7978
Show file tree

Hide file tree

Showing 44 changed files with 5,485 additions and 422 deletions.
diff --git a/tests/Fidelity/incremental/IncrementalParserTests.ts b/tests/Fidelity/incremental/IncrementalParserTests.ts
@@ -233,12 +233,12 @@ module TypeScript {
         //}
 
         public static testStrictMode1() {
-            // In non-strict mode 'yield' means nothing and can be reused.  In strict mode though
-            // we'll have to reparse the nodes (and generate an error for 'static();'
+            // In non-strict mode 'package' means nothing and can be reused.  In strict mode though
+            // we'll have to reparse the nodes (and generate an error for 'package();'
             //
             // Note: in this test we don't actually add 'use strict'.  This is so we can compare 
             // reuse with/without a strict mode change.
-            var source = "foo1();\r\nfoo1();\r\nfoo1();\r\yield();";
+            var source = "foo1();\r\nfoo1();\r\nfoo1();\r\package();";
 
             var oldText = SimpleText.fromString(source);
             var newTextAndChange = withInsert(oldText, 0, "'strict';\r\n");
@@ -247,9 +247,9 @@ module TypeScript {
         }
 
         public static testStrictMode2() {
-            // In non-strict mode 'yield' means nothing and can be reused.  In strict mode though
-            // we'll have to reparse the nodes (and generate an error for 'yield();'
-            var source = "foo1();\r\nfoo1();\r\nfoo1();\r\yield();";
+            // In non-strict mode 'package' means nothing and can be reused.  In strict mode though
+            // we'll have to reparse the nodes (and generate an error for 'package();'
+            var source = "foo1();\r\nfoo1();\r\nfoo1();\r\package();";
 
             var oldText = SimpleText.fromString(source);
             var newTextAndChange = withInsert(oldText, 0, "'use strict';\r\n");
@@ -259,12 +259,12 @@ module TypeScript {
         }
 
         public static testStrictMode3() {
-            // In non-strict mode 'yield' means nothing and can be reused.  In strict mode though
-            // we'll have to reparse the nodes (and generate an error for 'static();'
+            // In non-strict mode 'package' means nothing and can be reused.  In strict mode though
+            // we'll have to reparse the nodes (and generate an error for 'package();'
             //
             // Note: in this test we don't actually remove 'use strict'.  This is so we can compare 
             // reuse with/without a strict mode change.
-            var source = "'strict';\r\nfoo1();\r\nfoo1();\r\nfoo1();\r\nyield();";
+            var source = "'strict';\r\nfoo1();\r\nfoo1();\r\nfoo1();\r\npackage();";
 
             var index = source.indexOf('f');
 
@@ -275,9 +275,9 @@ module TypeScript {
         }
 
         public static testStrictMode4() {
-            // In non-strict mode 'yield' means nothing and can be reused.  In strict mode though
-            // we'll have to reparse the nodes (and generate an error for 'static();'
-            var source = "'use strict';\r\nfoo1();\r\nfoo1();\r\nfoo1();\r\nyield();";
+            // In non-strict mode 'package' means nothing and can be reused.  In strict mode though
+            // we'll have to reparse the nodes (and generate an error for 'package();'
+            var source = "'use strict';\r\nfoo1();\r\nfoo1();\r\nfoo1();\r\npackage();";
 
             var index = source.indexOf('f');
 
@@ -543,6 +543,28 @@ module TypeScript {
             compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
         }
 
+        public static testYield1() {
+            // We're changing from a non-generator to a genarator.  We can't reuse statement nodes.
+            var source = "function foo() {\r\nyield(foo1);\r\n}";
+
+            var oldText = SimpleText.fromString(source);
+            var index = source.indexOf("foo");
+            var newTextAndChange = withInsert(oldText, index, "*");
+
+            compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
+        }
+
+        public static testYield2() {
+            // We're changing from a generator to a non-genarator.  We can't reuse statement nodes.
+            var source = "function *foo() {\r\nyield(foo1);\r\n}";
+
+            var oldText = SimpleText.fromString(source);
+            var index = source.indexOf("*");
+            var newTextAndChange = withDelete(oldText, index, "*".length);
+
+            compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
+        }
+
         public static textComplexEdits1() {
             var source =
 "if (typeParameterSymbol.isResolved() || typeParameterSymbol.isResolving()) {\

diff --git a/tests/Fidelity/parser/ecmascript5/Templates/templateStringInYieldKeyword.ts.expected b/tests/Fidelity/parser/ecmascript5/Templates/templateStringInYieldKeyword.ts.expected
@@ -225,20 +225,19 @@
                                                 ]
                                             },
                                             "value": {
-                                                "kind": "TemplateAccessExpression",
+                                                "kind": "YieldExpression",
                                                 "start": 117,
                                                 "end": 137,
                                                 "width": 20,
-                                                "expression": {
-                                                    "kind": "IdentifierName",
+                                                "yieldKeyword": {
+                                                    "kind": "YieldKeyword",
                                                     "fullStart": 116,
                                                     "start": 117,
                                                     "fullWidth": 6,
                                                     "width": 5,
                                                     "text": "yield",
                                                     "value": "yield",
                                                     "valueText": "yield",
-                                                    "isKeywordConvertedToIdentifier": true,
                                                     "hasLeadingTrivia": true,
                                                     "leadingTrivia": [
                                                         {
@@ -249,7 +248,7 @@
                                                         }
                                                     ]
                                                 },
-                                                "templateExpression": {
+                                                "expression": {
                                                     "kind": "TemplateExpression",
                                                     "start": 123,
                                                     "end": 137,