Make more tests pass

eslint · Oct 4, 2022 · d7bc4fb · d7bc4fb
1 parent 2c36349
commit d7bc4fb
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/lib/config/default-config.js b/lib/config/default-config.js
@@ -52,7 +52,7 @@ exports.defaultConfig = [
     {
         ignores: [
             "**/node_modules/**",
-            "**/.git"
+            ".git/"
         ]
     },
 

diff --git a/lib/eslint/eslint-helpers.js b/lib/eslint/eslint-helpers.js
@@ -248,7 +248,7 @@ async function findFiles({
             if (stat.isFile()) {
                 results.push({
                     filePath,
-                    ignored: configs.isIgnored(filePath)
+                    ignored: configs.isFileIgnored(filePath)
                 });
             }
 

diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
   "bugs": "https://github.com/eslint/eslint/issues/",
   "dependencies": {
     "@eslint/eslintrc": "^1.3.2",
-    "@humanwhocodes/config-array": "^0.11.1",
+    "@humanwhocodes/config-array": "^0.11.2",
     "@humanwhocodes/module-importer": "^1.0.1",
     "@nodelib/fs.walk": "^1.2.8",
     "ajv": "^6.10.0",

diff --git a/tests/fixtures/ignores-directory/eslint.config.js b/tests/fixtures/ignores-directory/eslint.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+    ignores: ["subdir/subsubdir"]
+};
diff --git a/tests/fixtures/ignores-directory/subdir/subsubdir/a.js b/tests/fixtures/ignores-directory/subdir/subsubdir/a.js
diff --git a/tests/lib/eslint/flat-eslint.js b/tests/lib/eslint/flat-eslint.js
@@ -1113,6 +1113,26 @@ describe("FlatESLint", () => {
             });
 
 
+            // https://github.com/eslint/eslint/issues/16354
+            it.only("should skip subdirectory files when ignore pattern matches subdirectory", async () => {
+                eslint = new FlatESLint({
+                    cwd: getFixturePath("ignores-directory")
+                });
+
+                await assert.rejects(async () => {
+                    await eslint.lintFiles(["subdir/**"]);
+                }, /All files matched by 'subdir\/\*\*' are ignored\./u);
+
+                await assert.rejects(async () => {
+                    await eslint.lintFiles(["subdir/subsubdir/**"]);
+                }, /All files matched by 'subdir\/subsubdir\/\*\*' are ignored\./u);
+
+                await assert.rejects(async () => {
+                    await eslint.lintFiles(["subdir/subsubdir/a.js"]);
+                }, /All files matched by 'subdir\/subsubdir\/a.js' are ignored\./u);
+            });
+
+
         });