Add Unmerge Use assist #7289
Merged
Add Unmerge Use assist #7289
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
matklad
reviewed
Jan 15, 2021
Comment on lines
35
to
49
| let new_use = ast::make::use_( | ||
| use_.visibility(), | ||
| ast::make::use_tree(path, None, tree.rename(), tree.star_token().is_some()), | ||
| ); | ||
|
|
||
| let mut rewriter = SyntaxRewriter::default(); | ||
| rewriter += tree.remove(); | ||
| rewriter.insert_after(use_.syntax(), &ast::make::tokens::single_newline()); | ||
| if let ident_level @ 1..=usize::MAX = use_.indent_level().0 as usize { | ||
| rewriter.insert_after( | ||
| use_.syntax(), | ||
| &ast::make::tokens::whitespace(&" ".repeat(4 * ident_level)), | ||
| ); | ||
| } | ||
| rewriter.insert_after(use_.syntax(), new_use.syntax()); |
Contributor
There was a problem hiding this comment.
This part should go into the |builder| closure, to avoid unnecessary computation.
matklad
reviewed
Jan 15, 2021
Contributor
matklad
left a comment
There was a problem hiding this comment.
r=me with a test mark!
bors r+
Comment on lines
+28
to
+29
| if tree_list.use_trees().count() < 2 { | ||
| return None; |
Contributor
There was a problem hiding this comment.
this could use mark::hit! call (see the mark module).
Contributor
Contributor
|
ah, this should've been d+ could you send a followup? |
Contributor
Author
|
sent it #7290 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Closes #7185