language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Auto merge of #16066 - Young-Flash:auto_remove_brace, r=lnicola

Browse source 
fix: auto remove unnecessary braces after remove unused imports

before
![before](8d44f955-f84f-4a92-b13f-5a2dee2ded36)

after
![after](1eab23c8-39bd-4711-97c1-d483ce400a18)
This commit is contained in:
bors 2023-12-20 13:22:00 +00:00
commit 65ed198819
3 changed files with 103 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/syntax/src/ast/node_ext.rs
View file

@ -11,7 +11,7 @@ use rowan::{GreenNodeData, GreenTokenData};
use crate::{
ast::{self, support, AstNode, AstToken, HasAttrs, HasGenericParams, HasName, SyntaxNode},
NodeOrToken, SmolStr, SyntaxElement, SyntaxToken, TokenText, T,
ted, NodeOrToken, SmolStr, SyntaxElement, SyntaxToken, TokenText, T,
};
impl ast::Lifetime {
@ -323,6 +323,10 @@ impl ast::UseTree {
pub fn is_simple_path(&self) -> bool {
self.use_tree_list().is_none() && self.star_token().is_none()
}
pub fn parent_use_tree_list(&self) -> Option<ast::UseTreeList> {
self.syntax().parent().and_then(ast::UseTreeList::cast)
}
}
impl ast::UseTreeList {
@ -340,6 +344,27 @@ impl ast::UseTreeList {
.find_map(ast::Comment::cast)
.is_some()
}
/// Remove the unnecessary braces in current `UseTreeList`
pub fn remove_unnecessary_braces(mut self) {
let remove_brace_in_use_tree_list = |u: &ast::UseTreeList| {
let use_tree_count = u.use_trees().count();
if use_tree_count == 1 {
u.l_curly_token().map(ted::remove);
u.r_curly_token().map(ted::remove);
}
};
// take `use crate::{{{{A}}}}` for example
// the below remove the innermost {}, got `use crate::{{{A}}}`
remove_brace_in_use_tree_list(&self);
// the below remove othe unnecessary {}, got `use crate::A`
while let Some(parent_use_tree_list) = self.parent_use_tree().parent_use_tree_list() {
remove_brace_in_use_tree_list(&parent_use_tree_list);
self = parent_use_tree_list;
}
}
}
impl ast::Impl {