From 30084a56a5731343bd4cec727646a6c55900234f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 9 Apr 2020 23:35:05 +0200 Subject: Simpler acessors for keywords --- crates/ra_syntax/src/ast.rs | 6 +- crates/ra_syntax/src/ast/expr_extensions.rs | 6 - crates/ra_syntax/src/ast/extensions.rs | 18 +- crates/ra_syntax/src/ast/generated/nodes.rs | 140 ++-- crates/ra_syntax/src/ast/generated/tokens.rs | 916 +-------------------------- 5 files changed, 87 insertions(+), 999 deletions(-) (limited to 'crates/ra_syntax/src') diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs index cb701f7f6..1ee60e74c 100644 --- a/crates/ra_syntax/src/ast.rs +++ b/crates/ra_syntax/src/ast.rs @@ -80,7 +80,7 @@ impl Iterator for AstChildren { } mod support { - use super::{AstChildren, AstNode, AstToken, SyntaxNode}; + use super::{AstChildren, AstNode, AstToken, SyntaxKind, SyntaxNode, SyntaxToken}; pub(super) fn child(parent: &SyntaxNode) -> Option { parent.children().find_map(N::cast) @@ -93,6 +93,10 @@ mod support { pub(super) fn token(parent: &SyntaxNode) -> Option { parent.children_with_tokens().filter_map(|it| it.into_token()).find_map(T::cast) } + + pub(super) fn token2(parent: &SyntaxNode, kind: SyntaxKind) -> Option { + parent.children_with_tokens().filter_map(|it| it.into_token()).find(|it| it.kind() == kind) + } } #[test] diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs index 5c5f19622..93aa3d45f 100644 --- a/crates/ra_syntax/src/ast/expr_extensions.rs +++ b/crates/ra_syntax/src/ast/expr_extensions.rs @@ -48,12 +48,6 @@ impl ast::IfExpr { } } -impl ast::RefExpr { - pub fn raw_token(&self) -> Option { - None // FIXME: implement &raw - } -} - #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] pub enum PrefixOp { /// The `*` operator for dereferencing diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs index fc252e79c..11ec70bc0 100644 --- a/crates/ra_syntax/src/ast/extensions.rs +++ b/crates/ra_syntax/src/ast/extensions.rs @@ -279,7 +279,7 @@ pub enum SelfParamKind { impl ast::SelfParam { pub fn kind(&self) -> SelfParamKind { if self.amp_token().is_some() { - if self.amp_mut_kw_token().is_some() { + if self.amp_mut_token().is_some() { SelfParamKind::MutRef } else { SelfParamKind::Ref @@ -290,21 +290,21 @@ impl ast::SelfParam { } /// the "mut" in "mut self", not the one in "&mut self" - pub fn mut_kw_token(&self) -> Option { + pub fn mut_token(&self) -> Option { self.syntax() .children_with_tokens() .filter_map(|it| it.into_token()) .take_while(|it| it.kind() != T![&]) - .find_map(ast::MutKw::cast) + .find(|it| it.kind() == T![mut]) } /// the "mut" in "&mut self", not the one in "mut self" - pub fn amp_mut_kw_token(&self) -> Option { + pub fn amp_mut_token(&self) -> Option { self.syntax() .children_with_tokens() .filter_map(|it| it.into_token()) .skip_while(|it| it.kind() != T![&]) - .find_map(ast::MutKw::cast) + .find(|it| it.kind() == T![mut]) } } @@ -340,7 +340,7 @@ impl ast::TypeBound { } pub fn question_token(&self) -> Option { - if self.const_kw_token().is_some() { + if self.const_token().is_some() { self.syntax() .children_with_tokens() .filter_map(|it| it.into_token()) @@ -364,11 +364,11 @@ impl ast::Visibility { pub fn kind(&self) -> VisibilityKind { if let Some(path) = support::children(self.syntax()).next() { VisibilityKind::In(path) - } else if self.crate_kw_token().is_some() { + } else if self.crate_token().is_some() { VisibilityKind::PubCrate - } else if self.super_kw_token().is_some() { + } else if self.super_token().is_some() { VisibilityKind::PubSuper - } else if self.self_kw_token().is_some() { + } else if self.self_token().is_some() { VisibilityKind::PubSuper } else { VisibilityKind::Pub diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 3b820507d..20f663046 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs @@ -4,7 +4,7 @@ use super::tokens::*; use crate::{ ast::{self, support, AstChildren, AstNode}, SyntaxKind::{self, *}, - SyntaxNode, + SyntaxNode, SyntaxToken, }; #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct SourceFile { @@ -48,11 +48,11 @@ impl ast::DocCommentsOwner for FnDef {} impl ast::AttrsOwner for FnDef {} impl FnDef { pub fn abi(&self) -> Option { support::child(&self.syntax) } - pub fn const_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn default_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn async_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn unsafe_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn fn_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn const_token(&self) -> Option { support::token2(&self.syntax, CONST_KW) } + pub fn default_token(&self) -> Option { support::token2(&self.syntax, DEFAULT_KW) } + pub fn async_token(&self) -> Option { support::token2(&self.syntax, ASYNC_KW) } + pub fn unsafe_token(&self) -> Option { support::token2(&self.syntax, UNSAFE_KW) } + pub fn fn_token(&self) -> Option { support::token2(&self.syntax, FN_KW) } pub fn param_list(&self) -> Option { support::child(&self.syntax) } pub fn ret_type(&self) -> Option { support::child(&self.syntax) } pub fn body(&self) -> Option { support::child(&self.syntax) } @@ -98,7 +98,7 @@ impl ast::TypeParamsOwner for StructDef {} impl ast::AttrsOwner for StructDef {} impl ast::DocCommentsOwner for StructDef {} impl StructDef { - pub fn struct_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn struct_token(&self) -> Option { support::token2(&self.syntax, STRUCT_KW) } pub fn field_def_list(&self) -> Option { support::child(&self.syntax) } pub fn semi_token(&self) -> Option { support::token(&self.syntax) } } @@ -123,7 +123,7 @@ impl ast::TypeParamsOwner for UnionDef {} impl ast::AttrsOwner for UnionDef {} impl ast::DocCommentsOwner for UnionDef {} impl UnionDef { - pub fn union_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn union_token(&self) -> Option { support::token2(&self.syntax, UNION_KW) } pub fn record_field_def_list(&self) -> Option { support::child(&self.syntax) } @@ -230,7 +230,7 @@ impl ast::TypeParamsOwner for EnumDef {} impl ast::AttrsOwner for EnumDef {} impl ast::DocCommentsOwner for EnumDef {} impl EnumDef { - pub fn enum_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn enum_token(&self) -> Option { support::token2(&self.syntax, ENUM_KW) } pub fn variant_list(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -299,9 +299,9 @@ impl ast::DocCommentsOwner for TraitDef {} impl ast::TypeParamsOwner for TraitDef {} impl ast::TypeBoundsOwner for TraitDef {} impl TraitDef { - pub fn unsafe_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn auto_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn trait_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn unsafe_token(&self) -> Option { support::token2(&self.syntax, UNSAFE_KW) } + pub fn auto_token(&self) -> Option { support::token2(&self.syntax, AUTO_KW) } + pub fn trait_token(&self) -> Option { support::token2(&self.syntax, TRAIT_KW) } pub fn item_list(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -324,7 +324,7 @@ impl ast::NameOwner for Module {} impl ast::AttrsOwner for Module {} impl ast::DocCommentsOwner for Module {} impl Module { - pub fn mod_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn mod_token(&self) -> Option { support::token2(&self.syntax, MOD_KW) } pub fn item_list(&self) -> Option { support::child(&self.syntax) } pub fn semi_token(&self) -> Option { support::token(&self.syntax) } } @@ -371,8 +371,8 @@ impl ast::AttrsOwner for ConstDef {} impl ast::DocCommentsOwner for ConstDef {} impl ast::TypeAscriptionOwner for ConstDef {} impl ConstDef { - pub fn default_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn const_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn default_token(&self) -> Option { support::token2(&self.syntax, DEFAULT_KW) } + pub fn const_token(&self) -> Option { support::token2(&self.syntax, CONST_KW) } pub fn eq_token(&self) -> Option { support::token(&self.syntax) } pub fn body(&self) -> Option { support::child(&self.syntax) } pub fn semi_token(&self) -> Option { support::token(&self.syntax) } @@ -399,8 +399,8 @@ impl ast::AttrsOwner for StaticDef {} impl ast::DocCommentsOwner for StaticDef {} impl ast::TypeAscriptionOwner for StaticDef {} impl StaticDef { - pub fn static_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn mut_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn static_token(&self) -> Option { support::token2(&self.syntax, STATIC_KW) } + pub fn mut_token(&self) -> Option { support::token2(&self.syntax, MUT_KW) } pub fn eq_token(&self) -> Option { support::token(&self.syntax) } pub fn body(&self) -> Option { support::child(&self.syntax) } pub fn semi_token(&self) -> Option { support::token(&self.syntax) } @@ -427,8 +427,8 @@ impl ast::AttrsOwner for TypeAliasDef {} impl ast::DocCommentsOwner for TypeAliasDef {} impl ast::TypeBoundsOwner for TypeAliasDef {} impl TypeAliasDef { - pub fn default_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn type_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn default_token(&self) -> Option { support::token2(&self.syntax, DEFAULT_KW) } + pub fn type_token(&self) -> Option { support::token2(&self.syntax, TYPE_KW) } pub fn eq_token(&self) -> Option { support::token(&self.syntax) } pub fn type_ref(&self) -> Option { support::child(&self.syntax) } pub fn semi_token(&self) -> Option { support::token(&self.syntax) } @@ -451,12 +451,12 @@ impl AstNode for ImplDef { impl ast::TypeParamsOwner for ImplDef {} impl ast::AttrsOwner for ImplDef {} impl ImplDef { - pub fn default_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn const_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn unsafe_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn impl_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn default_token(&self) -> Option { support::token2(&self.syntax, DEFAULT_KW) } + pub fn const_token(&self) -> Option { support::token2(&self.syntax, CONST_KW) } + pub fn unsafe_token(&self) -> Option { support::token2(&self.syntax, UNSAFE_KW) } + pub fn impl_token(&self) -> Option { support::token2(&self.syntax, IMPL_KW) } pub fn excl_token(&self) -> Option { support::token(&self.syntax) } - pub fn for_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn for_token(&self) -> Option { support::token2(&self.syntax, FOR_KW) } pub fn item_list(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -552,8 +552,8 @@ 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 const_token(&self) -> Option { support::token2(&self.syntax, CONST_KW) } + pub fn mut_token(&self) -> Option { support::token2(&self.syntax, MUT_KW) } pub fn type_ref(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -616,7 +616,7 @@ impl AstNode for ReferenceType { impl ReferenceType { pub fn amp_token(&self) -> Option { support::token(&self.syntax) } pub fn lifetime_token(&self) -> Option { support::token(&self.syntax) } - pub fn mut_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn mut_token(&self) -> Option { support::token2(&self.syntax, MUT_KW) } pub fn type_ref(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -654,8 +654,8 @@ impl AstNode for FnPointerType { } impl FnPointerType { pub fn abi(&self) -> Option { support::child(&self.syntax) } - pub fn unsafe_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn fn_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn unsafe_token(&self) -> Option { support::token2(&self.syntax, UNSAFE_KW) } + pub fn fn_token(&self) -> Option { support::token2(&self.syntax, FN_KW) } pub fn param_list(&self) -> Option { support::child(&self.syntax) } pub fn ret_type(&self) -> Option { support::child(&self.syntax) } } @@ -675,7 +675,7 @@ impl AstNode for ForType { fn syntax(&self) -> &SyntaxNode { &self.syntax } } impl ForType { - pub fn for_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn for_token(&self) -> Option { support::token2(&self.syntax, FOR_KW) } pub fn type_param_list(&self) -> Option { support::child(&self.syntax) } pub fn type_ref(&self) -> Option { support::child(&self.syntax) } } @@ -696,7 +696,7 @@ impl AstNode for ImplTraitType { } impl ast::TypeBoundsOwner for ImplTraitType {} impl ImplTraitType { - pub fn impl_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn impl_token(&self) -> Option { support::token2(&self.syntax, IMPL_KW) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct DynTraitType { @@ -715,7 +715,7 @@ impl AstNode for DynTraitType { } impl ast::TypeBoundsOwner for DynTraitType {} impl DynTraitType { - pub fn dyn_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn dyn_token(&self) -> Option { support::token2(&self.syntax, DYN_KW) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct TupleExpr { @@ -816,9 +816,9 @@ impl AstNode for LambdaExpr { } impl ast::AttrsOwner for LambdaExpr {} impl LambdaExpr { - pub fn static_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn async_kw_token(&self) -> Option { support::token(&self.syntax) } - pub fn move_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn static_token(&self) -> Option { support::token2(&self.syntax, STATIC_KW) } + pub fn async_token(&self) -> Option { support::token2(&self.syntax, ASYNC_KW) } + pub fn move_token(&self) -> Option { support::token2(&self.syntax, MOVE_KW) } pub fn param_list(&self) -> Option { support::child(&self.syntax) } pub fn ret_type(&self) -> Option { support::child(&self.syntax) } pub fn body(&self) -> Option { support::child(&self.syntax) } @@ -840,7 +840,7 @@ impl AstNode for IfExpr { } impl ast::AttrsOwner for IfExpr {} impl IfExpr { - pub fn if_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn if_token(&self) -> Option { support::token2(&self.syntax, IF_KW) } pub fn condition(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -861,7 +861,7 @@ impl AstNode for LoopExpr { impl ast::AttrsOwner for LoopExpr {} impl ast::LoopBodyOwner for LoopExpr {} impl LoopExpr { - pub fn loop_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn loop_token(&self) -> Option { support::token2(&self.syntax, LOOP_KW) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct TryBlockExpr { @@ -880,7 +880,7 @@ impl AstNode for TryBlockExpr { } impl ast::AttrsOwner for TryBlockExpr {} impl TryBlockExpr { - pub fn try_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn try_token(&self) -> Option { support::token2(&self.syntax, TRY_KW) } pub fn body(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -901,9 +901,9 @@ impl AstNode for ForExpr { impl ast::AttrsOwner for ForExpr {} impl ast::LoopBodyOwner for ForExpr {} impl ForExpr { - pub fn for_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn for_token(&self) -> Option { support::token2(&self.syntax, FOR_KW) } pub fn pat(&self) -> Option { support::child(&self.syntax) } - pub fn in_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn in_token(&self) -> Option { support::token2(&self.syntax, IN_KW) } pub fn iterable(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -924,7 +924,7 @@ impl AstNode for WhileExpr { impl ast::AttrsOwner for WhileExpr {} impl ast::LoopBodyOwner for WhileExpr {} impl WhileExpr { - pub fn while_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn while_token(&self) -> Option { support::token2(&self.syntax, WHILE_KW) } pub fn condition(&self) -> Option { support::child(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -944,7 +944,9 @@ impl AstNode for ContinueExpr { } impl ast::AttrsOwner for ContinueExpr {} impl ContinueExpr { - pub fn continue_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn continue_token(&self) -> Option { + support::token2(&self.syntax, CONTINUE_KW) + } pub fn lifetime_token(&self) -> Option { support::token(&self.syntax) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -964,7 +966,7 @@ impl AstNode for BreakExpr { } impl ast::AttrsOwner for BreakExpr {} impl BreakExpr { - pub fn break_kw_token(&self) -> Option { support::token(&self.syntax) } + pub fn break_token(&self) -> Option { support::token2(&self.syntax, BREAK_KW) } pub fn lifetime_token(&self) -> Option { support::token(&self.syntax) } pub fn expr(&self) -> Option { support::child(&self.syntax) } } @@ -1004,7 +1006,7 @@ impl AstNode for BlockExpr { impl ast::AttrsOwner for BlockExpr {} impl BlockExpr { pub fn label(&self) -> Option