Fix isSourceFileFromExternalLibrary for file with redirect #27917
Conversation
This file contains 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
ghost
mentioned this pull request
sheetalkamat
requested changes
Oct 15, 2018
src/compiler/program.ts
Outdated
| @@ -1330,7 +1330,7 @@ namespace ts { | |||
| } | |||
|
|
|||
| function isSourceFileFromExternalLibrary(file: SourceFile): boolean { | |||
| return !!sourceFilesFoundSearchingNodeModules.get(file.path); | |||
| return !!sourceFilesFoundSearchingNodeModules.get((file.redirectInfo ? file.redirectInfo.redirectTarget : file).path); | |||
There was a problem hiding this comment.
I think instead you should specifically set it correctly when we create redirect file. Or you also need to handle oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath)!) condition when we use program structure completely
src/compiler/program.ts
Outdated
| @@ -2031,6 +2031,7 @@ namespace ts { | |||
| redirect.resolvedPath = resolvedPath; | |||
| redirect.originalFileName = originalFileName; | |||
| redirect.redirectInfo = { redirectTarget, unredirected }; | |||
| sourceFilesFoundSearchingNodeModules.set(path, !!sourceFilesFoundSearchingNodeModules.get(redirectTarget.path)); | |||
There was a problem hiding this comment.
No. This doesn't work either. You want to set it just like normal sourceFile that is with sourceFilesFoundSearchingNodeModules.set(path, currentNodeModulesDepth > 0); otherwise you need to handle many more cases when we find sourceFile and aren't looking for currentNodeModules and set it to false. (from code
if (file && sourceFilesFoundSearchingNodeModules.get(file.path) && currentNodeModulesDepth === 0) {
sourceFilesFoundSearchingNodeModules.set(file.path, false);
sheetalkamat
approved these changes
Oct 16, 2018
ghost
merged commit
This was referenced Oct 17, 2018
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes a bug where a redirecting file was never considered to be from an external library.