Scope based autocompletion pt. 2

Cargo.toml

@@ -1,7 +1,10 @@
 [workspace]
-members = ["analysis", "codespan", "lsp", "parser"]
+members = ["codespan", "lsp", "parser"]
 resolver = "2"
 
+[workspace.package]
+edition = "2024"
+
 [workspace.dependencies]
 lsp-types = { version = "^0.97.0" }
 tower-lsp-server = "0.21.0"

codespan/src/file.rs

@@ -4,6 +4,7 @@ use core::panic;
 use std::fmt::{Display, Formatter};
 
 #[allow(dead_code)]
+#[derive(Debug, Clone)]
 pub struct File {
     pub name: String,
     pub source: String,

codespan/src/file_id.rs

@@ -1,10 +1,11 @@
+use std::fmt::Display;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct FileId(u32);
 
 impl FileId {
     const OFFSET: u32 = 1;
-    pub const NONE: Self = FileId(0); 
+    pub const NONE: Self = FileId(0);
 
     pub fn new(index: usize) -> FileId {
         FileId(index as u32 + Self::OFFSET)
@@ -13,4 +14,10 @@ impl FileId {
     pub fn get(self) -> usize {
         (self.0 - Self::OFFSET) as usize
     }
-}
+}
+
+impl Display for FileId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}

lsp/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ca65-lsp"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.93"
@@ -15,9 +15,9 @@ toml = "0.8.19"
 tempfile = "3.14.0"
 streaming-iterator = "0.1.9"
 parser = { path = "../parser" }
-analysis = { path = "../analysis" }
 codespan = { path = "../codespan", features = ["lsp"] }
 lazy_static = "1.5.0"
 walkdir = "2.5.0"
 uuid = { version = "1.17.0", features = ["v4"] }
-url = "2.5.4"
+url = "2.5.4"
+path-clean = "1.0.1"

lsp/src/analysis/mod.rs

@@ -0,0 +1,3 @@
+pub mod scope_analyzer;
+pub mod symbol_resolver;
+pub mod visitor;

analysis/src/scope_analyzer.rs → lsp/src/analysis/scope_analyzer.rs

@@ -1,5 +1,6 @@
-use crate::visitor::ASTVisitor;
-use codespan::{FileId, Span};
+use crate::analysis::visitor::ASTVisitor;
+use crate::cache_file::Include;
+use codespan::Span;
 use parser::{
     Ast, ConstantAssign, EnumMember, Expression, ImportExport, Statement, StructMember, Token,
 };
@@ -75,12 +76,6 @@ pub struct Scope {
     pub children: Vec<Scope>,
 }
 
-#[derive(Clone, Debug)]
-pub struct Include {
-    pub file: FileId,
-    pub scope: Vec<Scope>,
-}
-
 impl Scope {
     fn find_inner_scope(&self, index: usize) -> Option<Vec<Scope>> {
         if index < self.span.start || index >= self.span.end {
@@ -97,6 +92,12 @@ impl Scope {
     }
 }
 
+impl PartialEq for Scope {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name
+    }
+}
+
 pub struct ScopeAnalyzer {
     pub ast: Vec<Statement>,
     pub stack: Vec<Scope>,
@@ -354,9 +355,20 @@ impl ASTVisitor for ScopeAnalyzer {
         }
     }
 
-    fn visit_include(&mut self, _path: &Token, _span: Span) {
+    fn visit_global(&mut self, identifiers: &[Token], _zero_page: &bool, _span: Span) {
+        for identifier in identifiers {
+            self.insert_symbol(
+                identifier,
+                Symbol::Constant {
+                    name: identifier.clone(),
+                },
+            );
+        }
+    }
+
+    fn visit_include(&mut self, path: &Token, _span: Span) {
         self.includes.push(Include {
-            file: FileId::new(0),
+            path: path.clone(),
             scope: self.stack.clone(),
         })
     }

analysis/src/symbol_resolver.rs → lsp/src/analysis/symbol_resolver.rs

@@ -1,4 +1,4 @@
-use crate::visitor::ASTVisitor;
+use crate::analysis::visitor::ASTVisitor;
 use codespan::Span;
 use parser::{Ast, EnumMember, Expression, ImportExport, Statement, StructMember, Token};