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

Move identifier check to analysis

Browse source
This commit is contained in:
Wilco Kusee 2019-11-29 15:52:12 +01:00
parent f081c9d94d
commit be9ba2b392
No known key found for this signature in database
GPG key ID: D5B2BB5CDC3334BC
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ra_ide/src/lib.rs
View file

@ -56,7 +56,7 @@ use ra_db::{
salsa::{self, ParallelDatabase},
CheckCanceled, Env, FileLoader, SourceDatabase,
};
use ra_syntax::{SourceFile, TextRange, TextUnit};
use ra_syntax::{tokenize, SourceFile, SyntaxKind, TextRange, TextUnit};
use crate::{db::LineIndexDatabase, display::ToNav, symbol_index::FileSymbol};
@ -470,6 +470,13 @@ impl Analysis {
position: FilePosition,
new_name: &str,
) -> Cancelable<Option<RangeInfo<SourceChange>>> {
let tokens = tokenize(new_name);
if tokens.len() != 1
|| (tokens[0].kind != SyntaxKind::IDENT && tokens[0].kind != SyntaxKind::UNDERSCORE)
{
return Ok(None);
}
self.with_db(|db| references::rename(db, position, new_name))
}