This repository has been archived by the owner on Jul 15, 2023. It is now read-only.
goImports: avoid collapsing new imports into pseudo import line #3045
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
|
the test failures on platforms other than mac are real - I messed up with file name (case sensitivity). Will fix it when I can access my linux tomorrow. |
getTextEditForAddImport tries to insert a newly added package into an existing import group. If no import group exists, it tries to merge single line import statements and create a group. In this process, import statements like import "C" are pseudo imports and shouldn't be grouped with other imports. This CL changes parseFilePrelude to detect such pseudo imports and excludes such imports from the grouping logic. Fixes microsoft#1701
mac and vsccode ignored casing, but linux and git were unhappy.
ramya-rao-a
reviewed
Apr 26, 2020
| @@ -156,11 +156,12 @@ export function parseFilePrelude(text: string): Prelude { | |||
| } | |||
| if (line.match(/^(\s)*import(\s)+\(/)) { | |||
| ret.imports.push({ kind: 'multi', start: i, end: -1, pkgs: [] }); | |||
| } | |||
| if (line.match(/^(\s)*import(\s)+[^\(]/)) { | |||
| } else if (line.match(/^\s*import\s+"C"/)) { | |||
There was a problem hiding this comment.
Is C the only import that falls under this pseudo category?
There was a problem hiding this comment.
Yes. "C" is the only one in this category (psuedo import whose placement in the import affects the correctness/functionality)
ramya-rao-a
approved these changes
Apr 27, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
getTextEditForAddImport tries to insert a newly added package
into an existing import group. If no import group exists, it
tries to merge single line import statements and create a group.
In this process, import statements like
import "C"
are pseudo imports and shouldn't be grouped with other imports.
This CL changes parseFilePrelude to detect such pseudo imports
and excludes such imports from the grouping logic.
Fixes #1701