Miscellaneous code cleanup relating to module resolution #28092
Merged
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
ghost
force-pushed
the
importResolution
branch
from
e0b782d to
f432ce4
Compare
src/server/project.ts
Outdated
| @@ -1194,6 +1151,27 @@ namespace ts.server { | |||
| } | |||
| } | |||
|
|
|||
| function getUnresolvedImports(program: Program, cachedUnresolvedImportsPerFile: Map<ReadonlyArray<string>>): SortedReadonlyArray<string> { | |||
| const ambientModules = program.getTypeChecker().getAmbientModules().map(mod => stripQuotes(mod.getName())); | |||
| return toDeduplicatedSortedArray(flatMap(program.getSourceFiles(), sourceFile => | |||
There was a problem hiding this comment.
flatMap will never return undefined (since there will be source files) and thus we are allocating single length array in all these updates.
There was a problem hiding this comment.
As of #28205 it should return the constant emptyArray instead of a new one.
ghost
mentioned this pull request
sheetalkamat
requested changes
Oct 29, 2018
src/server/project.ts
Outdated
| let unresolvedImports: string[] | undefined; | ||
| file.resolvedModules.forEach((resolvedModule, name) => { | ||
| // pick unresolved non-relative names | ||
| if ((!resolvedModule || !resolutionExtensionIsTSOrJson(resolvedModule.extension)) && |
There was a problem hiding this comment.
Do not change this condition in this pR please. THis is unrelated to this change and should be done in the other PR.
Original condition is and should be retained:
f (!resolvedModule && !isExternalModuleNameRelative(name) && !isAmbientlyDeclaredModule(name)
src/server/project.ts
Outdated
| @@ -1194,6 +1151,25 @@ namespace ts.server { | |||
| } | |||
| } | |||
|
|
|||
| function getUnresolvedImports(program: Program, cachedUnresolvedImportsPerFile: Map<ReadonlyArray<string>>): SortedReadonlyArray<string> { | |||
| const ambientModules = program.getTypeChecker().getAmbientModules().map(mod => stripQuotes(mod.getName())); | |||
| return toDeduplicatedSortedArray(flatMapToMutable(program.getSourceFiles(), sourceFile => | |||
There was a problem hiding this comment.
This reverts it back to allocating array?
sheetalkamat
approved these changes
Oct 30, 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.
Readonlytypes more often.class Projectwhich is big enough already. Also simplified the logic usingparsePackageName.