Skip to content

Commit 8be0f5a

Browse files
committed
refactor
1 parent 0247b42 commit 8be0f5a

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

internal/compiler/fileloader.go

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,6 @@ func processAllProgramFiles(
162162
typeResolutionsInFile[path] = task.typeResolutionsInFile
163163
sourceFileMetaDatas[path] = task.metadata
164164

165-
// Collect resolution diagnostics from resolved modules and type reference directives
166-
for _, resolvedModule := range task.resolutionsInFile {
167-
for _, diag := range resolvedModule.ResolutionDiagnostics {
168-
fileLoadDiagnostics.Add(&diag)
169-
}
170-
}
171-
for _, resolvedTypeRef := range task.typeResolutionsInFile {
172-
for _, diag := range resolvedTypeRef.ResolutionDiagnostics {
173-
fileLoadDiagnostics.Add(&diag)
174-
}
175-
}
176165
if task.jsxRuntimeImportSpecifier != nil {
177166
if jsxRuntimeImportSpecifiers == nil {
178167
jsxRuntimeImportSpecifiers = make(map[tspath.Path]*jsxRuntimeImportSpecifier, totalFileCount)
@@ -197,8 +186,28 @@ func processAllProgramFiles(
197186

198187
allFiles := append(libFiles, files...)
199188

189+
for _, resolutions := range resolvedModules {
190+
for _, resolvedModule := range resolutions {
191+
for _, diag := range resolvedModule.ResolutionDiagnostics {
192+
fileLoadDiagnostics.Add(&diag)
193+
}
194+
}
195+
}
196+
for _, typeResolutions := range typeResolutionsInFile {
197+
for _, resolvedTypeRef := range typeResolutions {
198+
for _, diag := range resolvedTypeRef.ResolutionDiagnostics {
199+
fileLoadDiagnostics.Add(&diag)
200+
}
201+
}
202+
}
203+
200204
loader.pathForLibFileResolutions.Range(func(key tspath.Path, value module.ModeAwareCache[*module.ResolvedModule]) bool {
201205
resolvedModules[key] = value
206+
for _, resolvedModule := range value {
207+
for _, diag := range resolvedModule.ResolutionDiagnostics {
208+
fileLoadDiagnostics.Add(&diag)
209+
}
210+
}
202211
return true
203212
})
204213

0 commit comments

Comments
 (0)