Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: glob processing (fixes #11940) #11986

Merged
merged 3 commits into from Jul 21, 2019
Merged

Fix: glob processing (fixes #11940) #11986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe0d373
Fix: glob processing (fixes #11940)
mysticatea Jul 14, 2019
cb035fa
Merge branch 'master' into issue11940
mysticatea Jul 18, 2019
8569b8a
change the order
mysticatea Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 5 additions & 13 deletions lib/cli-engine/file-enumerator.js
View file
Open in desktop
Expand Up @@ -292,26 +292,18 @@ class FileEnumerator {
_iterateFiles(pattern) {
const { cwd, globInputPaths } = internalSlotsMap.get(this);
const absolutePath = path.resolve(cwd, pattern);

if (globInputPaths && isGlobPattern(pattern)) {
return this._iterateFilesWithGlob(
absolutePath,
dotfilesPattern.test(pattern)
);
}

const isDot = dotfilesPattern.test(pattern);
const stat = statSafeSync(absolutePath);

if (stat && stat.isDirectory()) {
return this._iterateFilesWithDirectory(
absolutePath,
dotfilesPattern.test(pattern)
);
return this._iterateFilesWithDirectory(absolutePath, isDot);
}

if (stat && stat.isFile()) {
return this._iterateFilesWithFile(absolutePath);
}
if (globInputPaths && isGlobPattern(pattern)) {
return this._iterateFilesWithGlob(absolutePath, isDot);
}

return [];
}
Expand Down
41 changes: 41 additions & 0 deletions tests/lib/cli-engine/cli-engine.js
View file
Open in desktop
Expand Up @@ -3454,6 +3454,47 @@ describe("CLIEngine", () => {
assert.strictEqual(report.results[0].messages[0].message, "ok");
});
});

describe("glob pattern '[ab].js'", () => {
const root = getFixturePath("cli-engine/unmatched-glob");

it("should match '[ab].js' if existed.", () => {
CLIEngine = defineCLIEngineWithInMemoryFileSystem({
cwd: () => root,
files: {
"a.js": "",
"b.js": "",
"ab.js": "",
"[ab].js": "",
".eslintrc.yml": "root: true"
}
}).CLIEngine;
engine = new CLIEngine();

const { results } = engine.executeOnFiles(["[ab].js"]);
const filenames = results.map(r => path.basename(r.filePath));

assert.deepStrictEqual(filenames, ["[ab].js"]);
});

it("should match 'a.js' and 'b.js' if '[ab].js' didn't existed.", () => {
CLIEngine = defineCLIEngineWithInMemoryFileSystem({
cwd: () => root,
files: {
"a.js": "",
"b.js": "",
"ab.js": "",
".eslintrc.yml": "root: true"
}
}).CLIEngine;
engine = new CLIEngine();

const { results } = engine.executeOnFiles(["[ab].js"]);
const filenames = results.map(r => path.basename(r.filePath));

assert.deepStrictEqual(filenames, ["a.js", "b.js"]);
});
});
});

describe("getConfigForFile", () => {
Expand Down