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

Skip trival token in original_range

Browse source
This commit is contained in:
Edwin Cheng 2020-02-27 00:12:26 +08:00
parent 2dee0779e9
commit 553254973e
4 changed files with 54 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_hir/src/semantics.rs
View file

@ -8,8 +8,9 @@ use hir_def::{
};
use ra_db::{FileId, FileRange};
use ra_syntax::{
algo::find_covering_element, ast, match_ast, AstNode, NodeOrToken, SyntaxElement, SyntaxNode,
SyntaxToken, TextRange, TextUnit,
algo::{find_covering_element, skip_trivia_token},
ast, match_ast, AstNode, Direction, NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken,
TextRange, TextUnit,
};
use rustc_hash::{FxHashMap, FxHashSet};
@ -384,11 +385,12 @@ fn original_range_and_origin(
};
// the input node has only one token ?
let single = node.value.first_token()? == node.value.last_token()?;
let single = skip_trivia_token(node.value.first_token()?, Direction::Next)?
== skip_trivia_token(node.value.last_token()?, Direction::Prev)?;
return Some(node.value.descendants().find_map(|it| {
let first = it.first_token()?;
let last = it.last_token()?;
let first = skip_trivia_token(it.first_token()?, Direction::Next)?;
let last = skip_trivia_token(it.last_token()?, Direction::Prev)?;
if !single && first == last {
return None;