nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-01 03:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version 2

Browse Source
This commit is contained in:
Ali Bektas 2023-06-22 20:29:11 +02:00
parent 1de842a7ba
commit 96cebca116
2 changed files with 72 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
crates/rust-analyzer/src/handlers/request.rs
View File

@ -8,10 +8,11 @@ use std::{
}; };
use anyhow::Context; use anyhow::Context;
use ide::{ use ide::{
AnnotationConfig, AssistKind, AssistResolveStrategy, Cancellable, FilePosition, FileRange, AnnotationConfig, AssistKind, AssistResolveStrategy, Cancellable, FilePosition, FileRange,
FileSystemEdit, HoverAction, HoverGotoTypeData, Query, RangeInfo, ReferenceCategory, Runnable, HoverAction, HoverGotoTypeData, Query, RangeInfo, ReferenceCategory, Runnable, RunnableKind,
RunnableKind, SingleResolve, SourceChange, TextEdit, SingleResolve, SourceChange, TextEdit,
}; };
use ide_db::SymbolKind; use ide_db::SymbolKind;
use lsp_server::ErrorCode; use lsp_server::ErrorCode;
@ -33,7 +34,7 @@ use vfs::{AbsPath, AbsPathBuf, VfsPath};
use crate::{ use crate::{
cargo_target_spec::CargoTargetSpec, cargo_target_spec::CargoTargetSpec,
config::{RustfmtConfig, WorkspaceSymbolConfig}, config::{Config, RustfmtConfig, WorkspaceSymbolConfig},
diff::diff, diff::diff,
from_proto, from_proto,
global_state::{GlobalState, GlobalStateSnapshot}, global_state::{GlobalState, GlobalStateSnapshot},
@ -548,12 +549,8 @@ pub(crate) fn handle_will_rename_files(
) -> anyhow::Result<Option<lsp_types::WorkspaceEdit>> { ) -> anyhow::Result<Option<lsp_types::WorkspaceEdit>> {
let _p = profile::span("handle_will_rename_files"); let _p = profile::span("handle_will_rename_files");
if !resource_ops_supported(&snap, &ResourceOperationKind::Rename) { if let Err(err) = resource_ops_supported(&snap.config, &ResourceOperationKind::Rename) {
return Err(LspError::new( return Err(err);
ErrorCode::RequestFailed as i32,
"Client does not support rename capability.".to_owned(),
)
.into());
} }
let source_changes: Vec<SourceChange> = params let source_changes: Vec<SourceChange> = params
@ -1037,33 +1034,29 @@ pub(crate) fn handle_rename(
// See https://github.com/microsoft/vscode-languageserver-node/issues/752 for more info // See https://github.com/microsoft/vscode-languageserver-node/issues/752 for more info
if !change.file_system_edits.is_empty() && snap.config.will_rename() { if !change.file_system_edits.is_empty() && snap.config.will_rename() {
change.source_file_edits.clear(); change.source_file_edits.clear();
} else {
for edit in &change.file_system_edits {
match edit {
&FileSystemEdit::CreateFile { .. }
if !resource_ops_supported(&snap, &ResourceOperationKind::Create) =>
{
return Err(LspError::new(
ErrorCode::RequestFailed as i32,
"Client does not support create capability.".to_owned(),
)
.into())
} }
&FileSystemEdit::MoveFile { .. } | &FileSystemEdit::MoveDir { .. }
if !resource_ops_supported(&snap, &ResourceOperationKind::Rename) => let workspace_edit = to_proto::workspace_edit(&snap, change)?;
if let Some(lsp_types::DocumentChanges::Operations(ops)) =
workspace_edit.document_changes.as_ref()
{ {
return Err(LspError::new( for op in ops {
ErrorCode::RequestFailed as i32, if let lsp_types::DocumentChangeOperation::Op(doc_change_op) = op {
"Client does not support move/rename capability.".to_owned(), if let Err(err) = resource_ops_supported(
) &snap.config,
.into()) match doc_change_op {
ResourceOp::Create(_) => &ResourceOperationKind::Create,
ResourceOp::Rename(_) => &ResourceOperationKind::Rename,
ResourceOp::Delete(_) => &ResourceOperationKind::Delete,
},
) {
return Err(err);
} }
_ => (),
} }
} }
} }
let workspace_edit = to_proto::workspace_edit(&snap, change)?;
Ok(Some(workspace_edit)) Ok(Some(workspace_edit))
} }
@ -1174,35 +1167,17 @@ pub(crate) fn handle_code_action(
// Check if the client supports the necessary `ResourceOperation`s. // Check if the client supports the necessary `ResourceOperation`s.
if let Some(changes) = &code_action.edit.as_ref().unwrap().document_changes { if let Some(changes) = &code_action.edit.as_ref().unwrap().document_changes {
for change in changes { for change in changes {
match change { if let lsp_ext::SnippetDocumentChangeOperation::Op(res_op) = change {
lsp_ext::SnippetDocumentChangeOperation::Op(ResourceOp::Create(_)) if let Err(err) = resource_ops_supported(
if !resource_ops_supported(&snap, &ResourceOperationKind::Create) => &snap.config,
{ match res_op {
return Err(LspError::new( ResourceOp::Create(_) => &ResourceOperationKind::Create,
ErrorCode::RequestFailed as i32, ResourceOp::Rename(_) => &ResourceOperationKind::Rename,
"Client does not support create capability.".to_owned(), ResourceOp::Delete(_) => &ResourceOperationKind::Delete,
) },
.into()); ) {
return Err(err);
} }
lsp_ext::SnippetDocumentChangeOperation::Op(ResourceOp::Rename(_))
if !resource_ops_supported(&snap, &ResourceOperationKind::Rename) =>
{
return Err(LspError::new(
ErrorCode::RequestFailed as i32,
"Client does not support rename capability.".to_owned(),
)
.into());
}
lsp_ext::SnippetDocumentChangeOperation::Op(ResourceOp::Delete(_))
if !resource_ops_supported(&snap, &ResourceOperationKind::Delete) =>
{
return Err(LspError::new(
ErrorCode::RequestFailed as i32,
"Client does not support delete capability.".to_owned(),
)
.into());
}
_ => (),
} }
} }
} }
@ -1293,35 +1268,17 @@ pub(crate) fn handle_code_action_resolve(
if let Some(edit) = code_action.edit.as_ref() { if let Some(edit) = code_action.edit.as_ref() {
if let Some(changes) = edit.document_changes.as_ref() { if let Some(changes) = edit.document_changes.as_ref() {
for change in changes { for change in changes {
match change { if let lsp_ext::SnippetDocumentChangeOperation::Op(res_op) = change {
lsp_ext::SnippetDocumentChangeOperation::Op(ResourceOp::Create(_)) if let Err(err) = resource_ops_supported(
if !resource_ops_supported(&snap, &ResourceOperationKind::Create) => &snap.config,
{ match res_op {
return Err(LspError::new( ResourceOp::Create(_) => &ResourceOperationKind::Create,
ErrorCode::RequestFailed as i32, ResourceOp::Rename(_) => &ResourceOperationKind::Rename,
"Client does not support create capability.".to_owned(), ResourceOp::Delete(_) => &ResourceOperationKind::Delete,
) },
.into()); ) {
return Err(err);
} }
lsp_ext::SnippetDocumentChangeOperation::Op(ResourceOp::Rename(_))
if !resource_ops_supported(&snap, &ResourceOperationKind::Rename) =>
{
return Err(LspError::new(
ErrorCode::RequestFailed as i32,
"Client does not support rename capability.".to_owned(),
)
.into());
}
lsp_ext::SnippetDocumentChangeOperation::Op(ResourceOp::Delete(_))
if !resource_ops_supported(&snap, &ResourceOperationKind::Delete) =>
{
return Err(LspError::new(
ErrorCode::RequestFailed as i32,
"Client does not support delete capability.".to_owned(),
)
.into());
}
_ => (),
} }
} }
} }
@ -2099,9 +2056,8 @@ fn to_url(path: VfsPath) -> Option<Url> {
Url::from_file_path(str_path).ok() Url::from_file_path(str_path).ok()
} }
fn resource_ops_supported(snap: &GlobalStateSnapshot, kind: &ResourceOperationKind) -> bool { fn resource_ops_supported(config: &Config, kind: &ResourceOperationKind) -> anyhow::Result<()> {
snap.config let ctn = config
.as_ref()
.caps() .caps()
.workspace .workspace
.as_ref() .as_ref()
@ -2112,5 +2068,22 @@ fn resource_ops_supported(snap: &GlobalStateSnapshot, kind: &ResourceOperationKi
.resource_operations .resource_operations
.as_ref() .as_ref()
.unwrap() .unwrap()
.contains(kind) .contains(kind);
if !ctn {
return Err(LspError::new(
ErrorCode::RequestFailed as i32,
format!(
"Client does not support {} capability.",
match kind {
ResourceOperationKind::Create => "create",
ResourceOperationKind::Rename => "rename",
ResourceOperationKind::Delete => "delete",
}
),
)
.into());
}
Ok(())
} }

8
crates/rust-analyzer/tests/slow-tests/support.rs
View File

@ -113,6 +113,14 @@ impl<'a> Project<'a> {
relative_pattern_support: None, relative_pattern_support: None,
}, },
), ),
workspace_edit: Some(lsp_types::WorkspaceEditClientCapabilities {
resource_operations: Some(vec![
lsp_types::ResourceOperationKind::Create,
lsp_types::ResourceOperationKind::Delete,
lsp_types::ResourceOperationKind::Rename,
]),
..Default::default()
}),
..Default::default() ..Default::default()
}), }),
text_document: Some(lsp_types::TextDocumentClientCapabilities { text_document: Some(lsp_types::TextDocumentClientCapabilities {