fix: reimplement projectmainpath request

Sarrus1 · Mar 25, 2024 · 2698017 · 2698017
1 parent eff14fd
commit 2698017
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/crates/sourcepawn_lsp/src/handlers/request.rs b/crates/sourcepawn_lsp/src/handlers/request.rs
@@ -2,16 +2,16 @@ use anyhow::Context;
 use base_db::FileRange;
 use lsp_types::{
     SemanticTokensDeltaParams, SemanticTokensFullDeltaResult, SemanticTokensParams,
-    SemanticTokensRangeParams, SemanticTokensRangeResult, SemanticTokensResult,
+    SemanticTokensRangeParams, SemanticTokensRangeResult, SemanticTokensResult, Url,
 };
 use stdx::format_to;
 
 use crate::{
     global_state::GlobalStateSnapshot,
     lsp::{from_proto, to_proto},
     lsp_ext::{
-        AnalyzerStatusParams, ItemTreeParams, PreprocessedDocumentParams, ProjectsGraphvizParams,
-        SyntaxTreeParams,
+        AnalyzerStatusParams, ItemTreeParams, PreprocessedDocumentParams, ProjectMainPathParams,
+        ProjectsGraphvizParams, SyntaxTreeParams,
     },
 };
 
@@ -246,3 +246,20 @@ pub(crate) fn handle_analyzer_status(
     );
     Ok(buf)
 }
+
+pub(crate) fn handle_project_main_path(
+    snap: GlobalStateSnapshot,
+    params: ProjectMainPathParams,
+) -> anyhow::Result<Url> {
+    let uri = params
+        .uri
+        .ok_or_else(|| anyhow::anyhow!("No uri received in request"))?;
+    let file_id = from_proto::file_id(&snap, &uri)?;
+
+    snap.analysis
+        .projects_for_file(file_id)
+        .context("Failed to get project for file")?
+        .first()
+        .map(|it| to_proto::url(&snap, *it))
+        .ok_or_else(|| anyhow::anyhow!("No project found for file"))
+}
diff --git a/crates/sourcepawn_lsp/src/main_loop.rs b/crates/sourcepawn_lsp/src/main_loop.rs
@@ -391,6 +391,7 @@ impl GlobalState {
             .on::<lsp_ext::PreprocessedDocument>(handlers::handle_preprocessed_document)
             .on::<lsp_ext::ItemTree>(handlers::handle_item_tree)
             .on::<lsp_ext::AnalyzerStatus>(handlers::handle_analyzer_status)
+            .on::<lsp_ext::ProjectMainPath>(handlers::handle_project_main_path)
             .finish();
         log::debug!("Handled request id: {:?}", req_id);
     }

diff --git a/editors/code/CHANGELOG.md b/editors/code/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Release Notes
 
+## [7.2.5]
+
+### Chore
+
+- LSP version bump.
+
 ## [7.2.4]
 
 ### Chore

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
diff --git a/editors/code/package.json b/editors/code/package.json
@@ -2,7 +2,7 @@
   "name": "sourcepawn-vscode",
   "displayName": "SourcePawn",
   "description": "SourcePawn highlighting, autocompletion and much more",
-  "version": "7.2.4",
+  "version": "7.2.5",
   "publisher": "Sarrus",
   "main": "./dist/spIndex.js",
   "icon": "sm.png",

diff --git a/editors/code/package_template.json b/editors/code/package_template.json
@@ -2,7 +2,7 @@
   "name": "sourcepawn-vscode",
   "displayName": "SourcePawn",
   "description": "SourcePawn highlighting, autocompletion and much more",
-  "version": "7.2.4",
+  "version": "7.2.5",
   "publisher": "Sarrus",
   "main": "./dist/spIndex.js",
   "icon": "sm.png",