Merge #10551

bors[bot] · lnicola · web-flow · commit 5ce9b0466968 · 2021-10-18T09:59:10.000Z
10551: Pull in new lsp-types for VS compat r=lnicola a=lnicola CC #8729 Depends on gluon-lang/lsp-types#218 Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
@@ -22,7 +22,7 @@ crossbeam-channel = "0.5.0"
 dissimilar = "1.0.2"
 itertools = "0.10.0"
 jod-thread = "0.1.0"
-lsp-types = { version = "0.90.1", features = ["proposed"] }
+lsp-types = { version = "0.91", features = ["proposed"] }
 parking_lot = "0.11.0"
 xflags = "0.2.1"
 oorandom = "11.1.2"
@@ -34,7 +34,12 @@ rayon = "1.5"
 mimalloc = { version = "0.1.19", default-features = false, optional = true }
 lsp-server = "0.5.1"
 tracing = "0.1"
-tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry", "fmt", "tracing-log"] }
+tracing-subscriber = { version = "0.2", default-features = false, features = [
+    "env-filter",
+    "registry",
+    "fmt",
+    "tracing-log",
+] }
 tracing-log = "0.1.2"
 tracing-tree = { version = "0.1.10" }
 always-assert = "0.1"
diff --git a/crates/rust-analyzer/src/caps.rs b/crates/rust-analyzer/src/caps.rs
@@ -20,7 +20,7 @@ pub fn server_capabilities(config: &Config) -> ServerCapabilities {
     ServerCapabilities {
         text_document_sync: Some(TextDocumentSyncCapability::Options(TextDocumentSyncOptions {
             open_close: Some(true),
-            change: Some(TextDocumentSyncKind::Incremental),
+            change: Some(TextDocumentSyncKind::INCREMENTAL),
             will_save: None,
             will_save_wait_until: None,
             save: Some(SaveOptions::default().into()),
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Warning,
+                DiagnosticSeverity(
+                    2,
+                ),
             ),
             code: Some(
                 String(
@@ -140,7 +142,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
@@ -231,7 +235,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: None,
             code_description: None,
@@ -90,7 +92,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: None,
             code_description: None,
@@ -157,7 +161,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: None,
             code_description: None,
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Warning,
+                DiagnosticSeverity(
+                    2,
+                ),
             ),
             code: Some(
                 String(
@@ -67,7 +69,9 @@
             ),
             tags: Some(
                 [
-                    Unnecessary,
+                    DiagnosticTag(
+                        1,
+                    ),
                 ],
             ),
             data: None,
@@ -98,7 +102,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
@@ -67,7 +69,9 @@
             ),
             tags: Some(
                 [
-                    Unnecessary,
+                    DiagnosticTag(
+                        1,
+                    ),
                 ],
             ),
             data: None,
@@ -98,7 +102,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Information,
+                DiagnosticSeverity(
+                    3,
+                ),
             ),
             code: Some(
                 String(
@@ -67,7 +69,9 @@
             ),
             tags: Some(
                 [
-                    Unnecessary,
+                    DiagnosticTag(
+                        1,
+                    ),
                 ],
             ),
             data: None,
@@ -98,7 +102,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Error,
+                DiagnosticSeverity(
+                    1,
+                ),
             ),
             code: Some(
                 String(
@@ -114,7 +116,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
@@ -23,7 +23,9 @@
                 },
             },
             severity: Some(
-                Warning,
+                DiagnosticSeverity(
+                    2,
+                ),
             ),
             code: Some(
                 String(
@@ -140,7 +142,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
@@ -231,7 +235,9 @@
                 },
             },
             severity: Some(
-                Hint,
+                DiagnosticSeverity(
+                    4,
+                ),
             ),
             code: Some(
                 String(
diff --git a/crates/rust-analyzer/src/diagnostics/to_proto.rs b/crates/rust-analyzer/src/diagnostics/to_proto.rs
@@ -18,19 +18,19 @@ fn diagnostic_severity(
     code: Option<flycheck::DiagnosticCode>,
 ) -> Option<lsp_types::DiagnosticSeverity> {
     let res = match level {
-        DiagnosticLevel::Ice => lsp_types::DiagnosticSeverity::Error,
-        DiagnosticLevel::Error => lsp_types::DiagnosticSeverity::Error,
+        DiagnosticLevel::Ice => lsp_types::DiagnosticSeverity::ERROR,
+        DiagnosticLevel::Error => lsp_types::DiagnosticSeverity::ERROR,
         DiagnosticLevel::Warning => match &code {
             Some(code) if config.warnings_as_hint.contains(&code.code) => {
-                lsp_types::DiagnosticSeverity::Hint
+                lsp_types::DiagnosticSeverity::HINT
             }
             Some(code) if config.warnings_as_info.contains(&code.code) => {
-                lsp_types::DiagnosticSeverity::Information
+                lsp_types::DiagnosticSeverity::INFORMATION
             }
-            _ => lsp_types::DiagnosticSeverity::Warning,
+            _ => lsp_types::DiagnosticSeverity::WARNING,
         },
-        DiagnosticLevel::Note => lsp_types::DiagnosticSeverity::Information,
-        DiagnosticLevel::Help => lsp_types::DiagnosticSeverity::Hint,
+        DiagnosticLevel::Note => lsp_types::DiagnosticSeverity::INFORMATION,
+        DiagnosticLevel::Help => lsp_types::DiagnosticSeverity::HINT,
         _ => return None,
     };
     Some(res)
@@ -268,11 +268,11 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
                 | "unused_macros"
                 | "unused_variables"
         ) {
-            tags.push(lsp_types::DiagnosticTag::Unnecessary);
+            tags.push(lsp_types::DiagnosticTag::UNNECESSARY);
         }
 
         if matches!(code, "deprecated") {
-            tags.push(lsp_types::DiagnosticTag::Deprecated);
+            tags.push(lsp_types::DiagnosticTag::DEPRECATED);
         }
     }
 
@@ -337,7 +337,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
                 let diagnostic = lsp_types::Diagnostic {
                     range: secondary_location.range,
                     // downgrade to hint if we're pointing at the macro
-                    severity: Some(lsp_types::DiagnosticSeverity::Hint),
+                    severity: Some(lsp_types::DiagnosticSeverity::HINT),
                     code: code.clone().map(lsp_types::NumberOrString::String),
                     code_description: code_description.clone(),
                     source: Some(source.clone()),
@@ -398,7 +398,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
                     fixes: sub.suggested_fix.iter().cloned().collect(),
                     diagnostic: lsp_types::Diagnostic {
                         range: sub.related.location.range,
-                        severity: Some(lsp_types::DiagnosticSeverity::Hint),
+                        severity: Some(lsp_types::DiagnosticSeverity::HINT),
                         code: code.clone().map(lsp_types::NumberOrString::String),
                         code_description: code_description.clone(),
                         source: Some(source.clone()),
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
@@ -311,7 +311,7 @@ pub(crate) fn handle_document_symbol(
     for symbol in snap.analysis.file_structure(file_id)? {
         let mut tags = Vec::new();
         if symbol.deprecated {
-            tags.push(SymbolTag::Deprecated)
+            tags.push(SymbolTag::DEPRECATED)
         };
 
         #[allow(deprecated)]
@@ -368,7 +368,7 @@ pub(crate) fn handle_document_symbol(
 
         #[allow(deprecated)]
         if let Some(true) = symbol.deprecated {
-            tags.push(SymbolTag::Deprecated)
+            tags.push(SymbolTag::DEPRECATED)
         }
 
         #[allow(deprecated)]
@@ -464,7 +464,7 @@ pub(crate) fn handle_workspace_symbol(
                 kind: nav
                     .kind
                     .map(to_proto::symbol_kind)
-                    .unwrap_or(lsp_types::SymbolKind::Variable),
+                    .unwrap_or(lsp_types::SymbolKind::VARIABLE),
                 tags: None,
                 location: to_proto::location_from_nav(snap, nav)?,
                 container_name,
@@ -1294,7 +1294,7 @@ pub(crate) fn publish_diagnostics(
             source: Some("rust-analyzer".to_string()),
             message: d.message,
             related_information: None,
-            tags: if d.unused { Some(vec![DiagnosticTag::Unnecessary]) } else { None },
+            tags: if d.unused { Some(vec![DiagnosticTag::UNNECESSARY]) } else { None },
             data: None,
         })
         .collect();
diff --git a/crates/rust-analyzer/src/lsp_utils.rs b/crates/rust-analyzer/src/lsp_utils.rs
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
