fix(57451): Prevent self-imports when using the "Move to File" refactor#57530
Merged
sheetalkamat merged 1 commit intomicrosoft:mainfrom Mar 20, 2024
Merged
fix(57451): Prevent self-imports when using the "Move to File" refactor#57530sheetalkamat merged 1 commit intomicrosoft:mainfrom
sheetalkamat merged 1 commit intomicrosoft:mainfrom
Conversation
Contributor
Author
|
@microsoft-github-policy-service agree |
sheetalkamat
requested changes
Mar 13, 2024
src/services/refactors/moveToFile.ts
Outdated
Comment on lines
432
to
440
Member
There was a problem hiding this comment.
Suggested change
| const pathToTargetFileWithExtension = resolvePath(getDirectoryPath(oldFile.path), targetFileName); | |
| // no self-imports | |
| if (sourceFile.fileName === pathToTargetFileWithExtension) return; | |
| const pathToTargetFileWithExtension = resolvePath(getDirectoryPath(getNormalizedAbsolutePath(oldFile.fileName, program.getCurrentDirectory())), targetFileName); | |
| // no self imports | |
| if (getStringComparer(!program.useCaseSensitiveFileNames())(pathToTargetFileWithExtension, sourceFile.fileName) === Comparison.EqualTo) return; | |
Member
There was a problem hiding this comment.
@navya9singh we also need to replace usage of sourceFile.path in makeImportOrReqiure so its not using canonical path but actual file name:
const pathToTargetFile = resolvePath(getDirectoryPath(sourceFile.path), targetFileNameWithExtension);to
const pathToTargetFile = resolvePath(getDirectoryPath(getNormalizedAbsolutePath(sourceFile.fileName, program.getCurrentDirectory())), targetFileNameWithExtension);
Contributor
Author
There was a problem hiding this comment.
made the changes
sheetalkamat
approved these changes
Mar 15, 2024
Member
|
Thanks for working on this! This pr also fixes #54309 |
navya9singh
approved these changes
Mar 20, 2024
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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 #57451