Skip to content

Commit aed876d

Browse files
sheetalkamatsheetalkamat
committed
Refactoring to unify updating no input files error
1 parent 5f2741b commit aed876d

File tree

5 files changed

+38
-27
lines changed

5 files changed

+38
-27
lines changed

‎src/compiler/commandLineParser.ts

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,7 +1948,7 @@ namespace ts {
19481948
}
19491949

19501950
const result = matchFileNames(filesSpecs, includeSpecs, excludeSpecs, configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath, options, host, errors, extraFileExtensions, sourceFile);
1951-
if (result.fileNames.length === 0 && !hasProperty(raw, "files") && resolutionStack.length === 0 && !hasProperty(raw, "references")) {
1951+
if (shouldReportNoInputFiles(result, canJsonReportNoInutFiles(raw), resolutionStack)) {
19521952
errors.push(getErrorForNoInputFiles(result.spec, configFileName));
19531953
}
19541954

@@ -1983,20 +1983,39 @@ namespace ts {
19831983
}
19841984
}
19851985

1986-
/*@internal*/
1987-
export function isErrorNoInputFiles(error: Diagnostic) {
1986+
function isErrorNoInputFiles(error: Diagnostic) {
19881987
return error.code === Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2.code;
19891988
}
19901989

1991-
/*@internal*/
1992-
export function getErrorForNoInputFiles({ includeSpecs, excludeSpecs }: ConfigFileSpecs, configFileName: string | undefined) {
1990+
function getErrorForNoInputFiles({ includeSpecs, excludeSpecs }: ConfigFileSpecs, configFileName: string | undefined) {
19931991
return createCompilerDiagnostic(
19941992
Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
19951993
configFileName || "tsconfig.json",
19961994
JSON.stringify(includeSpecs || []),
19971995
JSON.stringify(excludeSpecs || []));
19981996
}
19991997

1998+
function shouldReportNoInputFiles(result: ExpandResult, canJsonReportNoInutFiles: boolean, resolutionStack?: Path[]) {
1999+
return result.fileNames.length === 0 && canJsonReportNoInutFiles && (!resolutionStack || resolutionStack.length === 0);
2000+
}
2001+
2002+
/*@internal*/
2003+
export function canJsonReportNoInutFiles(raw: any) {
2004+
return !hasProperty(raw, "files") && !hasProperty(raw, "references");
2005+
}
2006+
2007+
/*@internal*/
2008+
export function updateErrorForNoInputFiles(result: ExpandResult, configFileName: string, configFileSpecs: ConfigFileSpecs, configParseDiagnostics: Diagnostic[], canJsonReportNoInutFiles: boolean) {
2009+
const existingErrors = configParseDiagnostics.length;
2010+
if (shouldReportNoInputFiles(result, canJsonReportNoInutFiles)) {
2011+
configParseDiagnostics.push(getErrorForNoInputFiles(configFileSpecs, configFileName));
2012+
}
2013+
else {
2014+
filterMutate(configParseDiagnostics, error => !isErrorNoInputFiles(error));
2015+
}
2016+
return existingErrors !== configParseDiagnostics.length;
2017+
}
2018+
20002019
interface ParsedTsconfig {
20012020
raw: any;
20022021
options?: CompilerOptions;

‎src/compiler/tsbuild.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -902,12 +902,7 @@ namespace ts {
902902
else if (reloadLevel === ConfigFileProgramReloadLevel.Partial) {
903903
// Update file names
904904
const result = getFileNamesFromConfigSpecs(proj.configFileSpecs!, getDirectoryPath(resolved), proj.options, parseConfigFileHost);
905-
if (result.fileNames.length !== 0) {
906-
filterMutate(proj.errors, error => !isErrorNoInputFiles(error));
907-
}
908-
else if (!proj.configFileSpecs!.filesSpecs && !some(proj.errors, isErrorNoInputFiles)) {
909-
proj.errors.push(getErrorForNoInputFiles(proj.configFileSpecs!, resolved));
910-
}
905+
updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs!, proj.errors, canJsonReportNoInutFiles(proj.raw));
911906
proj.fileNames = result.fileNames;
912907
watchInputFiles(resolved, proj);
913908
}
@@ -1002,6 +997,7 @@ namespace ts {
1002997
return resultFlags;
1003998
}
1004999
if (configFile.fileNames.length === 0) {
1000+
reportAndStoreErrors(proj, configFile.errors);
10051001
// Nothing to build - must be a solution file, basically
10061002
return BuildResultFlags.None;
10071003
}

‎src/compiler/watch.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,8 @@ namespace ts {
469469
const { configFileName, optionsToExtend: optionsToExtendForConfigFile = {}, createProgram } = host;
470470
let { rootFiles: rootFileNames, options: compilerOptions, projectReferences } = host;
471471
let configFileSpecs: ConfigFileSpecs;
472-
let configFileParsingDiagnostics: ReadonlyArray<Diagnostic> | undefined;
472+
let configFileParsingDiagnostics: Diagnostic[] | undefined;
473+
let canConfigFileJsonReportNoInputFiles = false;
473474
let hasChangedConfigFileParsingErrors = false;
474475

475476
const cachedDirectoryStructureHost = configFileName === undefined ? undefined : createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames);
@@ -829,12 +830,7 @@ namespace ts {
829830
function reloadFileNamesFromConfigFile() {
830831
writeLog("Reloading new file names and options");
831832
const result = getFileNamesFromConfigSpecs(configFileSpecs, getDirectoryPath(configFileName), compilerOptions, parseConfigFileHost);
832-
if (result.fileNames.length) {
833-
configFileParsingDiagnostics = filter(configFileParsingDiagnostics, error => !isErrorNoInputFiles(error));
834-
hasChangedConfigFileParsingErrors = true;
835-
}
836-
else if (!configFileSpecs.filesSpecs && !some(configFileParsingDiagnostics, isErrorNoInputFiles)) {
837-
configFileParsingDiagnostics = configFileParsingDiagnostics!.concat(getErrorForNoInputFiles(configFileSpecs, configFileName));
833+
if (updateErrorForNoInputFiles(result, configFileName, configFileSpecs, configFileParsingDiagnostics!, canConfigFileJsonReportNoInputFiles)) {
838834
hasChangedConfigFileParsingErrors = true;
839835
}
840836
rootFileNames = result.fileNames;
@@ -867,7 +863,8 @@ namespace ts {
867863
compilerOptions = configFileParseResult.options;
868864
configFileSpecs = configFileParseResult.configFileSpecs!; // TODO: GH#18217
869865
projectReferences = configFileParseResult.projectReferences;
870-
configFileParsingDiagnostics = getConfigFileParsingDiagnostics(configFileParseResult);
866+
configFileParsingDiagnostics = getConfigFileParsingDiagnostics(configFileParseResult).slice();
867+
canConfigFileJsonReportNoInputFiles = canJsonReportNoInutFiles(configFileParseResult.raw);
871868
hasChangedConfigFileParsingErrors = true;
872869
}
873870

‎src/server/editorServices.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1674,6 +1674,7 @@ namespace ts.server {
16741674
};
16751675
}
16761676
project.configFileSpecs = parsedCommandLine.configFileSpecs;
1677+
project.canConfigFileJsonReportNoInputFiles = canJsonReportNoInutFiles(parsedCommandLine.raw);
16771678
project.setProjectErrors(configFileErrors);
16781679
project.updateReferences(parsedCommandLine.projectReferences);
16791680
const lastFileExceededProgramSize = this.getFilenameForExceededTotalSizeLimitForNonTsFiles(project.canonicalConfigFilePath, compilerOptions, parsedCommandLine.fileNames, fileNamePropertyReader);
@@ -1766,7 +1767,7 @@ namespace ts.server {
17661767
const configFileSpecs = project.configFileSpecs!; // TODO: GH#18217
17671768
const configFileName = project.getConfigFilePath();
17681769
const fileNamesResult = getFileNamesFromConfigSpecs(configFileSpecs, getDirectoryPath(configFileName), project.getCompilationSettings(), project.getCachedDirectoryStructureHost(), this.hostConfiguration.extraFileExtensions);
1769-
project.updateErrorOnNoInputFiles(fileNamesResult.fileNames.length !== 0);
1770+
project.updateErrorOnNoInputFiles(fileNamesResult);
17701771
this.updateNonInferredProjectFiles(project, fileNamesResult.fileNames.concat(project.getExternalFiles()), fileNamePropertyReader);
17711772
return project.updateGraph();
17721773
}

‎src/server/project.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,9 @@ namespace ts.server {
13241324
/*@internal*/
13251325
configFileSpecs: ConfigFileSpecs | undefined;
13261326

1327+
/*@internal*/
1328+
canConfigFileJsonReportNoInputFiles: boolean;
1329+
13271330
/** Ref count to the project when opened from external project */
13281331
private externalProjectRefCount = 0;
13291332

@@ -1540,13 +1543,8 @@ namespace ts.server {
15401543
}
15411544

15421545
/*@internal*/
1543-
updateErrorOnNoInputFiles(hasFileNames: boolean) {
1544-
if (hasFileNames) {
1545-
filterMutate(this.projectErrors!, error => !isErrorNoInputFiles(error)); // TODO: GH#18217
1546-
}
1547-
else if (!this.configFileSpecs!.filesSpecs && !some(this.projectErrors, isErrorNoInputFiles)) { // TODO: GH#18217
1548-
this.projectErrors!.push(getErrorForNoInputFiles(this.configFileSpecs!, this.getConfigFilePath()));
1549-
}
1546+
updateErrorOnNoInputFiles(fileNameResult: ExpandResult) {
1547+
updateErrorForNoInputFiles(fileNameResult, this.getConfigFilePath(), this.configFileSpecs!, this.projectErrors!, this.canConfigFileJsonReportNoInputFiles);
15501548
}
15511549
}
15521550

0 commit comments

Comments
 (0)