[[FIX]] Disallow Import declarations below top lvl

src/jshint.js

@@ -4477,6 +4477,10 @@ var JSHINT = (function() {
   }).exps = true;
 
   stmt("import", function() {
+    if (!state.funct["(scope)"].block.isGlobal()) {
+      error("E053", state.tokens.curr, "Import");
+    }
+
     if (!state.inES6()) {
       warning("W119", state.tokens.curr, "import", "6");
     }
@@ -4575,7 +4579,7 @@ var JSHINT = (function() {
     }
 
     if (!state.funct["(scope)"].block.isGlobal()) {
-      error("E053", state.tokens.curr);
+      error("E053", state.tokens.curr, "Export");
       ok = false;
     }
 

src/messages.js

@@ -68,7 +68,7 @@ var errors = {
   E050: "Mozilla requires the yield expression to be parenthesized here.",
   E051: null,
   E052: "Unclosed template literal.",
-  E053: "Export declaration must be in global scope.",
+  E053: "{a} declarations are only allowed at the top level of module scope.",
   E054: "Class properties must be methods. Expected '(' but instead saw '{a}'.",
   E055: "The '{a}' option cannot be set after any executable code.",
   E056: "'{a}' was used before it was declared, which is illegal for '{b}' variables.",

tests/unit/parser.js

@@ -6988,22 +6988,49 @@ exports.testES6BlockExports = function (test) {
   TestRun(test)
     .addError(1, "'broken' is defined but never used.")
     .addError(2, "'broken2' is defined but never used.")
-    .addError(4, "Export declaration must be in global scope.")
-    .addError(5, "Export declaration must be in global scope.")
-    .addError(6, "Export declaration must be in global scope.")
-    .addError(7, "Export declaration must be in global scope.")
-    .addError(8, "Export declaration must be in global scope.")
-    .addError(14, "Export declaration must be in global scope.")
-    .addError(15, "Export declaration must be in global scope.")
-    .addError(16, "Export declaration must be in global scope.")
-    .addError(17, "Export declaration must be in global scope.")
+    .addError(4, "Export declarations are only allowed at the top level of module scope.")
+    .addError(5, "Export declarations are only allowed at the top level of module scope.")
+    .addError(6, "Export declarations are only allowed at the top level of module scope.")
+    .addError(7, "Export declarations are only allowed at the top level of module scope.")
+    .addError(8, "Export declarations are only allowed at the top level of module scope.")
+    .addError(14, "Export declarations are only allowed at the top level of module scope.")
+    .addError(15, "Export declarations are only allowed at the top level of module scope.")
+    .addError(16, "Export declarations are only allowed at the top level of module scope.")
+    .addError(17, "Export declarations are only allowed at the top level of module scope.")
     .addError(17, "Function declarations should not be placed in blocks. Use a function expression or move the statement to the top of the outer function.")
-    .addError(18, "Export declaration must be in global scope.")
+    .addError(18, "Export declarations are only allowed at the top level of module scope.")
     .test(code, { esnext: true, unused: true });
 
   test.done();
 };
 
+exports.testES6BlockImports = function (test) {
+  var code = [
+    "{",
+    " import x from './m.js';",
+    "}",
+    "function limitScope(){",
+    " import {x} from './m.js';",
+    "}",
+    "(function(){",
+    " import './m.js';",
+    "}());",
+    "{",
+    " import {x as y} from './m.js';",
+    "}",
+    "limitScope();"
+  ];
+
+  TestRun(test)
+    .addError(2, "Import declarations are only allowed at the top level of module scope.")
+    .addError(5, "Import declarations are only allowed at the top level of module scope.")
+    .addError(8, "Import declarations are only allowed at the top level of module scope.")
+    .addError(11, "Import declarations are only allowed at the top level of module scope.")
+    .test(code, { esversion: 6, module: true });
+
+  test.done();
+};
+
 exports.testStrictDirectiveASI = function (test) {
   var options = { strict: true, asi: true, globalstrict: true, predef: ["x"] };