Enable nullish coalescing by default in @babel/parser (#10819)

* move files, remove hasPlugin() & expectPlugin() * restore permissions
babel · Jan 10, 2020 · c3388ea · c3388ea
1 parent 5b907e9
commit c3388ea
Show file tree

Hide file tree

Showing 41 changed files with 13 additions and 54 deletions.
diff --git a/packages/babel-core/src/parser/util/missing-plugin-helper.js b/packages/babel-core/src/parser/util/missing-plugin-helper.js
@@ -113,16 +113,6 @@ const pluginNameMap = {
       url: "https://git.io/vAlRe",
     },
   },
-  nullishCoalescingOperator: {
-    syntax: {
-      name: "@babel/plugin-syntax-nullish-coalescing-operator",
-      url: "https://git.io/vb4yx",
-    },
-    transform: {
-      name: "@babel/plugin-proposal-nullish-coalescing-operator",
-      url: "https://git.io/vb4Se",
-    },
-  },
   numericSeparator: {
     syntax: {
       name: "@babel/plugin-syntax-numeric-separator",
@@ -188,6 +178,16 @@ const pluginNameMap = {
       url: "https://git.io/vb4yp",
     },
   },
+  nullishCoalescingOperator: {
+    syntax: {
+      name: "@babel/plugin-syntax-nullish-coalescing-operator",
+      url: "https://git.io/vb4yx",
+    },
+    transform: {
+      name: "@babel/plugin-proposal-nullish-coalescing-operator",
+      url: "https://git.io/vb4Se",
+    },
+  },
   objectRestSpread: {
     syntax: {
       name: "@babel/plugin-syntax-object-rest-spread",

diff --git a/packages/babel-generator/test/fixtures/types/LogicalExpression/options.json b/packages/babel-generator/test/fixtures/types/LogicalExpression/options.json
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -196,7 +196,6 @@ export default class ExpressionParser extends LValParser {
       node.operator = operator;
 
       if (operator === "??=") {
-        this.expectPlugin("nullishCoalescingOperator");
         this.expectPlugin("logicalAssignment");
       }
       if (operator === "||=" || operator === "&&=") {
@@ -333,8 +332,6 @@ export default class ExpressionParser extends LValParser {
           this.expectPlugin("pipelineOperator");
           this.state.inPipeline = true;
           this.checkPipelineAtInfixOperator(left, leftStartPos);
-        } else if (op === tt.nullishCoalescing) {
-          this.expectPlugin("nullishCoalescingOperator");
         }
 
         this.next();

diff --git a/...-coalescing-operator/and-nullish/input.js → ...-coalescing-operator/and-nullish/input.js b/...-coalescing-operator/and-nullish/input.js → ...-coalescing-operator/and-nullish/input.js
diff --git a/...alescing-operator/and-nullish/output.json → ...alescing-operator/and-nullish/output.json b/...alescing-operator/and-nullish/output.json → ...alescing-operator/and-nullish/output.json
diff --git a/...oalescing-operator/associativity/input.js → ...oalescing-operator/associativity/input.js b/...oalescing-operator/associativity/input.js → ...oalescing-operator/associativity/input.js
diff --git a/...escing-operator/associativity/output.json → ...escing-operator/associativity/output.json b/...escing-operator/associativity/output.json → ...escing-operator/associativity/output.json
diff --git a/...h-coalescing-operator/expression/input.js → ...h-coalescing-operator/expression/input.js b/...h-coalescing-operator/expression/input.js → ...h-coalescing-operator/expression/input.js
diff --git a/...oalescing-operator/expression/output.json → ...oalescing-operator/expression/output.json b/...oalescing-operator/expression/output.json → ...oalescing-operator/expression/output.json
diff --git a/...sh-coalescing-operator/multiline/input.js → ...sh-coalescing-operator/multiline/input.js b/...sh-coalescing-operator/multiline/input.js → ...sh-coalescing-operator/multiline/input.js
diff --git a/...coalescing-operator/multiline/output.json → ...coalescing-operator/multiline/output.json b/...coalescing-operator/multiline/output.json → ...coalescing-operator/multiline/output.json
diff --git a/...ng-operator/no-paren-and-nullish/input.js → ...ng-operator/no-paren-and-nullish/input.js b/...ng-operator/no-paren-and-nullish/input.js → ...ng-operator/no-paren-and-nullish/input.js
diff --git a/...perator/no-paren-and-nullish/options.json → ...perator/no-paren-and-nullish/options.json b/...perator/no-paren-and-nullish/options.json → ...perator/no-paren-and-nullish/options.json
@@ -1,4 +1,4 @@
 {
-  "plugins": ["nullishCoalescingOperator", "estree"],
+  "plugins": ["estree"],
   "throws": "Nullish coalescing operator(??) requires parens when mixing with logical operators (1:0)"
 }
diff --git a/...ng-operator/no-paren-nullish-and/input.js → ...ng-operator/no-paren-nullish-and/input.js b/...ng-operator/no-paren-nullish-and/input.js → ...ng-operator/no-paren-nullish-and/input.js
diff --git a/...perator/no-paren-nullish-and/options.json → ...perator/no-paren-nullish-and/options.json b/...perator/no-paren-nullish-and/options.json → ...perator/no-paren-nullish-and/options.json
@@ -1,4 +1,3 @@
 {
-  "plugins": ["nullishCoalescingOperator"],
   "throws": "Nullish coalescing operator(??) requires parens when mixing with logical operators (1:5)"
 }
diff --git a/...ing-operator/no-paren-nullish-or/input.js → ...ing-operator/no-paren-nullish-or/input.js b/...ing-operator/no-paren-nullish-or/input.js → ...ing-operator/no-paren-nullish-or/input.js
diff --git a/...operator/no-paren-nullish-or/options.json → ...operator/no-paren-nullish-or/options.json b/...operator/no-paren-nullish-or/options.json → ...operator/no-paren-nullish-or/options.json
@@ -1,4 +1,3 @@
 {
-  "plugins": ["nullishCoalescingOperator"],
   "throws": "Nullish coalescing operator(??) requires parens when mixing with logical operators (1:10)"
 }
diff --git a/...ing-operator/no-paren-or-nullish/input.js → ...ing-operator/no-paren-or-nullish/input.js b/...ing-operator/no-paren-or-nullish/input.js → ...ing-operator/no-paren-or-nullish/input.js
diff --git a/...operator/no-paren-or-nullish/options.json → ...operator/no-paren-or-nullish/options.json b/...operator/no-paren-or-nullish/options.json → ...operator/no-paren-or-nullish/options.json
@@ -1,4 +1,4 @@
 {
-  "plugins": ["nullishCoalescingOperator", "estree"],
+  "plugins": ["estree"],
   "throws": "Nullish coalescing operator(??) requires parens when mixing with logical operators (1:0)"
 }
diff --git a/...-coalescing-operator/nullish-and/input.js → ...-coalescing-operator/nullish-and/input.js b/...-coalescing-operator/nullish-and/input.js → ...-coalescing-operator/nullish-and/input.js
diff --git a/...alescing-operator/nullish-and/output.json → ...alescing-operator/nullish-and/output.json b/...alescing-operator/nullish-and/output.json → ...alescing-operator/nullish-and/output.json
diff --git a/...h-coalescing-operator/nullish-or/input.js → ...h-coalescing-operator/nullish-or/input.js b/...h-coalescing-operator/nullish-or/input.js → ...h-coalescing-operator/nullish-or/input.js
diff --git a/...oalescing-operator/nullish-or/output.json → ...oalescing-operator/nullish-or/output.json b/...oalescing-operator/nullish-or/output.json → ...oalescing-operator/nullish-or/output.json
diff --git a/...h-coalescing-operator/or-nullish/input.js → ...h-coalescing-operator/or-nullish/input.js b/...h-coalescing-operator/or-nullish/input.js → ...h-coalescing-operator/or-nullish/input.js
diff --git a/...oalescing-operator/or-nullish/output.json → ...oalescing-operator/or-nullish/output.json b/...oalescing-operator/or-nullish/output.json → ...oalescing-operator/or-nullish/output.json
diff --git a/...oalescing-operator/with-pipeline/input.js → ...oalescing-operator/with-pipeline/input.js b/...oalescing-operator/with-pipeline/input.js → ...oalescing-operator/with-pipeline/input.js
diff --git a/...scing-operator/with-pipeline/options.json → ...scing-operator/with-pipeline/options.json b/...scing-operator/with-pipeline/options.json → ...scing-operator/with-pipeline/options.json
@@ -1,6 +1,5 @@
 {
   "plugins": [
-    "nullishCoalescingOperator",
     ["pipelineOperator", { "proposal": "minimal" }]
   ]
 }
diff --git a/...escing-operator/with-pipeline/output.json → ...escing-operator/with-pipeline/output.json b/...escing-operator/with-pipeline/output.json → ...escing-operator/with-pipeline/output.json
diff --git a/...tures/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/input.js b/...tures/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/input.js
diff --git a/...s/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/options.json b/...s/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/options.json
diff --git a/...r/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-plugin/options.json b/...r/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-plugin/options.json
@@ -1,4 +1,3 @@
 {
-  "plugins": ["nullishCoalescingOperator"],
   "throws": "This experimental syntax requires enabling the parser plugin: 'logicalAssignment' (1:2)"
 }
diff --git a/...abel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals/options.json b/...abel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["logicalAssignment", "nullishCoalescingOperator"]
+  "plugins": ["logicalAssignment"]
 }
diff --git a/...el-parser/test/fixtures/experimental/nullish-coalescing-operator/and-nullish/options.json b/...el-parser/test/fixtures/experimental/nullish-coalescing-operator/and-nullish/options.json
diff --git a/...-parser/test/fixtures/experimental/nullish-coalescing-operator/associativity/options.json b/...-parser/test/fixtures/experimental/nullish-coalescing-operator/associativity/options.json
diff --git a/...bel-parser/test/fixtures/experimental/nullish-coalescing-operator/expression/options.json b/...bel-parser/test/fixtures/experimental/nullish-coalescing-operator/expression/options.json
diff --git a/...abel-parser/test/fixtures/experimental/nullish-coalescing-operator/multiline/options.json b/...abel-parser/test/fixtures/experimental/nullish-coalescing-operator/multiline/options.json
diff --git a/...el-parser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/input.js b/...el-parser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/input.js
diff --git a/...arser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/options.json b/...arser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/options.json
diff --git a/...el-parser/test/fixtures/experimental/nullish-coalescing-operator/nullish-and/options.json b/...el-parser/test/fixtures/experimental/nullish-coalescing-operator/nullish-and/options.json
diff --git a/...bel-parser/test/fixtures/experimental/nullish-coalescing-operator/nullish-or/options.json b/...bel-parser/test/fixtures/experimental/nullish-coalescing-operator/nullish-or/options.json
diff --git a/...bel-parser/test/fixtures/experimental/nullish-coalescing-operator/or-nullish/options.json b/...bel-parser/test/fixtures/experimental/nullish-coalescing-operator/or-nullish/options.json