[[FIX]] Prevent regressions in bug fix

Explicitly re-implement the erroneous behavior corrected by the previous commit in order to avoid breaking changes. Tolerate backwards-incompatable changes in those instances where the input is invalid JavaScript.
jshint · Jul 19, 2015 · 477d3ad · 477d3ad
1 parent 925a983
commit 477d3ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/jshint.js b/src/jshint.js
@@ -4618,7 +4618,7 @@ var JSHINT = (function() {
       name = tkn.value;
     }
 
-    if (props[name]) {
+    if (props[name] && name !== "__proto__") {
       warning("W075", state.tokens.next, msg, name);
     } else {
       props[name] = Object.create(null);
@@ -4654,7 +4654,7 @@ var JSHINT = (function() {
     state.nameStack.set(tkn);
 
     if (props[name]) {
-      if (props[name].basic || props[name][flagName]) {
+      if ((props[name].basic || props[name][flagName]) && name !== "__proto__") {
         warning("W075", state.tokens.next, msg, name);
       }
     } else {

diff --git a/src/scope-manager.js b/src/scope-manager.js
@@ -589,7 +589,7 @@ var scopeManager = function(state, predefined, exported, declared) {
         } else if (state.option.shadow !== true) {
           // now since we didn't get any block scope variables, test for var/function
           // shadowing
-          if (declaredInCurrentFunctionScope) {
+          if (declaredInCurrentFunctionScope && labelName !== "__proto__") {
 
             // see https://github.com/jshint/jshint/issues/2400
             if (!_currentFunct["(global)"]) {

diff --git a/tests/unit/core.js b/tests/unit/core.js
@@ -1778,8 +1778,9 @@ exports.duplicateProto = function (test) {
     "}());"
   ];
 
+  // TODO: Enable this expected warning in the next major release
   TestRun(test, "Duplicate `var`s")
-    .addError(3, "'__proto__' is already defined.")
+    //.addError(3, "'__proto__' is already defined.")
     .test(src, { proto: true });
 
   src = [
@@ -1811,8 +1812,9 @@ exports.duplicateProto = function (test) {
     "};"
   ];
 
+  // TODO: Enable this expected warning in the next major release
   TestRun(test, "Duplicate keys (data)")
-    .addError(3, "Duplicate key '__proto__'.")
+    //.addError(3, "Duplicate key '__proto__'.")
     .test(src, { proto: true });
 
   src = [
@@ -1822,8 +1824,9 @@ exports.duplicateProto = function (test) {
     "};"
   ];
 
+  // TODO: Enable this expected warning in the next major release
   TestRun(test, "Duplicate keys (data and accessor)")
-    .addError(3, "Duplicate key '__proto__'.")
+    //.addError(3, "Duplicate key '__proto__'.")
     .test(src, { proto: true });
 
   src = [