migrate to emmy_lsp_types

Author: CppCXY

Cargo.lock

@@ -19,7 +19,7 @@ serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.141"
 rowan = { version = "0.16.1" }
 notify = { version = "8.1.0", features = ["serde"] }
-lsp-types = { version = "0.97.0", features = ["proposed"]}
+lsp_types = { version = "0.1.0", package = "emmy_lsp_types" }
 schemars = "1.0.2"
 regex = "1"
 internment = { version = "0.8.6", features = ["arc"] }

Cargo.toml

@@ -18,7 +18,7 @@ emmylua_parser.workspace = true
 # external
 serde.workspace = true
 serde_json.workspace = true
-lsp-types.workspace = true
+lsp_types.workspace = true
 log.workspace = true
 fern.workspace = true
 rowan.workspace = true

crates/emmylua_check/Cargo.toml

@@ -27,7 +27,7 @@ emmylua_diagnostic_macro.workspace = true
 # external
 serde.workspace = true
 serde_json.workspace = true
-lsp-types.workspace = true
+lsp_types.workspace = true
 schemars.workspace = true
 rowan.workspace = true
 regex.workspace = true

crates/emmylua_code_analysis/Cargo.toml

@@ -23,7 +23,7 @@ emmylua_parser.workspace = true
 # external
 serde.workspace = true
 serde_json.workspace = true
-lsp-types.workspace = true
+lsp_types.workspace = true
 rowan.workspace = true
 walkdir.workspace = true
 tera.workspace = true

crates/emmylua_doc_cli/Cargo.toml

@@ -25,7 +25,7 @@ lsp-server.workspace = true
 tokio.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-lsp-types.workspace = true
+lsp_types.workspace = true
 log.workspace = true
 fern.workspace = true
 chrono.workspace = true

crates/emmylua_ls/Cargo.toml

@@ -46,7 +46,7 @@ impl LspFeatures {
 
     pub fn supports_refresh_diagnostic(&self) -> bool {
         if let Some(workspace) = &self.client_capabilities.workspace {
-            if let Some(diagnostic) = &workspace.diagnostic {
+            if let Some(diagnostic) = &workspace.diagnostics {
                 if let Some(supports) = diagnostic.refresh_support {
                     return supports;
                 }

crates/emmylua_ls/src/context/lsp_features.rs

@@ -17,9 +17,14 @@ pub async fn on_pull_workspace_diagnostic(
         return WorkspaceDiagnosticReport { items: vec![] };
     }
     let version = workspace_manager.get_workspace_version();
+    let client_id = workspace_manager.client_config.client_id;
     workspace_manager.update_workspace_version(WorkspaceDiagnosticLevel::None, false);
     drop(workspace_manager);
 
+    if client_id.is_vscode() && context.lsp_features().supports_refresh_diagnostic() {
+        context.client().refresh_workspace_diagnostics();
+    }
+
     // let emmyrc = context.analysis().read().await.get_emmyrc();
     let file_diagnostics = match status {
         WorkspaceDiagnosticLevel::None => Vec::new(),

crates/emmylua_ls/src/handlers/diagnostic/workspace_diagnostic.rs

@@ -329,7 +329,7 @@ impl ProviderVirtualWorkspace {
         let mut items = result
             .iter()
             .map(|l| VirtualLocation {
-                file: l.uri.path().segments().next_back().unwrap().to_string(),
+                file: l.uri.get_file_path().unwrap().to_string_lossy().to_string(),
                 line: l.range.start.line,
             })
             .collect::<Vec<_>>();
@@ -418,10 +418,13 @@ impl ProviderVirtualWorkspace {
                 pos: item.position.character,
                 ref_file: match &item.label {
                     InlayHintLabel::LabelParts(parts) => match parts.first() {
-                        Some(part) => part
-                            .location
-                            .as_ref()
-                            .map(|loc| loc.uri.path().segments().next_back().unwrap().to_string()),
+                        Some(part) => part.location.as_ref().map(|loc| {
+                            loc.uri
+                                .get_file_path()
+                                .unwrap()
+                                .to_string_lossy()
+                                .to_string()
+                        }),
                         None => None,
                     },
                     InlayHintLabel::String(_) => None,
@@ -563,7 +566,7 @@ impl ProviderVirtualWorkspace {
             .into_iter()
             .map(|(uri, edits)| {
                 Ok((
-                    uri.path().segments().next_back().or_fail()?.to_string(),
+                    uri.get_file_path().unwrap().to_string_lossy().to_string(),
                     edits,
                 ))
             })

crates/emmylua_ls/src/handlers/test_lib/mod.rs

@@ -11,4 +11,4 @@ emmylua_code_analysis.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-lsp-types.workspace = true
+lsp_types.workspace = true