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

Semicolon token

Browse source
This commit is contained in:
Aleksey Kladov 2020-04-10 10:11:05 +02:00
parent f89f2e3885
commit c8b4c36f81
7 changed files with 57 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,9 +32,9 @@ impl ast::FnDef {
let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() {
old_body.syntax().clone().into()
} else if let Some(semi) = self.semi_token() {
} else if let Some(semi) = self.semicolon_token() {
to_insert.push(make::tokens::single_space().into());
semi.syntax.clone().into()
semi.into()
} else {
to_insert.push(make::tokens::single_space().into());
to_insert.push(body.syntax().clone().into());

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

@ -58,7 +58,9 @@ impl FnDef {
pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct RetType {
@ -102,7 +104,9 @@ impl ast::DocCommentsOwner for StructDef {}
impl StructDef {
pub fn struct_token(&self) -> Option<SyntaxToken> { support::token2(&self.syntax, T![struct]) }
pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct UnionDef {
@ -328,7 +332,9 @@ impl ast::DocCommentsOwner for Module {}
impl Module {
pub fn mod_token(&self) -> Option<SyntaxToken> { support::token2(&self.syntax, T![mod]) }
pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct ItemList {
@ -379,7 +385,9 @@ impl ConstDef {
pub fn const_token(&self) -> Option<SyntaxToken> { support::token2(&self.syntax, T![const]) }
pub fn eq_token(&self) -> Option<Eq> { support::token(&self.syntax) }
pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct StaticDef {
@ -407,7 +415,9 @@ impl StaticDef {
pub fn mut_token(&self) -> Option<SyntaxToken> { support::token2(&self.syntax, T![mut]) }
pub fn eq_token(&self) -> Option<Eq> { support::token(&self.syntax) }
pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct TypeAliasDef {
@ -437,7 +447,9 @@ impl TypeAliasDef {
pub fn type_token(&self) -> Option<SyntaxToken> { support::token2(&self.syntax, T![type]) }
pub fn eq_token(&self) -> Option<Eq> { support::token(&self.syntax) }
pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct ImplDef {
@ -582,7 +594,9 @@ impl AstNode for ArrayType {
impl ArrayType {
pub fn l_brack_token(&self) -> Option<LBrack> { support::token(&self.syntax) }
pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
pub fn r_brack_token(&self) -> Option<RBrack> { support::token(&self.syntax) }
}
@ -765,7 +779,9 @@ impl ast::AttrsOwner for ArrayExpr {}
impl ArrayExpr {
pub fn l_brack_token(&self) -> Option<LBrack> { support::token(&self.syntax) }
pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
pub fn r_brack_token(&self) -> Option<RBrack> { support::token(&self.syntax) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@ -1859,7 +1875,9 @@ impl MacroCall {
pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
pub fn excl_token(&self) -> Option<Excl> { support::token(&self.syntax) }
pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Attr {
@ -2100,7 +2118,9 @@ impl AstNode for ExprStmt {
impl ast::AttrsOwner for ExprStmt {}
impl ExprStmt {
pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct LetStmt {
@ -2124,7 +2144,9 @@ impl LetStmt {
pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
pub fn eq_token(&self) -> Option<Eq> { support::token(&self.syntax) }
pub fn initializer(&self) -> Option<Expr> { support::child(&self.syntax) }
pub fn semi_token(&self) -> Option<Semi> { support::token(&self.syntax) }
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
support::token2(&self.syntax, T ! [ ; ])
}
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Condition {