From f7cb9e9fbe50e5d0e23e81b8b5b90405ef5c1931 Mon Sep 17 00:00:00 2001
From: ShuiRuTian <158983297@qq.com>
Date: Mon, 11 Jan 2021 14:45:35 +0800
Subject: move logic from client to server.

---
 crates/rust-analyzer/src/handlers.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'crates')

diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 1aafef78b..17f67d4b7 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -435,7 +435,15 @@ 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_url = from.join("mod.rs").ok()?;
+
+                        // add '/' to end of url -- from `file://path/to/folder` to `file://path/to/folder/`
+                        let old_folder_name = from_path.file_stem()?;
+                        let old_folder_name = old_folder_name.to_str()?;
+                        let mut old_folder_name = old_folder_name.to_string();
+                        old_folder_name.push('/');
+                        let from_with_trailing_slash = from.join(&old_folder_name).ok()?;
+
+                        let imitate_from_url = from_with_trailing_slash.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()?,
-- 
cgit v1.2.3