Allow placeholder to be changed via config

wcjohnson · Jul 17, 2017 · d5d4e74 · d5d4e74
1 parent 32e43a0
commit d5d4e74
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 1 deletion.
diff --git a/src/options.js b/src/options.js
@@ -9,7 +9,8 @@ export const defaultOptions: {
   allowImportExportEverywhere: boolean,
   allowSuperOutsideMethod: boolean,
   plugins: Array<string>,
-  strictMode: any
+  strictMode: any,
+  placeholder: string
 } = {
   // Source type ("script" or "module") for different semantics
   sourceType: "script",
@@ -30,6 +31,8 @@ export const defaultOptions: {
   plugins: [],
   // TODO
   strictMode: null,
+  // Default placeholder for use with syntacticPlaceholder plugin
+  placeholder: "_"
 };
 
 // Interpret and default an options object

diff --git a/test/fixtures/syntactic-placeholder/opts/change-placeholder/actual.js b/test/fixtures/syntactic-placeholder/opts/change-placeholder/actual.js
@@ -0,0 +1 @@
+P
diff --git a/test/fixtures/syntactic-placeholder/opts/change-placeholder/expected.changePlaceholder.json b/test/fixtures/syntactic-placeholder/opts/change-placeholder/expected.changePlaceholder.json
@@ -0,0 +1,64 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "PlaceholderExpression",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/test/fixtures/syntactic-placeholder/opts/change-placeholder/expected.json b/test/fixtures/syntactic-placeholder/opts/change-placeholder/expected.json
@@ -0,0 +1,66 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            },
+            "identifierName": "P"
+          },
+          "name": "P"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/test/fixtures/syntactic-placeholder/opts/change-placeholder/options.json b/test/fixtures/syntactic-placeholder/opts/change-placeholder/options.json
@@ -0,0 +1,12 @@
+{
+  "alternatives": {
+    "changePlaceholder": {
+      "allPlugins": true,
+      "excludePlugins": ["estree"],
+      "expected": "expected.changePlaceholder.json",
+      "parserOpts": {
+        "placeholder": "P"
+      }
+    }
+  }
+}
diff --git a/test/utils/TestRunner.js b/test/utils/TestRunner.js
@@ -235,6 +235,10 @@ exports.Test = class Test {
         }
       }
     }
+
+    if (alt.parserOpts) {
+      this.parserOpts = Object.assign({}, this.parserOpts, alt.parserOpts);
+    }
   }
 
   includePlugins(plugins, list) {