Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add _token suffix to token accessors

Browse source 
I think this makes is more clear which things are : AstNode and which
are : AstToken
This commit is contained in:
Aleksey Kladov 2020-04-09 18:25:36 +02:00
parent a95116fbfa
commit e6d22187a6
12 changed files with 210 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_assists/src/handlers/add_explicit_type.rs
View file

@ -1,6 +1,6 @@
use hir::HirDisplay;
use ra_syntax::{
ast::{self, AstNode, LetStmt, NameOwner, TypeAscriptionOwner},
ast::{self, AstNode, AstToken, LetStmt, NameOwner, TypeAscriptionOwner},
TextRange,
};
@ -35,7 +35,7 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx) -> Option<Assist> {
let name = pat.name()?;
let name_range = name.syntax().text_range();
let stmt_range = stmt.syntax().text_range();
let eq_range = stmt.eq_token()?.text_range();
let eq_range = stmt.eq_token()?.syntax().text_range();
// Assist should only be applicable if cursor is between 'let' and '='
let let_range = TextRange::from_to(stmt_range.start(), eq_range.start());
let cursor_in_range = ctx.frange.range.is_subrange(&let_range);

2
crates/ra_assists/src/handlers/add_impl.rs
View file

@ -42,7 +42,7 @@ pub(crate) fn add_impl(ctx: AssistCtx) -> Option<Assist> {
if let Some(type_params) = type_params {
let lifetime_params = type_params
.lifetime_params()
.filter_map(|it| it.lifetime())
.filter_map(|it| it.lifetime_token())
.map(|it| it.text().clone());
let type_params =
type_params.type_params().filter_map(|it| it.name()).map(|it| it.text().clone());

2
crates/ra_assists/src/handlers/add_new.rs
View file

@ -106,7 +106,7 @@ fn generate_impl_text(strukt: &ast::StructDef, code: &str) -> String {
if let Some(type_params) = type_params {
let lifetime_params = type_params
.lifetime_params()
.filter_map(|it| it.lifetime())
.filter_map(|it| it.lifetime_token())
.map(|it| it.text().clone());
let type_params =
type_params.type_params().filter_map(|it| it.name()).map(|it| it.text().clone());

2
crates/ra_assists/src/handlers/merge_imports.rs
View file

@ -82,7 +82,7 @@ fn try_merge_trees(old: &ast::UseTree, new: &ast::UseTree) -> Option<ast::UseTre
.filter(|it| it.kind() != T!['{'] && it.kind() != T!['}']),
);
let use_tree_list = lhs.use_tree_list()?;
let pos = InsertPosition::Before(use_tree_list.r_curly()?.syntax().clone().into());
let pos = InsertPosition::Before(use_tree_list.r_curly_token()?.syntax().clone().into());
let use_tree_list = use_tree_list.insert_children(pos, to_insert);
Some(lhs.with_use_tree_list(use_tree_list))
}

2
crates/ra_hir_def/src/path/lower.rs
View file

@ -28,7 +28,7 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
loop {
let segment = path.segment()?;
if segment.coloncolon().is_some() {
if segment.coloncolon_token().is_some() {
kind = PathKind::Abs;
}

2
crates/ra_hir_def/src/path/lower/lower_use.rs
View file

@ -34,7 +34,7 @@ pub(crate) fn lower_use_tree(
let alias = tree.alias().map(|a| {
a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias)
});
let is_glob = tree.star().is_some();
let is_glob = tree.star_token().is_some();
if let Some(ast_path) = tree.path() {
// Handle self in a path.
// E.g. `use something::{self, <...>}`

2
crates/ra_hir_ty/src/tests.rs
View file

@ -101,7 +101,7 @@ fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
let node = src_ptr.value.to_node(&src_ptr.file_syntax(&db));
let (range, text) = if let Some(self_param) = ast::SelfParam::cast(node.clone()) {
(self_param.self_kw().unwrap().syntax().text_range(), "self".to_string())
(self_param.self_kw_token().unwrap().syntax().text_range(), "self".to_string())
} else {
(src_ptr.value.range(), node.text().to_string().replace("\n", " "))
};

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

@ -287,7 +287,7 @@ where
let pred = predicates.next().unwrap();
let mut bounds = pred.type_bound_list().unwrap().bounds();
assert_eq!("'a", pred.lifetime().unwrap().text());
assert_eq!("'a", pred.lifetime_token().unwrap().text());
assert_bound("'b", bounds.next());
assert_bound("'c", bounds.next());

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

@ -96,7 +96,7 @@ impl ast::ItemList {
leading_indent(it.syntax()).unwrap_or_default().to_string(),
InsertPosition::After(it.syntax().clone().into()),
),
None => match self.l_curly() {
None => match self.l_curly_token() {
Some(it) => (
" ".to_string() + &leading_indent(self.syntax()).unwrap_or_default(),
InsertPosition::After(it.syntax().clone().into()),
@ -142,7 +142,7 @@ impl ast::RecordFieldList {
macro_rules! after_l_curly {
() => {{
let anchor = match self.l_curly() {
let anchor = match self.l_curly_token() {
Some(it) => it.syntax().clone().into(),
None => return self.clone(),
};
@ -301,7 +301,7 @@ impl ast::UseTree {
suffix.clone(),
self.use_tree_list(),
self.alias(),
self.star().is_some(),
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);

22
crates/ra_syntax/src/ast/extensions.rs
View file

@ -23,7 +23,7 @@ impl ast::NameRef {
}
pub fn as_tuple_field(&self) -> Option<usize> {
if let Some(ast::NameRefToken::IntNumber(token)) = self.name_ref_token() {
if let Some(ast::NameRefToken::IntNumber(token)) = self.name_ref_token_token() {
token.text().as_str().parse().ok()
} else {
None
@ -138,7 +138,7 @@ impl ast::Path {
impl ast::Module {
pub fn has_semi(&self) -> bool {
self.semi().is_some()
self.semi_token().is_some()
}
}
@ -174,7 +174,7 @@ impl ast::ImplDef {
}
pub fn is_negative(&self) -> bool {
self.excl().is_some()
self.excl_token().is_some()
}
}
@ -218,11 +218,11 @@ impl ast::EnumVariant {
impl ast::FnDef {
pub fn semicolon_token(&self) -> Option<SyntaxToken> {
Some(self.semi()?.syntax().clone())
Some(self.semi_token()?.syntax().clone())
}
pub fn is_async(&self) -> bool {
self.async_kw().is_some()
self.async_kw_token().is_some()
}
}
@ -233,15 +233,11 @@ impl ast::LetStmt {
Some(node) => node.kind() == T![;],
}
}
pub fn eq_token(&self) -> Option<SyntaxToken> {
Some(self.eq()?.syntax().clone())
}
}
impl ast::ExprStmt {
pub fn has_semi(&self) -> bool {
self.semi().is_some()
self.semi_token().is_some()
}
}
@ -350,7 +346,7 @@ pub enum SelfParamKind {
impl ast::SelfParam {
pub fn kind(&self) -> SelfParamKind {
if self.amp().is_some() {
if self.amp_token().is_some() {
if self.amp_mut_kw().is_some() {
SelfParamKind::MutRef
} else {
@ -396,7 +392,7 @@ impl ast::TypeBound {
TypeBoundKind::PathType(path_type)
} else if let Some(for_type) = children(self).next() {
TypeBoundKind::ForType(for_type)
} else if let Some(lifetime) = self.lifetime() {
} else if let Some(lifetime) = self.lifetime_token() {
TypeBoundKind::Lifetime(lifetime)
} else {
unreachable!()
@ -416,7 +412,7 @@ impl ast::TypeBound {
}
pub fn question(&self) -> Option<ast::Question> {
if self.const_kw().is_some() {
if self.const_kw_token().is_some() {
self.syntax()
.children_with_tokens()
.filter_map(|it| it.into_token())

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

File diff suppressed because it is too large Load diff

1
xtask/src/codegen/gen_syntax.rs
View file

@ -208,6 +208,7 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
FieldSrc::Optional(_) | FieldSrc::Shorthand => {
let is_token = token_kinds.contains(&ty.to_string());
if is_token {
let method_name = format_ident!("{}_token", method_name);
quote! {
pub fn #method_name(&self) -> Option<#ty> {
support::token(&self.syntax)