Annotation Refactor

.pre-commit-config.yaml

@@ -13,9 +13,9 @@ repos:
     rev: v6.0.0
     hooks:
       - id: trailing-whitespace
-        exclude: '(^crates/glua_ls/std_i18n/.*\.yaml$|^\.github/skills/.*)'
+        exclude: '^\.github/skills/.*'
       - id: end-of-file-fixer
-        exclude: '(^crates/glua_ls/std_i18n/.*\.yaml$|^\.github/skills/.*)'
+        exclude: '^\.github/skills/.*'
       - id: fix-byte-order-marker
       - id: mixed-line-ending
         args: [--fix=lf]

Cargo.toml

@@ -20,6 +20,7 @@ glua_diagnostic_macro = { path = "crates/glua_diagnostic_macro", version = "0.1.
 schema_to_glua = { path = "crates/schema_to_glua", version = "0.1.5" }
 
 # external
+aho-corasick = "1.1.3"
 lsp-server = "0.7.9"
 tokio = { version = "1.48", features = ["full"] }
 serde = { version = "1.0.228", features = ["derive"] }
@@ -30,7 +31,6 @@ lsp_types = { version = "0.1.0", package = "emmy_lsp_types" }
 schemars = "1.0.4"
 regex = "1"
 internment = { version = "0.8.6", features = ["arc"] }
-rust-i18n = "3"
 log = "0.4.28"
 fern = "0.7.1"
 chrono = "0.4.42"
@@ -140,4 +140,4 @@ debug = false
 
 [profile.debugging]
 inherits = "dev"
-debug = true
+debug = true

crates/glua_check/src/init.rs

@@ -96,7 +96,7 @@ pub async fn load_workspace(
         .collect::<Vec<WorkspaceFolder>>();
     let mut analysis = EmmyLuaAnalysis::new();
     analysis.update_config(emmyrc.clone().into());
-    analysis.init_std_lib(None);
+    analysis.init_std_lib();
 
     // Add GMod annotations as library workspace if provided
     if let Some(annotations_path) = gmod_annotations {
@@ -115,8 +115,41 @@ pub async fn load_workspace(
         }
     }
 
+    // Canonicalize main workspace root for self-overlap detection.
+    let main_root_canon = main_path.canonicalize().ok();
+
     for lib in &emmyrc.workspace.library {
-        let path = PathBuf::from(lib.get_path().clone());
+        let configured = lib.get_path();
+        let path = PathBuf::from(configured);
+
+        // Filter invalid library paths: empty, nonexistent, not a directory,
+        // or resolves to the same path as the main workspace root (self-overlap
+        // would cause a redundant full re-scan of the workspace).
+        if configured.trim().is_empty() {
+            log::warn!(
+                "Skipping empty library path from config entry: {:?}",
+                configured
+            );
+            continue;
+        }
+        if !path.exists() {
+            log::warn!("Skipping library path that does not exist: {:?}", path);
+            continue;
+        }
+        if !path.is_dir() {
+            log::warn!("Skipping library path that is not a directory: {:?}", path);
+            continue;
+        }
+        if let (Ok(lib_canon), Some(ws_canon)) = (path.canonicalize(), &main_root_canon)
+            && lib_canon == *ws_canon
+        {
+            log::warn!(
+                "Skipping library path that resolves to the workspace root (self-overlap): {:?}",
+                path
+            );
+            continue;
+        }
+
         analysis.add_library_workspace(path.clone());
         workspace_folders.push(WorkspaceFolder::new(path.clone(), true));
     }