Exclude Flowtype bindings from original scope list. (#5692)

Author: loganfsmyth

src/test/mochitest/browser.ini

@@ -27,6 +27,8 @@ support-files =
   examples/babel/fixtures/modules/output.js.map
   examples/babel/fixtures/non-modules/output.js
   examples/babel/fixtures/non-modules/output.js.map
+  examples/babel/fixtures/flowtype-bindings/output.js
+  examples/babel/fixtures/flowtype-bindings/output.js.map
   examples/babel/fixtures/step-over-for-of/output.js
   examples/babel/fixtures/step-over-for-of/output.js.map
   examples/babel/fixtures/step-over-for-of-closure/output.js

src/test/mochitest/browser_dbg-babel-scopes.js

@@ -253,6 +253,12 @@ add_task(async function() {
 
   await breakpointScopes(dbg, "non-modules", { line: 7, column: 2 }, []);
 
+  await breakpointScopes(dbg, "flowtype-bindings", { line: 8, column: 2 }, [
+    "Module",
+    ["aConst", '"a-const"'],
+    "root()"
+  ]);
+
   await breakpointScopes(dbg, "switches", { line: 7, column: 6 }, [
     "Switch",
     ["val", "2"],

src/test/mochitest/examples/babel/fixtures/flowtype-bindings/input.js

@@ -0,0 +1,9 @@
+import type { One, Two, Three } from "./src/mod";
+
+type Other = {};
+
+const aConst = "a-const";
+
+export default function root() {
+  console.log("pause here", aConst, root);
+}

src/test/mochitest/examples/babel/fixtures/flowtype-bindings/output.js

@@ -0,0 +1 @@
+export default "a-default";

src/test/mochitest/examples/babel/fixtures/flowtype-bindings/output.js.map

@@ -13,6 +13,7 @@
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-preset-env": "^1.6.1",
     "webpack": "^3.7.1"
   },

src/test/mochitest/examples/babel/fixtures/flowtype-bindings/src/mod.js

@@ -76,7 +76,9 @@ module.exports = [
                     ? [["env", { modules: babelModules ? "commonjs" : false }]]
                     : [],
                   plugins:
-                    babelEnv && babelModules ? ["add-module-exports"] : []
+                    (babelEnv && babelModules ? ["add-module-exports"] : []).concat([
+                      "babel-plugin-transform-flow-strip-types",
+                    ])
                 }
               }
             ]

src/test/mochitest/examples/babel/package.json

@@ -17,6 +17,8 @@
     <button onclick="classes()">Run classes</button>
     <script src="babel/fixtures/commonjs/output.js"></script>
     <button onclick="commonjs()">Run commonjs</button>
+    <script src="babel/fixtures/flowtype-bindings/output.js"></script>
+    <button onclick="flowtypeBindings()">Run flowtypeBindings</button>
     <script src="babel/fixtures/for-loops/output.js"></script>
     <button onclick="forLoops()">Run forLoops</button>
     <script src="babel/fixtures/for-of/output.js"></script>

src/test/mochitest/examples/babel/webpack.config.js

@@ -540,7 +540,10 @@ const scopeCollectionVisitor = {
           state.sourceId
         );
       });
-    } else if (t.isImportDeclaration(node)) {
+    } else if (
+      t.isImportDeclaration(node) &&
+      (!node.importKind || node.importKind === "value")
+    ) {
       node.specifiers.forEach(spec => {
         if (t.isImportNamespaceSpecifier(spec)) {
           state.scope.bindings[spec.local.name] = {