From 09ed9d044495971c143dc8c9879dd92d3989976f Mon Sep 17 00:00:00 2001
From: ShuiRuTian <158983297@qq.com>
Date: Sun, 10 Jan 2021 14:10:36 +0800
Subject: [PATCH] fix issue.

---
 crates/rust-analyzer/src/handlers.rs | 28 ++++++++++++++--------------
 editors/code/src/client.ts           |  7 +++++++
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 176774a7728..48060819668 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -435,22 +435,22 @@ pub(crate) fn handle_will_rename_files(
                     if from_path.is_dir() {
                         // This is a quick implement, try to use will_rename_file code.
                         // imitate change the older_folder/mod.rs to older_folder/new_folder.rs
-                        let imitate_from_path = from_path.join("mod.rs");
-                        let new_from_url = imitate_from_path.to_str()?;
-                        let new_from_url = Url::parse(new_from_url).ok()?;
-
-                        let new_folder_name = to_path.file_name()?.to_str()?;
-                        let mut imite_new_file_name  = new_folder_name.to_string();
-                        imite_new_file_name.push_str(".rs");
-                        let new_to = from_path.join(imite_new_file_name);
-                        let new_to = new_to.to_str()?;
-
-                        Some((snap.url_to_file_id(&new_from_url).ok()?, new_to.to_string()))
-                    }
-                    else{
+                        let imitate_from_url = from.join("mod.rs").ok()?;
+                        let imite_new_file_name = to_path.file_name()?.to_str()?;
+                        Some((
+                            snap.url_to_file_id(&imitate_from_url).ok()?,
+                            imite_new_file_name.to_string(),
+                        ))
+                    } else {
+                        let old_name = from_path.file_stem()?;
+                        let old_name = old_name.to_str()?;
                         let new_name = to_path.file_stem()?;
                         let new_name = new_name.to_str()?;
-                        Some((snap.url_to_file_id(&from).ok()?, new_name.to_string()))
+                        if old_name != "mod" || new_name != "mod" {
+                            Some((snap.url_to_file_id(&from).ok()?, new_name.to_string()))
+                        } else {
+                            None
+                        }
                     }
                 }
                 _ => None,
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 2a8f2deb4df..fb8cd4873ce 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -58,6 +58,13 @@ export function createClient(serverPath: string, cwd: string, extraEnv: Env): lc
             // 2. filter some change in here.
             //     2.1 rename from or to `mod.rs` should be special. 
             //     2.2 not all folder change should be cared, only those have files with ".rs" postfix.
+            let newFiles =  data.files.map((file)=>{
+                const isFolder = !file.oldUri.path.endsWith(".rs");
+                return !isFolder ? file : {
+                    oldUri:vscode.Uri.file(file.oldUri.path+'/'),
+                    newUri:vscode.Uri.file(file.newUri.path+'/')
+                }});
+            data = {...data, files:newFiles};
             return next(data);
         }
     }