language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename Rename

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-30 11:58:41 +02:00
parent 7d09e5ed61
commit 6cd2131caf
11 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_syntax/src/ast/edit.rs
View file

@ -318,7 +318,7 @@ impl ast::UseTree {
None => return self.clone(),
};
let use_tree =
make::use_tree(suffix, self.use_tree_list(), self.alias(), self.star_token().is_some());
make::use_tree(suffix, self.use_tree_list(), self.rename(), self.star_token().is_some());
let nested = make::use_tree_list(iter::once(use_tree));
return make::use_tree(prefix.clone(), Some(nested), None, false);

16
crates/ra_syntax/src/ast/generated/nodes.rs
View file

@ -75,7 +75,7 @@ impl ExternCrateItem {
pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@ -1178,7 +1178,7 @@ impl UseTree {
pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }
pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct UseTreeList {
@ -1190,11 +1190,11 @@ impl UseTreeList {
pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Alias {
pub struct Rename {
pub(crate) syntax: SyntaxNode,
}
impl ast::NameOwner for Alias {}
impl Alias {
impl ast::NameOwner for Rename {}
impl Rename {
pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@ -2683,8 +2683,8 @@ impl AstNode for UseTreeList {
}
fn syntax(&self) -> &SyntaxNode { &self.syntax }
}
impl AstNode for Alias {
fn can_cast(kind: SyntaxKind) -> bool { kind == ALIAS }
impl AstNode for Rename {
fn can_cast(kind: SyntaxKind) -> bool { kind == RENAME }
fn cast(syntax: SyntaxNode) -> Option<Self> {
if Self::can_cast(syntax.kind()) {
Some(Self { syntax })
@ -4040,7 +4040,7 @@ impl std::fmt::Display for UseTreeList {
std::fmt::Display::fmt(self.syntax(), f)
}
}
impl std::fmt::Display for Alias {
impl std::fmt::Display for Rename {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
std::fmt::Display::fmt(self.syntax(), f)
}

2
crates/ra_syntax/src/ast/make.rs
View file

@ -37,7 +37,7 @@ fn path_from_text(text: &str) -> ast::Path {
pub fn use_tree(
path: ast::Path,
use_tree_list: Option<ast::UseTreeList>,
alias: Option<ast::Alias>,
alias: Option<ast::Rename>,
add_star: bool,
) -> ast::UseTree {
let mut buf = "use ".to_string();