Use the correct old file when re-using file resolutions #20403
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhegazy
reviewed
Dec 2, 2017
src/compiler/program.ts
Outdated
| @@ -1945,7 +1945,7 @@ namespace ts { | |||
| if (file.imports.length || file.moduleAugmentations.length) { | |||
| // Because global augmentation doesn't have string literal name, we can check for global augmentation as such. | |||
| const moduleNames = getModuleNames(file); | |||
| const oldProgramState = { program: oldProgram, file, modifiedFilePaths }; | |||
| const oldProgramState = { program: oldProgram, file: oldProgram ? oldProgram.getSourceFile(file.fileName) : undefined, modifiedFilePaths }; | |||
There was a problem hiding this comment.
consider renaming file to oldSourceFile to avoid future confusion.
mhegazy
reviewed
Dec 2, 2017
src/compiler/program.ts
Outdated
| if (resolutionToFile) { | ||
| // module used to be resolved to file - ignore it | ||
| const resolvedFile = resolutionToFile && oldProgramState.program && oldProgramState.program.getSourceFile(resolutionToFile.resolvedFileName); | ||
| if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) { |
There was a problem hiding this comment.
can you add a unit test for this one.
mhegazy
approved these changes
Dec 2, 2017
|
do we need to port this to 2.6.3? or is just for 2.7? |
ghost
approved these changes
Dec 4, 2017
src/compiler/program.ts
Outdated
| // module used to be resolved to file - ignore it | ||
| const resolutionToFile = getResolvedModule(oldProgramState.oldSourceFile, moduleName); | ||
| const resolvedFile = resolutionToFile && oldProgramState.program && oldProgramState.program.getSourceFile(resolutionToFile.resolvedFileName); | ||
| if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) { |
There was a problem hiding this comment.
Nit: No need to test resolutionToFile && since resolvedFile will only be defined if that is.
src/compiler/program.ts
Outdated
| @@ -1945,7 +1945,7 @@ namespace ts { | |||
| if (file.imports.length || file.moduleAugmentations.length) { | |||
| // Because global augmentation doesn't have string literal name, we can check for global augmentation as such. | |||
| const moduleNames = getModuleNames(file); | |||
| const oldProgramState = { program: oldProgram, file, modifiedFilePaths }; | |||
| const oldProgramState: OldProgramState = { program: oldProgram, oldSourceFile: oldProgram ? oldProgram.getSourceFile(file.fileName) : undefined, modifiedFilePaths }; | |||
There was a problem hiding this comment.
Nit: oldProgram && oldProgram.getSourceFile(file.fileName) is shorter
ghost
reviewed
Dec 4, 2017
src/compiler/program.ts
Outdated
| @@ -704,7 +704,7 @@ namespace ts { | |||
|
|
|||
| interface OldProgramState { | |||
| program: Program | undefined; | |||
| file: SourceFile; | |||
| oldSourceFile: SourceFile; | |||
RyanCavanaugh
force-pushed
the
fix14565
branch
from
8b6072e to
f952953
Compare
RyanCavanaugh
force-pushed
the
fix14565
branch
from
f952953 to
df34540
Compare
|
Picking up from the other PR |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also optimizes re-use of ambient module non-resolution by not incorrectly treating a resolution to a global sourcefile (as sometimes happens when we resolve an
@types/reference) as it it were an external module. This saves us re-doing module resolution for those files during program recompute.Fixes #14565