summaryrefslogtreecommitdiff
path: root/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2019-07-21 00:15:32 -0400
committerRich Trott <rtrott@gmail.com>2019-07-22 22:32:11 -0700
commite5736d817c93ff9ac88c24d9e6a247a0f057a266 (patch)
treeca899e9f333880f500f060c424d37992b2b63fd2 /tools/node_modules/eslint/lib/cli-engine/file-enumerator.js
parent9949fbda469e70acc45975f5e50eedd2a3cde57d (diff)
downloadandroid-node-v8-e5736d817c93ff9ac88c24d9e6a247a0f057a266.tar.gz
android-node-v8-e5736d817c93ff9ac88c24d9e6a247a0f057a266.tar.bz2
android-node-v8-e5736d817c93ff9ac88c24d9e6a247a0f057a266.zip
tools: update ESLint to 6.1.0
Update ESLint to 6.1.0 PR-URL: https://github.com/nodejs/node/pull/28793 Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Diffstat (limited to 'tools/node_modules/eslint/lib/cli-engine/file-enumerator.js')
-rw-r--r--tools/node_modules/eslint/lib/cli-engine/file-enumerator.js18
1 files changed, 5 insertions, 13 deletions
diff --git a/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js b/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js
index 2840d9fe2d..a027359ae5 100644
--- a/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js
+++ b/tools/node_modules/eslint/lib/cli-engine/file-enumerator.js
@@ -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 [];
}