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


From 645df2b5f5664b7730293d8f7441364799aacbf9 Mon Sep 17 00:00:00 2001
From: Wilco Kusee <wilcokusee@gmail.com>
Date: Fri, 29 Nov 2019 16:03:39 +0100
Subject: Test rename for various identifiers

---
 crates/ra_ide/src/references/rename.rs | 43 ++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'crates/ra_ide/src')

diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index ea6b354c2..c1771edf8 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -123,6 +123,49 @@ mod tests {
         mock_analysis::analysis_and_position, mock_analysis::single_file_with_position, FileId,
     };
 
+    #[test]
+    fn test_rename_to_underscore() {
+        test_rename(
+            r#"
+    fn main() {
+        let i<|> = 1;
+    }"#,
+            "_",
+            r#"
+    fn main() {
+        let _ = 1;
+    }"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_to_raw_identifier() {
+        test_rename(
+            r#"
+    fn main() {
+        let i<|> = 1;
+    }"#,
+            "r#fn",
+            r#"
+    fn main() {
+        let r#fn = 1;
+    }"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_to_invalid_identifier() {
+        let (analysis, position) = single_file_with_position(
+            "
+    fn main() {
+        let i<|> = 1;
+    }",
+        );
+        let new_name = "invalid!";
+        let source_change = analysis.rename(position, new_name).unwrap();
+        assert!(source_change.is_none());
+    }
+
     #[test]
     fn test_rename_for_local() {
         test_rename(
-- 
cgit v1.2.3


From b3856568af3a21bfd13584e06fce852f84811fdb Mon Sep 17 00:00:00 2001
From: Wilco Kusee <wilcokusee@gmail.com>
Date: Fri, 29 Nov 2019 16:06:20 +0100
Subject: Push identifier check to rename function

---
 crates/ra_ide/src/lib.rs               | 9 +--------
 crates/ra_ide/src/references/rename.rs | 9 ++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'crates/ra_ide/src')

diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 1f88791d7..d1bff4a76 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::{tokenize, SourceFile, SyntaxKind, TextRange, TextUnit};
+use ra_syntax::{SourceFile, TextRange, TextUnit};
 
 use crate::{db::LineIndexDatabase, display::ToNav, symbol_index::FileSymbol};
 
@@ -470,13 +470,6 @@ 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))
     }
 
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index c1771edf8..b804d5f6d 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -2,7 +2,7 @@
 
 use hir::ModuleSource;
 use ra_db::{RelativePath, RelativePathBuf, SourceDatabase, SourceDatabaseExt};
-use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SyntaxNode};
+use ra_syntax::{algo::find_node_at_offset, ast, tokenize, AstNode, SyntaxKind, SyntaxNode};
 use ra_text_edit::TextEdit;
 
 use crate::{
@@ -17,6 +17,13 @@ pub(crate) fn rename(
     position: FilePosition,
     new_name: &str,
 ) -> Option<RangeInfo<SourceChange>> {
+    let tokens = tokenize(new_name);
+    if tokens.len() != 1
+        || (tokens[0].kind != SyntaxKind::IDENT && tokens[0].kind != SyntaxKind::UNDERSCORE)
+    {
+        return None;
+    }
+
     let parse = db.parse(position.file_id);
     if let Some((ast_name, ast_module)) =
         find_name_and_module_at_offset(parse.tree().syntax(), position)
-- 
cgit v1.2.3