fileloader skips files w/unsupported extensions (microsoft#437)

Author: sandersn

internal/compiler/fileloader.go

@@ -30,6 +30,7 @@ type fileLoader struct {
 	defaultLibraryPath      string
 	comparePathsOptions     tspath.ComparePathsOptions
 	rootTasks               []*parseTask
+	supportedExtensions     []string
 }
 
 func processAllProgramFiles(
@@ -40,6 +41,7 @@ func processAllProgramFiles(
 	rootFiles []string,
 	libs []string,
 ) (files []*ast.SourceFile, resolvedModules map[tspath.Path]module.ModeAwareCache[*module.ResolvedModule]) {
+	supportedExtensions := tsoptions.GetSupportedExtensions(compilerOptions, nil /*extraFileExtensions*/)
 	loader := fileLoader{
 		host:               host,
 		programOptions:     programOptions,
@@ -51,8 +53,9 @@ func processAllProgramFiles(
 			UseCaseSensitiveFileNames: host.FS().UseCaseSensitiveFileNames(),
 			CurrentDirectory:          host.GetCurrentDirectory(),
 		},
-		wg:        core.NewWorkGroup(programOptions.SingleThreaded),
-		rootTasks: make([]*parseTask, 0, len(rootFiles)+len(libs)),
+		wg:                  core.NewWorkGroup(programOptions.SingleThreaded),
+		rootTasks:           make([]*parseTask, 0, len(rootFiles)+len(libs)),
+		supportedExtensions: core.Flatten(tsoptions.GetSupportedExtensionsWithJsonIfResolveJsonModule(compilerOptions, supportedExtensions)),
 	}
 
 	loader.addRootTasks(rootFiles, false)
@@ -79,7 +82,9 @@ func processAllProgramFiles(
 func (p *fileLoader) addRootTasks(files []string, isLib bool) {
 	for _, fileName := range files {
 		absPath := tspath.GetNormalizedAbsolutePath(fileName, p.host.GetCurrentDirectory())
-		p.rootTasks = append(p.rootTasks, &parseTask{normalizedFilePath: absPath, isLib: isLib})
+		if core.Tristate.IsTrue(p.compilerOptions.AllowNonTsExtensions) || slices.Contains(p.supportedExtensions, tspath.TryGetExtensionFromPath(absPath)) {
+			p.rootTasks = append(p.rootTasks, &parseTask{normalizedFilePath: absPath, isLib: isLib})
+		}
 	}
 }
 

internal/testutil/baseline/baseline.go

@@ -43,9 +43,8 @@ func Run(t *testing.T, fileName string, actual string, opts Options) {
 			}
 		}
 		writeComparison(t, diff, diffFileName, false /*useSubmodule*/, opts)
-	} else {
-		writeComparison(t, actual, fileName, false /*useSubmodule*/, opts)
 	}
+	writeComparison(t, actual, fileName, false /*useSubmodule*/, opts)
 }
 
 func getBaselineDiff(t *testing.T, actual string, fileName string) string {
@@ -116,19 +115,23 @@ func writeComparison(t *testing.T, actual string, relativeFileName string, useSu
 
 	if _, err := os.Stat(localFileName); err == nil {
 		if err := os.Remove(localFileName); err != nil {
-			t.Fatal(fmt.Errorf("failed to remove the local baseline file %s: %w", localFileName, err))
+			t.Error(fmt.Errorf("failed to remove the local baseline file %s: %w", localFileName, err))
+			return
 		}
 	}
 	if actual != expected {
 		if err := os.MkdirAll(filepath.Dir(localFileName), 0o755); err != nil {
-			t.Fatal(fmt.Errorf("failed to create directories for the local baseline file %s: %w", localFileName, err))
+			t.Error(fmt.Errorf("failed to create directories for the local baseline file %s: %w", localFileName, err))
+			return
 		}
 		if actual == NoContent {
 			if err := os.WriteFile(localFileName+".delete", []byte{}, 0o644); err != nil {
-				t.Fatal(fmt.Errorf("failed to write the local baseline file %s: %w", localFileName+".delete", err))
+				t.Error(fmt.Errorf("failed to write the local baseline file %s: %w", localFileName+".delete", err))
+				return
 			}
 		} else if err := os.WriteFile(localFileName, []byte(actual), 0o644); err != nil {
-			t.Fatal(fmt.Errorf("failed to write the local baseline file %s: %w", localFileName, err))
+			t.Error(fmt.Errorf("failed to write the local baseline file %s: %w", localFileName, err))
+			return
 		}
 
 		if _, err := os.Stat(referenceFileName); err != nil {

internal/testutil/tsbaseline/type_symbol_baseline.go

@@ -128,7 +128,7 @@ func generateBaseline(
 	if result.Len() > 0 {
 		return fmt.Sprintf("//// [%s] ////\r\n\r\n%s%s", header, strings.Join(perfLines, "\n"), result.String())
 	}
-	return result.String()
+	return baseline.NoContent
 }
 
 func iterateBaseline(allFiles []*harnessutil.TestFile, fullWalker *typeWriterWalker, isSymbolBaseline bool) []string {

internal/tsoptions/tsconfigparsing.go

@@ -1451,8 +1451,8 @@ func getFileNamesFromConfigSpecs(
 	validatedExcludeSpecs := configFileSpecs.validatedExcludeSpecs
 	// Rather than re-query this for each file and filespec, we query the supported extensions
 	// once and store it on the expansion context.
-	supportedExtensions := getSupportedExtensions(options, extraFileExtensions)
-	supportedExtensionsWithJsonIfResolveJsonModule := getSupportedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions)
+	supportedExtensions := GetSupportedExtensions(options, extraFileExtensions)
+	supportedExtensionsWithJsonIfResolveJsonModule := GetSupportedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions)
 	// Literal files are always included verbatim. An "include" or "exclude" specification cannot
 	// remove a literal file.
 	for _, fileName := range validatedFilesSpec {
@@ -1518,7 +1518,7 @@ func getFileNamesFromConfigSpecs(
 	return files
 }
 
-func getSupportedExtensions(options *core.CompilerOptions, extraFileExtensions []fileExtensionInfo) [][]string {
+func GetSupportedExtensions(options *core.CompilerOptions, extraFileExtensions []fileExtensionInfo) [][]string {
 	needJsExtensions := options.GetAllowJs()
 	if len(extraFileExtensions) == 0 {
 		if needJsExtensions {
@@ -1544,7 +1544,7 @@ func getSupportedExtensions(options *core.CompilerOptions, extraFileExtensions [
 	return extensions
 }
 
-func getSupportedExtensionsWithJsonIfResolveJsonModule(options *core.CompilerOptions, supportedExtensions [][]string) [][]string {
+func GetSupportedExtensionsWithJsonIfResolveJsonModule(options *core.CompilerOptions, supportedExtensions [][]string) [][]string {
 	if options == nil || !options.GetResolveJsonModule() {
 		return supportedExtensions
 	}

testdata/baselines/reference/submodule/compiler/checkJsFiles6.symbols

@@ -5,11 +5,6 @@ class c {
 >c : Symbol(c, Decl(a.ts, 0, 0))
 }
 
-=== b.js.map ===
-function foo() {
->foo : Symbol(foo, Decl(b.js.map, 0, 0))
-}
-
 === b.js ===
 function bar() {
 >bar : Symbol(bar, Decl(b.js, 0, 0))

testdata/baselines/reference/submodule/compiler/checkJsFiles6.symbols.diff

@@ -5,11 +5,6 @@ class c {
 >c : Symbol(c, Decl(a.ts, 0, 0))
 }
 
-=== b.js.map ===
-function foo() {
->foo : Symbol(foo, Decl(b.js.map, 0, 0))
-}
-
 === b.js ===
 function bar() {
 >bar : Symbol(bar, Decl(b.js, 0, 0))