Merge pull request microsoft#26870 from ajafff/composite-files-check

RyanCavanaugh · web-flow · commit f79e64561f23 · 2018-09-05T12:32:56.000-07:00
better condition for file include exhaustiveness check
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -2430,12 +2430,14 @@ namespace ts {
             }
 
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
-            if (options.composite && rootNames.length < files.length) {
-                const normalizedRootNames = rootNames.map(r => normalizePath(r).toLowerCase());
-                const sourceFiles = files.filter(f => !f.isDeclarationFile).map(f => normalizePath(f.path).toLowerCase());
-                for (const file of sourceFiles) {
-                    if (normalizedRootNames.every(r => r !== file)) {
-                        programDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
+            if (options.composite) {
+                const sourceFiles = files.filter(f => !f.isDeclarationFile);
+                if (rootNames.length < sourceFiles.length) {
+                    const normalizedRootNames = rootNames.map(r => normalizePath(r).toLowerCase());
+                    for (const file of sourceFiles.map(f => normalizePath(f.path).toLowerCase())) {
+                        if (normalizedRootNames.indexOf(file) === -1) {
+                            programDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
+                        }
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -2430,12 +2430,14 @@ namespace ts {`
`2430`	`2430`	`}`
`2431`	`2431`
`2432`	`2432`	`// List of collected files is complete; validate exhautiveness if this is a project with a file list`
`2433`		`- if (options.composite && rootNames.length < files.length) {`
`2434`		`- const normalizedRootNames = rootNames.map(r => normalizePath(r).toLowerCase());`
`2435`		`- const sourceFiles = files.filter(f => !f.isDeclarationFile).map(f => normalizePath(f.path).toLowerCase());`
`2436`		`- for (const file of sourceFiles) {`
`2437`		`- if (normalizedRootNames.every(r => r !== file)) {`
`2438`		`- programDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));`
	`2433`	`+ if (options.composite) {`
	`2434`	`+ const sourceFiles = files.filter(f => !f.isDeclarationFile);`
	`2435`	`+ if (rootNames.length < sourceFiles.length) {`
	`2436`	`+ const normalizedRootNames = rootNames.map(r => normalizePath(r).toLowerCase());`
	`2437`	`+ for (const file of sourceFiles.map(f => normalizePath(f.path).toLowerCase())) {`
	`2438`	`+ if (normalizedRootNames.indexOf(file) === -1) {`
	`2439`	`+ programDiagnostics.add(createCompilerDiagnostic(Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));`
	`2440`	`+ }`
`2439`	`2441`	`}`
`2440`	`2442`	`}`
`2441`	`2443`	`}`