noLabeledExpressionStatements plugin added

wcjohnson · Oct 3, 2017 · 210de1f · 210de1f
1 parent 6ff25b9
commit 210de1f
Show file tree

Hide file tree

Showing 16 changed files with 134 additions and 48 deletions.
diff --git a/src/parser/statement.js b/src/parser/statement.js
@@ -599,6 +599,9 @@ pp.parseLabeledStatement = function (node, maybeName, expr) {
   this.state.labels.push({ name: maybeName, kind: kind, statementStart: this.state.start });
   node.body = this.parseStatement(true);
   this.state.labels.pop();
+  if (node.body.type === "ExpressionStatement" && this.hasPlugin("noLabeledExpressionStatements")) {
+    this.raise(expr.start, "Labeled expressions are illegal.");
+  }
   node.label = expr;
   return this.finishNode(node, "LabeledStatement");
 };

diff --git a/src/registerPlugins.js b/src/registerPlugins.js
@@ -98,4 +98,6 @@ export default function registerPlugins(plugins, metadata) {
   registerPlugin("whiteblockPreferred", noncePlugin, {
     dependencies: ["lightscript"]
   });
+
+  registerPlugin("noLabeledExpressionStatements", noncePlugin);
 }
diff --git a/test/fixtures/comments/options.json b/test/fixtures/comments/options.json
@@ -7,7 +7,7 @@
     },
     "noLsc": {
       "allPlugins": true,
-      "excludePlugins": ["lightscript", "match", "splatComprehension", "whiteblockOnly", "whiteblockPreferred"]
+      "excludePlugins": ["lightscript", "noLabeledExpressionStatements"]
     }
   }
 }
diff --git a/test/fixtures/core/options.json b/test/fixtures/core/options.json
@@ -8,7 +8,7 @@
     },
     "noLsc": {
       "allPlugins": true,
-      "excludePlugins": ["lightscript"]
+      "excludePlugins": ["lightscript", "noLabeledExpressionStatements"]
     }
   }
 }
diff --git a/test/fixtures/core/uncategorised/323/options.json b/test/fixtures/core/uncategorised/323/options.json
@@ -0,0 +1,7 @@
+{
+  "alternatives": {
+    "all": {
+      "throws": "Labeled expressions are illegal. (1:0)"
+    }
+  }
+}
diff --git a/test/fixtures/es2015/options.json b/test/fixtures/es2015/options.json
@@ -8,7 +8,7 @@
     },
     "noLsc": {
       "allPlugins": true,
-      "excludePlugins": ["lightscript"]
+      "excludePlugins": ["lightscript", "noLabeledExpressionStatements"]
     }
   }
 }
diff --git a/test/fixtures/es2017/options.json b/test/fixtures/es2017/options.json
@@ -8,7 +8,7 @@
     },
     "noLsc": {
       "allPlugins": true,
-      "excludePlugins": ["lightscript"]
+      "excludePlugins": ["lightscript", "noLabeledExpressionStatements"]
     }
   }
 }
diff --git a/test/fixtures/esprima/options.json b/test/fixtures/esprima/options.json
@@ -8,7 +8,7 @@
     },
     "noLsc": {
       "allPlugins": true,
-      "excludePlugins": ["lightscript"]
+      "excludePlugins": ["lightscript", "noLabeledExpressionStatements"]
     }
   }
 }
diff --git a/test/fixtures/esprima/statement-labelled/migrated_0002/options.json b/test/fixtures/esprima/statement-labelled/migrated_0002/options.json
@@ -0,0 +1,7 @@
+{
+  "alternatives": {
+    "all": {
+      "throws": "Labeled expressions are illegal. (1:0)"
+    }
+  }
+}
diff --git a/test/fixtures/existential-expression/lightscript/existential-then-labeled/actual.js b/test/fixtures/existential-expression/lightscript/existential-then-labeled/actual.js
@@ -1,3 +1,3 @@
 a?
 b:
-c
+while (true) {}
diff --git a/test/fixtures/existential-expression/lightscript/existential-then-labeled/expected.json b/test/fixtures/existential-expression/lightscript/existential-then-labeled/expected.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 7,
+  "end": 21,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
       "line": 3,
-      "column": 1
+      "column": 15
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 7,
+    "end": 21,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
         "line": 3,
-        "column": 1
+        "column": 15
       }
     },
     "sourceType": "script",
