[[FIX]] Make the 'freeze' option less strict

Don't warn when the prototype of a local variable named as a native object is modified. Fixes gh-1600
jshint · Jan 30, 2016 · b76447c · b76447c
1 parent 480252a
commit b76447c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/jshint.js b/src/jshint.js
@@ -1301,8 +1301,10 @@ var JSHINT = (function() {
       while (!obj.identifier && typeof obj.left === "object")
         obj = obj.left;
 
-      if (obj.identifier && natives.indexOf(obj.value) >= 0)
+      if (obj.identifier && natives.indexOf(obj.value) >= 0 &&
+          state.funct["(scope)"].isPredefined(obj.value)) {
         return obj.value;
+      }
     }
 
     var prototype = walkPrototype(left);

diff --git a/tests/unit/fixtures/nativeobject.js b/tests/unit/fixtures/nativeobject.js
@@ -16,4 +16,14 @@ Boolean.prototype = {
 
 NonArray.prototype.random = function () {
   return 4;
-};
+};
+
+{
+  let Array = {};
+  Array.prototype.method = function() {};
+}
+
+(function() {
+  var Array = 2;
+  Array.prototype.method = function() {};
+}());
diff --git a/tests/unit/options.js b/tests/unit/options.js
@@ -2519,10 +2519,10 @@ exports.freeze = function (test) {
   TestRun(test)
     .addError(3, "Extending prototype of native object: 'Array'.")
     .addError(13, "Extending prototype of native object: 'Boolean'.")
-    .test(src, { freeze: true });
+    .test(src, { freeze: true, esversion: 6 });
 
   TestRun(test)
-    .test(src);
+    .test(src, { esversion: 6 });
 
   test.done();
 };