mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #7220

Browse Source 
7220: same level folder rename for will_rename_files r=kjeremy a=ShuiRuTian

use tricky way to support folder rename.

Another step after #7009 and for #4471

Co-authored-by: ShuiRuTian <158983297@qq.com>
Co-authored-by: Song Gao <158983297@qq.com>
This commit is contained in:
bors[bot] 2021-01-13 17:40:45 +00:00 committed by GitHub
commit 42e00032c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 178 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/rust-analyzer/src/caps.rs
View File

@ -75,14 +75,24 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
will_create: None, will_create: None,
did_rename: None, did_rename: None,
will_rename: Some(FileOperationRegistrationOptions { will_rename: Some(FileOperationRegistrationOptions {
filters: vec![FileOperationFilter { filters: vec![
scheme: Some(String::from("file")), FileOperationFilter {
pattern: FileOperationPattern { scheme: Some(String::from("file")),
glob: String::from("**/*.rs"), pattern: FileOperationPattern {
matches: Some(FileOperationPatternKind::File), glob: String::from("**/*.rs"),
options: None, matches: Some(FileOperationPatternKind::File),
options: None,
},
}, },
}], FileOperationFilter {
scheme: Some(String::from("file")),
pattern: FileOperationPattern {
glob: String::from("**"),
matches: Some(FileOperationPatternKind::Folder),
options: None,
},
},
],
}), }),
did_delete: None, did_delete: None,
will_delete: None, will_delete: None,

24
crates/rust-analyzer/src/handlers.rs
View File

@ -432,9 +432,27 @@ pub(crate) fn handle_will_rename_files(
// Limit to single-level moves for now. // Limit to single-level moves for now.
match (from_path.parent(), to_path.parent()) { match (from_path.parent(), to_path.parent()) {
(Some(p1), Some(p2)) if p1 == p2 => { (Some(p1), Some(p2)) if p1 == p2 => {
let new_name = to_path.file_stem()?; if from_path.is_dir() {
let new_name = new_name.to_str()?; // add '/' to end of url -- from `file://path/to/folder` to `file://path/to/folder/`
Some((snap.url_to_file_id(&from).ok()?, new_name.to_string())) let mut old_folder_name = from_path.file_stem()?.to_str()?.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 new_file_name = to_path.file_name()?.to_str()?;
Some((
snap.url_to_file_id(&imitate_from_url).ok()?,
new_file_name.to_string(),
))
} else {
let old_name = from_path.file_stem()?.to_str()?;
let new_name = to_path.file_stem()?.to_str()?;
match (old_name, new_name) {
("mod", _) => None,
(_, "mod") => None,
_ => Some((snap.url_to_file_id(&from).ok()?, new_name.to_string())),
}
}
} }
_ => None, _ => None,
} }

144
crates/rust-analyzer/tests/rust-analyzer/main.rs
View File

@ -16,11 +16,14 @@
use expect_test::expect; use expect_test::expect;
use lsp_types::{ use lsp_types::{
notification::DidOpenTextDocument, notification::DidOpenTextDocument,
request::{CodeActionRequest, Completion, Formatting, GotoTypeDefinition, HoverRequest}, request::{
CodeActionRequest, Completion, Formatting, GotoTypeDefinition, HoverRequest,
WillRenameFiles,
},
CodeActionContext, CodeActionParams, CompletionParams, DidOpenTextDocumentParams, CodeActionContext, CodeActionParams, CompletionParams, DidOpenTextDocumentParams,
DocumentFormattingParams, FormattingOptions, GotoDefinitionParams, HoverParams, DocumentFormattingParams, FileRename, FormattingOptions, GotoDefinitionParams, HoverParams,
PartialResultParams, Position, Range, TextDocumentItem, TextDocumentPositionParams, PartialResultParams, Position, Range, RenameFilesParams, TextDocumentItem,
WorkDoneProgressParams, TextDocumentPositionParams, WorkDoneProgressParams,
}; };
use rust_analyzer::lsp_ext::{OnEnter, Runnables, RunnablesParams}; use rust_analyzer::lsp_ext::{OnEnter, Runnables, RunnablesParams};
use serde_json::json; use serde_json::json;
@ -745,3 +748,136 @@ fn bar()
```"#]] ```"#]]
.assert_eq(&value); .assert_eq(&value);
} }
#[test]
fn test_will_rename_files_same_level() {
if skip_slow_tests() {
return;
}
let tmp_dir = TestDir::new();
let tmp_dir_path = tmp_dir.path().to_owned();
let tmp_dir_str = tmp_dir_path.to_str().unwrap();
let base_path = PathBuf::from(format!("file://{}", tmp_dir_str));
let code = r#"
//- /Cargo.toml
[package]
name = "foo"
version = "0.0.0"
//- /src/lib.rs
mod old_file;
mod from_mod;
mod to_mod;
mod old_folder;
fn main() {}
//- /src/old_file.rs
//- /src/old_folder/mod.rs
//- /src/from_mod/mod.rs
//- /src/to_mod/foo.rs
"#;
let server =
Project::with_fixture(&code).tmp_dir(tmp_dir).server().wait_until_workspace_is_loaded();
//rename same level file
server.request::<WillRenameFiles>(
RenameFilesParams {
files: vec![FileRename {
old_uri: base_path.join("src/old_file.rs").to_str().unwrap().to_string(),
new_uri: base_path.join("src/new_file.rs").to_str().unwrap().to_string(),
}],
},
json!({
"documentChanges": [
{
"textDocument": {
"uri": format!("file://{}", tmp_dir_path.join("src").join("lib.rs").to_str().unwrap().to_string().replace("C:\\", "/c:/").replace("\\", "/")),
"version": null
},
"edits": [
{
"range": {
"start": {
"line": 0,
"character": 4
},
"end": {
"line": 0,
"character": 12
}
},
"newText": "new_file"
}
]
}
]
}),
);
//rename file from mod.rs to foo.rs
server.request::<WillRenameFiles>(
RenameFilesParams {
files: vec![FileRename {
old_uri: base_path.join("src/from_mod/mod.rs").to_str().unwrap().to_string(),
new_uri: base_path.join("src/from_mod/foo.rs").to_str().unwrap().to_string(),
}],
},
json!({
"documentChanges": []
}),
);
//rename file from foo.rs to mod.rs
server.request::<WillRenameFiles>(
RenameFilesParams {
files: vec![FileRename {
old_uri: base_path.join("src/to_mod/foo.rs").to_str().unwrap().to_string(),
new_uri: base_path.join("src/to_mod/mod.rs").to_str().unwrap().to_string(),
}],
},
json!({
"documentChanges": []
}),
);
//rename same level file
server.request::<WillRenameFiles>(
RenameFilesParams {
files: vec![FileRename {
old_uri: base_path.join("src/old_folder").to_str().unwrap().to_string(),
new_uri: base_path.join("src/new_folder").to_str().unwrap().to_string(),
}],
},
json!({
"documentChanges": [
{
"textDocument": {
"uri": format!("file://{}", tmp_dir_path.join("src").join("lib.rs").to_str().unwrap().to_string().replace("C:\\", "/c:/").replace("\\", "/")),
"version": null
},
"edits": [
{
"range": {
"start": {
"line": 3,
"character": 4
},
"end": {
"line": 3,
"character": 14
}
},
"newText": "new_folder"
}
]
}
]
}),
);
}