diff options
Diffstat (limited to 'node_modules/tslint/lib/runner.js')
| -rw-r--r-- | node_modules/tslint/lib/runner.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/node_modules/tslint/lib/runner.js b/node_modules/tslint/lib/runner.js index d8d138a7f..b21019592 100644 --- a/node_modules/tslint/lib/runner.js +++ b/node_modules/tslint/lib/runner.js @@ -38,7 +38,7 @@ function run(options, logger) { case 1: return [2 /*return*/, _a.sent()]; case 2: error_2 = _a.sent(); - if (error_2.name === error_1.FatalError.NAME) { + if (error_2 instanceof error_1.FatalError) { logger.error(error_2.message); return [2 /*return*/, 1 /* FatalError */]; } @@ -138,7 +138,7 @@ function resolveGlobs(files, ignore, outputAbsolutePaths) { } function doLinting(options, files, program, logger) { return tslib_1.__awaiter(this, void 0, void 0, function () { - var possibleConfigAbsolutePath, linter, lastFolder, configFile, _i, files_1, file, contents, folder; + var possibleConfigAbsolutePath, linter, lastFolder, configFile, isFileExcluded, _i, files_1, file, contents, folder; return tslib_1.__generator(this, function (_a) { switch (_a.label) { case 0: @@ -149,6 +149,13 @@ function doLinting(options, files, program, logger) { formattersDirectory: options.formattersDirectory, rulesDirectory: options.rulesDirectory, }, program); + isFileExcluded = function (filepath) { + if (configFile === undefined || configFile.linterOptions == undefined || configFile.linterOptions.exclude == undefined) { + return false; + } + var fullPath = path.resolve(filepath); + return configFile.linterOptions.exclude.some(function (pattern) { return new minimatch_1.Minimatch(pattern).match(fullPath); }); + }; _i = 0, files_1 = files; _a.label = 1; case 1: @@ -166,7 +173,9 @@ function doLinting(options, files, program, logger) { configFile = configuration_1.findConfiguration(possibleConfigAbsolutePath, folder).results; lastFolder = folder; } - linter.lint(file, contents, configFile); + if (!isFileExcluded(file)) { + linter.lint(file, contents, configFile); + } } _a.label = 3; case 3: |