Skip adding imports at some locations #59719
Open
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
typescript-bot
added
Author: Team
For Milestone Bug
…kipImportAtSomeLocations
src/services/pasteEdits.ts
Outdated
| let newText = targetFile.text; | ||
| for (let i = pasteLocations.length - 1; i >= 0; i--) { | ||
| const { pos, end } = pasteLocations[i]; | ||
| newText = actualPastedText ? newText.slice(0, pos) + actualPastedText + newText.slice(end) : newText.slice(0, pos) + pastedText[i] + newText.slice(end); | ||
| } | ||
|
|
||
| let importAdder: codefix.ImportAdder; | ||
| const symbolsUsageCopiedFrom = new Map<string, [Symbol, boolean, codefix.ImportOrRequireAliasDeclaration | undefined]>(); |
There was a problem hiding this comment.
Can you use a (preferably named) object type instead of this tuple?
| addExportsInOldFile(copiedFrom.file, usage.targetFileImportsFromOldFile, changes, useEsModuleSyntax); | ||
| addTargetFileImports(copiedFrom.file, usage.oldImportsNeededByTargetFile, usage.targetFileImportsFromOldFile, originalProgram.getTypeChecker(), updatedProgram, importAdder); | ||
| // Map created with `symbol.name` as the key to retrieve symbols declared in the old file that need to be resolved in the target file (only the one's that were exported). | ||
| for (const [symbol, [isValidTypeOnlyUseSite, declaration]] of usage.oldImportsNeededByTargetFile) { |
There was a problem hiding this comment.
Should oldImportsNeededByTargetFile just be a bunch of SymbolInfos as well? If you did that, you could just copy all the same objects over.
Comment on lines
+175
to
+178
| copiedFrom?: { file: SourceFile; range: TextRange[]; } | undefined, | ||
| symbolsUsageCopiedFrom?: Map<string, SymbolInfo>, | ||
| ) { | ||
| if (copiedFrom) { |
There was a problem hiding this comment.
You technically only need to pass in symbolsUsageCopiedFrom. That avoids these two parameters from drifting apart in any intended meaning.
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.
This pr fixes #59464. If the file the text was copied from is known, then pasteEdits adds imports only for symbols that were exported from that file or for imports that need to be copied over to the target file.