@@ -78,47 +78,78 @@
       {
         "type": "LabeledStatement",
         "start": 3,
-        "end": 7,
+        "end": 21,
         "loc": {
           "start": {
             "line": 2,
             "column": 0
           },
           "end": {
             "line": 3,
-            "column": 1
+            "column": 15
           }
         },
         "body": {
-          "type": "ExpressionStatement",
+          "type": "WhileStatement",
           "start": 6,
-          "end": 7,
+          "end": 21,
           "loc": {
             "start": {
               "line": 3,
               "column": 0
             },
             "end": {
               "line": 3,
-              "column": 1
+              "column": 15
             }
           },
-          "expression": {
-            "type": "Identifier",
-            "start": 6,
-            "end": 7,
+          "test": {
+            "type": "BooleanLiteral",
+            "start": 13,
+            "end": 17,
             "loc": {
               "start": {
                 "line": 3,
-                "column": 0
+                "column": 7
               },
               "end": {
                 "line": 3,
-                "column": 1
+                "column": 11
+              }
+            },
+            "value": true,
+            "extra": {}
+          },
+          "body": {
+            "type": "ExpressionStatement",
+            "start": 19,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 13
               },
-              "identifierName": "c"
+              "end": {
+                "line": 3,
+                "column": 15
+              }
             },
-            "name": "c"
+            "expression": {
+              "type": "ObjectExpression",
+              "start": 19,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 13
+                },
+                "end": {
+                  "line": 3,
+                  "column": 15
+                }
+              },
+              "properties": []
+            }
           }
         },
         "label": {

diff --git a/test/fixtures/flow/options.json b/test/fixtures/flow/options.json
@@ -10,7 +10,7 @@
     },
     "noLsc": {
       "allPlugins": true,
-      "excludePlugins": ["lightscript"]
+      "excludePlugins": ["lightscript", "noLabeledExpressionStatements"]
     }
   }
 }
diff --git a/test/fixtures/lightscript/object-block-ambiguity/objectish-block/actual.js b/test/fixtures/lightscript/object-block-ambiguity/objectish-block/actual.js
@@ -0,0 +1,6 @@
+{
+  a
+  b: c
+  d
+  if true: e
+}
diff --git a/test/fixtures/lightscript/object-block-ambiguity/objectish-block/options.json b/test/fixtures/lightscript/object-block-ambiguity/objectish-block/options.json
@@ -0,0 +1,13 @@
+{
+  "alternatives": {
+    "all": {
+      "throws": "Unexpected token, expected , (5:5)"
+    },
+    "whiteblockOnly": {
+      "throws": "Unexpected token, expected , (5:5)"
+    },
+    "braceblock": {
+      "throws": "Unexpected token, expected , (5:5)"
+    }
+  }
+}
diff --git a/test/fixtures/match/guard/guard-labeled-statement-unfortunate/actual.js b/test/fixtures/match/guard/guard-labeled-statement-unfortunate/actual.js
@@ -1,2 +1,2 @@
 match x:
-  | if guard: Atom: 1
+  | if guard: Atom: while(true) {}
diff --git a/test/fixtures/match/guard/guard-labeled-statement-unfortunate/expected.json b/test/fixtures/match/guard/guard-labeled-statement-unfortunate/expected.json
@@ -1,45 +1,45 @@
 {
   "type": "File",
   "start": 0,
-  "end": 30,
+  "end": 43,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
       "line": 2,
-      "column": 21
+      "column": 34
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 30,
+    "end": 43,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
         "line": 2,
-        "column": 21
+        "column": 34
       }
     },
     "sourceType": "script",
     "body": [
       {
         "type": "MatchStatement",
         "start": 0,
-        "end": 30,
+        "end": 43,
         "loc": {
           "start": {
             "line": 1,
             "column": 0
           },
           "end": {
             "line": 2,
-            "column": 21
+            "column": 34
           }
         },
         "discriminant": {
@@ -63,15 +63,15 @@
           {
             "type": "MatchCase",
             "start": 11,
-            "end": 30,
+            "end": 43,
             "loc": {
               "start": {
                 "line": 2,
                 "column": 2
               },
               "end": {
                 "line": 2,
-                "column": 21
+                "column": 34
               }
             },
             "outerGuard": {
@@ -94,50 +94,67 @@
             "consequent": {
               "type": "LabeledStatement",
               "start": 23,
-              "end": 30,
+              "end": 43,
               "loc": {
                 "start": {
                   "line": 2,
                   "column": 14
                 },
                 "end": {
                   "line": 2,
-                  "column": 21
+                  "column": 34
                 }
               },
               "body": {
-                "type": "ExpressionStatement",
+                "type": "WhileStatement",
                 "start": 29,
-                "end": 30,
+                "end": 43,
                 "loc": {
                   "start": {
                     "line": 2,
                     "column": 20
                   },
                   "end": {
                     "line": 2,
-                    "column": 21
+                    "column": 34
                   }
                 },
-                "expression": {
-                  "type": "NumericLiteral",
-                  "start": 29,
-                  "end": 30,
+                "test": {
+                  "type": "BooleanLiteral",
+                  "start": 35,
+                  "end": 39,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 20
+                      "column": 26
                     },
                     "end": {
                       "line": 2,
-                      "column": 21
+                      "column": 30
                     }
                   },
-                  "extra": {
-                    "rawValue": 1,
-                    "raw": "1"
+                  "value": true,
+                  "extra": {}
+                },
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 41,
+                  "end": 43,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 32
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 34
+                    }
                   },
-                  "value": 1
+                  "body": [],
+                  "directives": [],
+                  "extra": {
+                    "curly": true
+                  }
                 }
               },
               "label": {