From 2bfb65db93e48d8f9e8ecac0b2ea837c081a4db5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 9 Apr 2020 18:40:43 +0200 Subject: Be consistent about token accesors --- crates/ra_syntax/src/ast/edit.rs | 4 +- crates/ra_syntax/src/ast/extensions.rs | 104 +++------------------------- crates/ra_syntax/src/ast/generated/nodes.rs | 3 + 3 files changed, 13 insertions(+), 98 deletions(-) (limited to 'crates/ra_syntax/src') diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs index 62153f199..069c6ee82 100644 --- a/crates/ra_syntax/src/ast/edit.rs +++ b/crates/ra_syntax/src/ast/edit.rs @@ -33,9 +33,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.semicolon_token() { + } else if let Some(semi) = self.semi_token() { to_insert.push(make::tokens::single_space().into()); - semi.into() + semi.syntax.clone().into() } else { to_insert.push(make::tokens::single_space().into()); to_insert.push(body.syntax().clone().into()); diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs index ff3525c84..b50a89864 100644 --- a/crates/ra_syntax/src/ast/extensions.rs +++ b/crates/ra_syntax/src/ast/extensions.rs @@ -136,12 +136,6 @@ impl ast::Path { } } -impl ast::Module { - pub fn has_semi(&self) -> bool { - self.semi_token().is_some() - } -} - impl ast::UseTreeList { pub fn parent_use_tree(&self) -> ast::UseTree { self.syntax() @@ -172,10 +166,6 @@ impl ast::ImplDef { let second = types.next(); (first, second) } - - pub fn is_negative(&self) -> bool { - self.excl_token().is_some() - } } #[derive(Debug, Clone, PartialEq, Eq)] @@ -216,31 +206,6 @@ impl ast::EnumVariant { } } -impl ast::FnDef { - pub fn semicolon_token(&self) -> Option { - Some(self.semi_token()?.syntax().clone()) - } - - pub fn is_async(&self) -> bool { - self.async_kw_token().is_some() - } -} - -impl ast::LetStmt { - pub fn has_semi(&self) -> bool { - match self.syntax().last_child_or_token() { - None => false, - Some(node) => node.kind() == T![;], - } - } -} - -impl ast::ExprStmt { - pub fn has_semi(&self) -> bool { - self.semi_token().is_some() - } -} - #[derive(Debug, Clone, PartialEq, Eq)] pub enum FieldKind { Name(ast::NameRef), @@ -269,25 +234,6 @@ impl ast::FieldExpr { } } -impl ast::RefPat { - pub fn is_mut(&self) -> bool { - self.syntax().children_with_tokens().any(|n| n.kind() == T![mut]) - } -} - -impl ast::BindPat { - pub fn is_mutable(&self) -> bool { - self.syntax().children_with_tokens().any(|n| n.kind() == T![mut]) - } - - pub fn is_ref(&self) -> bool { - self.syntax().children_with_tokens().any(|n| n.kind() == T![ref]) - } - pub fn has_at(&self) -> bool { - self.syntax().children_with_tokens().any(|it| it.kind() == T![@]) - } -} - pub struct SlicePatComponents { pub prefix: Vec, pub slice: Option, @@ -322,18 +268,6 @@ impl ast::SlicePat { } } -impl ast::PointerType { - pub fn is_mut(&self) -> bool { - self.syntax().children_with_tokens().any(|n| n.kind() == T![mut]) - } -} - -impl ast::ReferenceType { - pub fn is_mut(&self) -> bool { - self.syntax().children_with_tokens().any(|n| n.kind() == T![mut]) - } -} - #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] pub enum SelfParamKind { /// self @@ -347,7 +281,7 @@ pub enum SelfParamKind { impl ast::SelfParam { pub fn kind(&self) -> SelfParamKind { if self.amp_token().is_some() { - if self.amp_mut_kw().is_some() { + if self.amp_mut_kw_token().is_some() { SelfParamKind::MutRef } else { SelfParamKind::Ref @@ -358,7 +292,7 @@ impl ast::SelfParam { } /// the "mut" in "mut self", not the one in "&mut self" - pub fn mut_kw(&self) -> Option { + pub fn mut_kw_token(&self) -> Option { self.syntax() .children_with_tokens() .filter_map(|it| it.into_token()) @@ -367,7 +301,7 @@ impl ast::SelfParam { } /// the "mut" in "&mut self", not the one in "mut self" - pub fn amp_mut_kw(&self) -> Option { + pub fn amp_mut_kw_token(&self) -> Option { self.syntax() .children_with_tokens() .filter_map(|it| it.into_token()) @@ -399,11 +333,7 @@ impl ast::TypeBound { } } - pub fn has_question_mark(&self) -> bool { - self.question().is_some() - } - - pub fn const_question(&self) -> Option { + pub fn const_question_token(&self) -> Option { self.syntax() .children_with_tokens() .filter_map(|it| it.into_token()) @@ -411,7 +341,7 @@ impl ast::TypeBound { .find_map(ast::Question::cast) } - pub fn question(&self) -> Option { + pub fn question_token(&self) -> Option { if self.const_kw_token().is_some() { self.syntax() .children_with_tokens() @@ -424,12 +354,6 @@ impl ast::TypeBound { } } -impl ast::TraitDef { - pub fn is_auto(&self) -> bool { - self.syntax().children_with_tokens().any(|t| t.kind() == T![auto]) - } -} - pub enum VisibilityKind { In(ast::Path), PubCrate, @@ -442,28 +366,16 @@ impl ast::Visibility { pub fn kind(&self) -> VisibilityKind { if let Some(path) = children(self).next() { VisibilityKind::In(path) - } else if self.is_pub_crate() { + } else if self.crate_kw_token().is_some() { VisibilityKind::PubCrate - } else if self.is_pub_super() { + } else if self.super_kw_token().is_some() { VisibilityKind::PubSuper - } else if self.is_pub_self() { + } else if self.self_kw_token().is_some() { VisibilityKind::PubSuper } else { VisibilityKind::Pub } } - - fn is_pub_crate(&self) -> bool { - self.syntax().children_with_tokens().any(|it| it.kind() == T![crate]) - } - - fn is_pub_super(&self) -> bool { - self.syntax().children_with_tokens().any(|it| it.kind() == T![super]) - } - - fn is_pub_self(&self) -> bool { - self.syntax().children_with_tokens().any(|it| it.kind() == T![self]) - } } impl ast::MacroCall { diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 0bcb7fe61..bcbfd1129 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs @@ -555,6 +555,7 @@ impl AstNode for PointerType { impl PointerType { pub fn star_token(&self) -> Option { support::token(&self.syntax) } pub fn const_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn mut_kw_token(&self) -> Option { support::token(&self.syntax) } pub fn type_ref(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -1532,6 +1533,7 @@ impl ast::NameOwner for BindPat {} impl BindPat { pub fn ref_kw_token(&self) -> Option { support::token(&self.syntax) } pub fn mut_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn at_token(&self) -> Option { support::token(&self.syntax) } pub fn pat(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -2114,6 +2116,7 @@ impl LetStmt { pub fn pat(&self) -> Option { support::child(&self.syntax) } pub fn eq_token(&self) -> Option { support::token(&self.syntax) } pub fn initializer(&self) -> Option { support::child(&self.syntax) } + pub fn semi_token(&self) -> Option { support::token(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct Condition { -- cgit v1.2.3