maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

--showConfig files list condition was inverted from what it needed to be (#28693)

Browse source 
* --showConfig files list condition was inverted from what it needed to be

* Make no assumptions about file list normalization

* accept updated, correct, baseline
This commit is contained in:
Wesley Wigham 2018-11-28 14:01:02 -08:00 committed by GitHub
parent 54bbf74f62
commit 9319ea4941
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/compiler/commandLineParser.ts
View file

@ -1673,13 +1673,13 @@ namespace ts {
const files = map(
filter(
configParseResult.fileNames,
!configParseResult.configFileSpecs ? _ => false : matchesSpecs(
(!configParseResult.configFileSpecs || !configParseResult.configFileSpecs.validatedIncludeSpecs) ? _ => true : matchesSpecs(
configFileName,
configParseResult.configFileSpecs.validatedIncludeSpecs,
configParseResult.configFileSpecs.validatedExcludeSpecs
)
),
f => getRelativePathFromFile(getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), f, getCanonicalFileName)
f => getRelativePathFromFile(getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), getNormalizedAbsolutePath(f, host.getCurrentDirectory()), getCanonicalFileName)
);
const optionMap = serializeCompilerOptions(configParseResult.options, { configFilePath: getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), useCaseSensitiveFileNames: host.useCaseSensitiveFileNames });
const config = {
@ -1713,20 +1713,20 @@ namespace ts {
}
function matchesSpecs(path: string, includeSpecs: ReadonlyArray<string> | undefined, excludeSpecs: ReadonlyArray<string> | undefined): (path: string) => boolean {
if (!includeSpecs) return _ => false;
if (!includeSpecs) return _ => true;
const patterns = getFileMatcherPatterns(path, excludeSpecs, includeSpecs, sys.useCaseSensitiveFileNames, sys.getCurrentDirectory());
const excludeRe = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, sys.useCaseSensitiveFileNames);
const includeRe = patterns.includeFilePattern && getRegexFromPattern(patterns.includeFilePattern, sys.useCaseSensitiveFileNames);
if (includeRe) {
if (excludeRe) {
return path => includeRe.test(path) && !excludeRe.test(path);
return path => !(includeRe.test(path) && !excludeRe.test(path));
}
return path => includeRe.test(path);
return path => !includeRe.test(path);
}
if (excludeRe) {
return path => !excludeRe.test(path);
return path => excludeRe.test(path);
}
return _ => false;
return _ => true;
}
function getCustomTypeMapOfCommandLineOption(optionDefinition: CommandLineOption): Map<string | number> | undefined {

7
tests/baselines/reference/showConfig/Show TSConfig with files options/tsconfig.json
View file

@ -1,3 +1,8 @@
{
"compilerOptions": {}
"compilerOptions": {},
"files": [
"./file0.st",
"./file1.ts",
"./file2.ts"
]
}