Fix: --ignore-pattern can't uningnore files (fixes #6127) (#6253)

Author: alberto

lib/ignored-paths.js

@@ -124,11 +124,6 @@ function IgnoredPaths(options) {
     if (options.ignore !== false) {
         var ignorePath;
 
-        if (options.ignorePattern) {
-            addPattern(this.ig.custom, options.ignorePattern);
-            addPattern(this.ig.default, options.ignorePattern);
-        }
-
         if (options.ignorePath) {
             debug("Using specific ignore file");
 
@@ -159,6 +154,10 @@ function IgnoredPaths(options) {
             addIgnoreFile(this.ig.default, ignorePath);
         }
 
+        if (options.ignorePattern) {
+            addPattern(this.ig.custom, options.ignorePattern);
+            addPattern(this.ig.default, options.ignorePattern);
+        }
     }
 
     this.options = options;

tests/lib/ignored-paths.js

@@ -340,6 +340,12 @@ describe("IgnoredPaths", function() {
             assert.isFalse(ignoredPaths.contains(getFixturePath("unignored.js")));
         });
 
+        it("should return false for ignored file when unignored with ignore pattern", function() {
+            var ignoredPaths = new IgnoredPaths({ ignore: true, ignorePath: getFixturePath(".eslintignore"), ignorePattern: "!sampleignorepattern", cwd: getFixturePath() });
+
+            assert.isFalse(ignoredPaths.contains(getFixturePath("sampleignorepattern")));
+
+        });
     });
 
     describe("initialization with ignorePath containing commented lines", function() {