Merge pull request #336 from Sarrus1/break/get-rid-of-mainpath

Get rid of the mainpath setting

.vscode/launch.json

@@ -8,7 +8,6 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--disable-extensions",
         "--extensionDevelopmentPath=${workspaceFolder}/editors/code"
       ],
       "outFiles": [
@@ -29,7 +28,6 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--disable-extensions",
         "--extensionDevelopmentPath=${workspaceFolder}/editors/code"
       ],
       "outFiles": [

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Release Notes
 
+## [0.11.0]
+
+### Added
+
+- Added automatic mainPath detection. The mainPath setting does not exist anymore!
+- Added support for Apple Silicon.
+- Switched to a path interner for better performance when resolving references (no longer using URIs).
+- Added better progress report.
+
 ## [0.10.19]
 
 ### Added
@@ -291,15 +300,15 @@
 ### Added
 
 - Added status notifications.
-- Added support for folder rename in includeDirectories.
+- Added support for folder rename in includesDirectories.
 
 ## [0.6.0]
 
 ### Added
 
 - Added `typedef` and `typeset` support.
 - Added callback completions.
-- Added file rename/deletion support in includeDirectories.
+- Added file rename/deletion support in includesDirectories.
 
 ## [0.5.1]
 
@@ -309,7 +318,7 @@
 
 ### Fixed
 
-- Fixed changes in IncludeDirectories not being detected.
+- Fixed changes in IncludesDirectories not being detected.
 - Fixed some references not being resolved on the initial parse.
 
 ## [0.5.0]

Cargo.toml

@@ -53,6 +53,8 @@ tree-sitter-sourcepawn = { git = "https://github.com/Sarrus1/tree-sitter-sourcep
 strip_bom = "1.0.0"
 serde = "1.0.147"
 serde_json = "^1.0.83"
+nohash-hasher = "^0.2.0"
+indexmap = "^2.0.0"
 
 [workspace.dependencies.uuid]
 version = "1.3.0"

crates/linter/src/spcomp.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context};
+use anyhow::{anyhow, bail};
 use fxhash::FxHashMap;
 use lazy_static::lazy_static;
 use lsp_types::{Diagnostic, DiagnosticSeverity, Position, Range, Url};
@@ -93,31 +93,37 @@ impl SPCompDiagnostic {
 /// # Arguments
 ///
 /// * `uri` - [Uri](Url) of the file to compile.
+/// * `spcomp_path` - [Path](Path) of the spcomp executable.
+/// * `includes_directories` - [Paths](PathBuf) of include directories to pass to spcomp.
+/// * `linter_arguments` - Additional arguments to pass to spcomp.
 pub fn get_spcomp_diagnostics(
     uri: Url,
     spcomp_path: &Path,
     includes_directories: &[PathBuf],
     linter_arguments: &[String],
 ) -> anyhow::Result<FxHashMap<Url, Vec<SPCompDiagnostic>>> {
-    let output = Command::new(
-        spcomp_path
-            .to_str()
-            .context("Failed to convert spcomp path to string.")?,
-    )
-    .args(build_args(&uri, includes_directories, linter_arguments)?)
-    .output();
+    // Handle Apple Silicon
+    let output = if std::env::consts::OS == "macos" && std::env::consts::ARCH == "aarch64" {
+        Command::new("arch")
+            .arg("-x86_64")
+            .arg(spcomp_path)
+            .args(build_args(&uri, includes_directories, linter_arguments)?)
+            .output()
+    } else {
+        Command::new(spcomp_path)
+            .args(build_args(&uri, includes_directories, linter_arguments)?)
+            .output()
+    };
+
     let out_path = get_out_path();
     if out_path.exists() {
         let _ = fs::remove_file(out_path);
     }
 
-    let output = output?;
+    let output = output?; // Unwrap output here to allow removing the existing file first.
     let stderr = String::from_utf8_lossy(&output.stderr);
     if !stderr.is_empty() {
-        return Err(anyhow::anyhow!(
-            "Failed to run spcomp with error: {}",
-            stderr
-        ));
+        bail!("Failed to run spcomp with error: {}", stderr);
     }
 
     let stdout = String::from_utf8_lossy(&output.stdout);

crates/parser/src/comment_parser.rs

@@ -33,7 +33,9 @@ impl<'a> Parser<'a> {
     }
 
     pub fn push_inline_comment(&mut self, item: &Arc<RwLock<SPItem>>) {
-        let Ok(description) = self.find_doc(item.read().range().end.line as usize, true) else {return};
+        let Ok(description) = self.find_doc(item.read().range().end.line as usize, true) else {
+            return;
+        };
         match &mut *item.write() {
             SPItem::EnumMember(enum_member_item) => {
                 enum_member_item.description = description;

crates/parser/src/define_parser.rs

@@ -25,6 +25,7 @@ impl<'a> Parser<'a> {
             value: value.unwrap_or_default().to_string(),
             description: self.find_doc(node.start_position().row, true)?,
             uri: self.uri.clone(),
+            file_id: self.file_id,
             references: vec![],
         };
 

crates/parser/src/enum_parser.rs

@@ -26,6 +26,7 @@ impl<'a> Parser<'a> {
             v_full_range: self.build_v_range(&full_range),
             description,
             uri: self.uri.clone(),
+            file_id: self.file_id,
             references: vec![],
             children: vec![],
         };
@@ -86,7 +87,9 @@ impl<'a> Parser<'a> {
                 "comment" => {
                     self.push_comment(child);
                     if let Some(items) = enum_item.read().children() {
-                        let Some(item) = items.last()else{continue;};
+                        let Some(item) = items.last() else {
+                            continue;
+                        };
                         self.push_inline_comment(item);
                     }
                 }
@@ -107,6 +110,7 @@ impl<'a> Parser<'a> {
         let enum_member_item = EnumMemberItem {
             name,
             uri: self.uri.clone(),
+            file_id: self.file_id,
             range,
             v_range: self.build_v_range(&range),
             parent: Arc::downgrade(enum_item),

crates/parser/src/enum_struct_parser.rs

@@ -30,6 +30,7 @@ impl<'a> Parser<'a> {
             v_full_range: self.build_v_range(&full_range),
             description,
             uri: self.uri.clone(),
+            file_id: self.file_id,
             references: vec![],
             children: vec![],
         };
@@ -101,6 +102,7 @@ impl<'a> Parser<'a> {
             v_range: self.build_v_range(&range),
             description: Description::default(),
             uri: self.uri.clone(),
+            file_id: self.file_id,
             detail: format!("{} {}{}", type_, name, dimensions.join("")),
             visibility: vec![],
             storage_class: vec![],

crates/parser/src/function_parser.rs

@@ -157,6 +157,7 @@ impl<'a> Parser<'a> {
             v_full_range: self.build_v_range(&full_range),
             description: description.clone(),
             uri: self.uri.clone(),
+            file_id: self.file_id,
             detail: attributes.build_detail(self.source).unwrap_or_default(),
             visibility: attributes.visibility,
             definition_type: attributes.definition_type,
@@ -259,6 +260,7 @@ impl<'a> Parser<'a> {
             v_range: self.build_v_range(&range),
             description: description.clone(),
             uri: self.uri.clone(),
+            file_id: self.file_id,
             detail: detail.to_string(),
             visibility: vec![],
             storage_class,

crates/parser/src/lib.rs

@@ -4,7 +4,7 @@ use lsp_types::{Range, Url};
 use parking_lot::RwLock;
 use preprocessor::Offset;
 use std::sync::Arc;
-use syntax::{comment::Comment, deprecated::Deprecated, SPItem};
+use syntax::{comment::Comment, deprecated::Deprecated, FileId, SPItem};
 use tree_sitter::Query;
 
 pub mod comment_parser;
@@ -38,6 +38,7 @@ pub struct Parser<'a> {
     pub offsets: &'a FxHashMap<u32, Vec<Offset>>,
     pub source: &'a String,
     pub uri: Arc<Url>,
+    pub file_id: FileId,
 }
 
 pub fn build_v_range(offsets: &FxHashMap<u32, Vec<Offset>>, range: &Range) -> Range {

crates/parser/src/macro_parser.rs

@@ -23,6 +23,7 @@ impl<'a> Parser<'a> {
             value: "".to_string(),
             description: self.find_doc(node.start_position().row, true)?,
             uri: self.uri.clone(),
+            file_id: self.file_id,
             references: vec![],
         };
 

crates/parser/src/methodmap_parser.rs

@@ -28,6 +28,7 @@ impl<'a> Parser<'a> {
                 .find_doc(node.start_position().row, false)
                 .unwrap_or_default(),
             uri: self.uri.clone(),
+            file_id: self.file_id,
             references: vec![],
             tmp_parent: inherit,
             children: vec![],

crates/parser/src/property_parser.rs

@@ -34,6 +34,7 @@ impl<'a> Parser<'a> {
                 .find_doc(node.start_position().row, false)
                 .unwrap_or_default(),
             uri: self.uri.clone(),
+            file_id: self.file_id,
             references: vec![],
             parent: Arc::downgrade(&parent),
         };

crates/parser/src/typedef_parser.rs

@@ -64,6 +64,7 @@ impl<'a> Parser<'a> {
             v_full_range: self.build_v_range(&full_range),
             description: description.clone(),
             uri: self.uri.clone(),
+            file_id: self.file_id,
             detail: node
                 .utf8_text(self.source.as_bytes())
                 .unwrap_or_default()
@@ -159,7 +160,7 @@ impl<'a> Parser<'a> {
 
         for child in argument_type_node.children(&mut cursor) {
             match child.kind() {
-                // FIXME: Handle oldtypes.
+                // TODO: Handle oldtypes.
                 "type" => {
                     type_.name = child.utf8_text(self.source.as_bytes()).ok()?.to_string();
                 }