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

added eq_token() method to LetStmt

Browse source
This commit is contained in:
TomasKralCZ 2020-01-19 18:55:56 +01:00
parent 514df15d9e
commit f67ee69777
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ra_assists/src/assists/add_explicit_type.rs
View file

@ -1,7 +1,6 @@
use hir::{db::HirDatabase, HirDisplay}; use hir::{db::HirDatabase, HirDisplay};
use ra_syntax::{ use ra_syntax::{
ast::{self, AstNode, LetStmt, NameOwner}, ast::{self, AstNode, LetStmt, NameOwner},
SyntaxKind::EQ,
TextRange, T, TextRange, T,
}; };
@ -37,7 +36,7 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx<impl HirDatabase>) -> Option<Assi
let name_range = name.syntax().text_range(); let name_range = name.syntax().text_range();
// Assist should only be applicable if cursor is between 'let' and '=' // Assist should only be applicable if cursor is between 'let' and '='
let stmt_range = stmt.syntax().text_range(); let stmt_range = stmt.syntax().text_range();
let eq_range = stmt.syntax().descendants_with_tokens().find(|t| t.kind() == EQ)?.text_range(); let eq_range = stmt.eq_token()?.text_range();
let let_range = TextRange::from_to(stmt_range.start(), eq_range.start()); let let_range = TextRange::from_to(stmt_range.start(), eq_range.start());
let cursor_in_range = ctx.frange.range.is_subrange(&let_range); let cursor_in_range = ctx.frange.range.is_subrange(&let_range);
if !cursor_in_range { if !cursor_in_range {

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

@ -234,6 +234,13 @@ impl ast::LetStmt {
Some(node) => node.kind() == T![;], Some(node) => node.kind() == T![;],
} }
} }
pub fn eq_token(&self) -> Option<SyntaxToken> {
self.syntax()
.descendants_with_tokens()
.find(|t| t.kind() == EQ)
.and_then(|it| it.into_token())
}
} }
impl ast::ExprStmt { impl ast::ExprStmt {