Support 'isSourceFileFromExternalLibrary' for source files from '/// <reference types="" />'' #28004
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
…<reference types="" />''
src/compiler/moduleNameResolver.ts
Outdated
| const candidate = combinePaths(typeRoot, typeReferenceDirectiveName); | ||
| const candidateDirectory = getDirectoryPath(candidate); | ||
| const directoryExists = directoryProbablyExists(candidateDirectory, host); | ||
| if (!directoryExists && traceEnabled) { | ||
| trace(host, Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, candidateDirectory); | ||
| } | ||
| return resolvedTypeScriptOnly( |
There was a problem hiding this comment.
Can you not return as is and just add check at final destination since it seems like it can be unified since it all the time checks if pathContains node_modules ?
ghost
force-pushed
the
referenceTypesIsExternal
branch
from
25b1968
to
6d74dbf
Compare
src/compiler/moduleNameResolver.ts
Outdated
| } | ||
| resolvedTypeReferenceDirective = { primary, resolvedFileName: resolved.fileName, packageId: resolved.packageId }; | ||
| resolvedTypeReferenceDirective = { primary, resolvedFileName, packageId, isExternalLibraryImport: pathContainsNodeModules(resolvedFileName) }; |
There was a problem hiding this comment.
In node module resolver, isExternalLibraryImport is checked on path before realPath. https://github.com/Microsoft/TypeScript/blob/master/src/compiler/moduleNameResolver.ts#L903
sheetalkamat
approved these changes
Oct 20, 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 another bug similar to #27917, also discovered via dtslint.
We need to annotate each
ResolvedTypeReferenceDirectiveto indicate whether it came fromnode_modules, and incrementcurrentNodeModulesDepthif so.