From be9ba2b392aaada4b0ce72f61fd664fc3d4021b5 Mon Sep 17 00:00:00 2001
From: Wilco Kusee <wilcokusee@gmail.com>
Date: Fri, 29 Nov 2019 15:52:12 +0100
Subject: Move identifier check to analysis

---
 crates/ra_ide/src/lib.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'crates/ra_ide/src')

diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index d1bff4a76..1f88791d7 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -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))
     }
 
-- 
cgit v1.2.3