indent:false shouldn't trigger indent warnings; closes jshintGH-1035

jugglinmike · Oct 21, 2014 · 41dddea · 41dddea
1 parent aa66669
commit 41dddea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/stable/jshint.js b/src/stable/jshint.js
@@ -4147,7 +4147,7 @@ var JSHINT = (function () {
 						newOptionObj["(explicitNewcap)"] = true;
 
 					if (optionKeys[x] === "indent")
-						newOptionObj["(explicitIndent)"] = true;
+						newOptionObj["(explicitIndent)"] = o[optionKeys[x]] === false ? false : true;
 				}
 			}
 		}

diff --git a/tests/stable/unit/options.js b/tests/stable/unit/options.js
@@ -1115,6 +1115,12 @@ exports.indentation = function (test) {
 		.addError(6, "Mixed spaces and tabs.")
 		.test(src, {es3: true});
 
+	// indent:false shouldn't trigger indent (GH-1035)
+	TestRun(test)
+		.addError(5, "Mixed spaces and tabs.")
+		.addError(6, "Mixed spaces and tabs.")
+		.test(src, {es3: true, indent: false});
+
 	TestRun(test)
 		.addError(5, "Mixed spaces and tabs.")
 		.addError(6, "Mixed spaces and tabs.")