[[FIX]] Global "use strict" regressions

Fixes gh-2657 and gh-2661
jshint · Oct 3, 2015 · 04b43d2 · 04b43d2
1 parent e85c2a1
commit 04b43d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/jshint.js b/src/jshint.js
@@ -5321,7 +5321,10 @@ var JSHINT = (function() {
         directives();
 
         if (state.directive["use strict"]) {
-          if (state.option.strict !== "global") {
+          if (state.option.strict !== "global" &&
+              !((state.option.strict === true || !state.option.strict) &&
+                (state.option.globalstrict || state.option.module || state.option.node ||
+                 state.option.phantom || state.option.browserify))) {
             warning("W097", state.tokens.prev);
           }
         }

diff --git a/tests/unit/envs.js b/tests/unit/envs.js
@@ -86,6 +86,13 @@ exports.node = function (test) {
     .addError(1, "Read only.")
     .test(overwrites, { es3: true, browserify: true });
 
+  TestRun(test, "gh-2657")
+    .test("'use strict';var a;", { node: true });
+
+  // Implied `strict: global` if `strict` is `true`
+  JSHINT("", { node: true, strict: true });
+  test.strictEqual(JSHINT.data().options.strict, "global");
+
   test.done();
 };
 

diff --git a/tests/unit/options.js b/tests/unit/options.js
@@ -1696,6 +1696,9 @@ exports.globalstrict = function (test) {
   code = '(function (test) { "use strict"; return; }());';
   TestRun(test).test(code, { globalstrict: true, strict: true });
 
+  TestRun(test, "gh-2661")
+    .test("'use strict';", { strict: false, globalstrict: true });
+
   test.done();
 };