aboutsummaryrefslogtreecommitdiff
path: root/crates/rust-analyzer/src/to_proto.rs
diff options
context:
space:
mode:
authorJonas Schievink <[email protected]>2021-05-17 18:07:10 +0100
committerJonas Schievink <[email protected]>2021-05-27 14:05:41 +0100
commit33debc40654be9e9061c53784f6c762b2fd21eba (patch)
treedef63d3cc42fe48b1dfdf716c2e8e56de5324dab /crates/rust-analyzer/src/to_proto.rs
parentd0a4ba294ccf0c925a5ff1115c19a60c6a24b734 (diff)
Update salsa
Diffstat (limited to 'crates/rust-analyzer/src/to_proto.rs')
-rw-r--r--crates/rust-analyzer/src/to_proto.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 6d18d0ffc..411f6baa9 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -6,7 +6,7 @@ use std::{
6}; 6};
7 7
8use ide::{ 8use ide::{
9 Annotation, AnnotationKind, Assist, AssistKind, CallInfo, Cancelable, CompletionItem, 9 Annotation, AnnotationKind, Assist, AssistKind, CallInfo, Cancellable, CompletionItem,
10 CompletionItemKind, CompletionRelevance, Documentation, FileId, FileRange, FileSystemEdit, 10 CompletionItemKind, CompletionRelevance, Documentation, FileId, FileRange, FileSystemEdit,
11 Fold, FoldKind, Highlight, HlMod, HlOperator, HlPunct, HlRange, HlTag, Indel, InlayHint, 11 Fold, FoldKind, Highlight, HlMod, HlOperator, HlPunct, HlRange, HlTag, Indel, InlayHint,
12 InlayKind, InsertTextFormat, Markup, NavigationTarget, ReferenceAccess, RenameError, Runnable, 12 InlayKind, InsertTextFormat, Markup, NavigationTarget, ReferenceAccess, RenameError, Runnable,
@@ -726,7 +726,7 @@ pub(crate) fn snippet_text_document_edit(
726pub(crate) fn snippet_text_document_ops( 726pub(crate) fn snippet_text_document_ops(
727 snap: &GlobalStateSnapshot, 727 snap: &GlobalStateSnapshot,
728 file_system_edit: FileSystemEdit, 728 file_system_edit: FileSystemEdit,
729) -> Cancelable<Vec<lsp_ext::SnippetDocumentChangeOperation>> { 729) -> Cancellable<Vec<lsp_ext::SnippetDocumentChangeOperation>> {
730 let mut ops = Vec::new(); 730 let mut ops = Vec::new();
731 match file_system_edit { 731 match file_system_edit {
732 FileSystemEdit::CreateFile { dst, initial_contents } => { 732 FileSystemEdit::CreateFile { dst, initial_contents } => {
@@ -756,7 +756,7 @@ pub(crate) fn snippet_text_document_ops(
756 let new_uri = snap.anchored_path(&dst); 756 let new_uri = snap.anchored_path(&dst);
757 let mut rename_file = 757 let mut rename_file =
758 lsp_types::RenameFile { old_uri, new_uri, options: None, annotation_id: None }; 758 lsp_types::RenameFile { old_uri, new_uri, options: None, annotation_id: None };
759 if snap.analysis.is_library_file(src) == Ok(true) 759 if snap.analysis.is_library_file(src).ok() == Some(true)
760 && snap.config.change_annotation_support() 760 && snap.config.change_annotation_support()
761 { 761 {
762 rename_file.annotation_id = Some(outside_workspace_annotation_id()) 762 rename_file.annotation_id = Some(outside_workspace_annotation_id())