ingot init fixes

Author: Grant Wuerker

crates/common/src/dependencies/graph.rs

@@ -26,6 +26,11 @@ impl DependencyGraph {
         self.node_map(db).contains_key(url)
     }
 
+    /// Returns all URLs in the dependency graph.
+    pub fn all_urls(&self, db: &dyn InputDb) -> Vec<Url> {
+        self.node_map(db).keys().cloned().collect()
+    }
+
     /// Returns a subgraph containing all cyclic nodes and all nodes that lead to cycles.
     ///
     /// This method identifies strongly connected components (SCCs) in the graph and returns

crates/common/src/lib.rs

@@ -9,6 +9,7 @@ pub mod urlext;
 
 use dependencies::DependencyGraph;
 use file::Workspace;
+pub use tracing;
 
 #[salsa::db]
 // Each database must implement InputDb explicitly with its own storage mechanism

crates/driver/src/files.rs

@@ -1,23 +1 @@
-use camino::Utf8PathBuf;
-
 pub const FE_TOML: &str = "fe.toml";
-
-pub fn find_project_root() -> Option<Utf8PathBuf> {
-    let mut path = Utf8PathBuf::from_path_buf(
-        std::env::current_dir().expect("Unable to get current directory"),
-    )
-    .expect("Expected utf8 path");
-
-    loop {
-        let fe_toml = path.join(FE_TOML);
-        if fe_toml.is_file() {
-            return Some(path);
-        }
-
-        if !path.pop() {
-            break;
-        }
-    }
-
-    None
-}

crates/driver/src/lib.rs

@@ -32,15 +32,27 @@ pub fn ingot_graph_resolver<'a>() -> IngotGraphResolver<'a> {
         .with_required_directory("src")
         .with_required_file("src/lib.fe")
         .with_pattern("src/**/*.fe");
+
     GraphResolverImpl::new(files_resolver)
 }
 
 pub fn init_ingot(db: &mut DriverDataBase, ingot_url: &Url) -> Vec<IngotInitDiagnostics> {
+    // Check if ingot is already initialized
+    if db.graph().contains_url(db, ingot_url) {
+        tracing::info!(target: "resolver", "Ingot already initialized: {}", ingot_url);
+        return Vec::new();
+    }
+
     tracing::info!(target: "resolver", "Starting workspace ingot resolution for: {}", ingot_url);
+
     let mut diagnostics: Vec<IngotInitDiagnostics> = {
         let mut handler = InputHandler::from_db(db, ingot_url.clone());
         let mut ingot_graph_resolver = ingot_graph_resolver();
 
+        // Always enable search mode for the initial URL
+        // It will auto-disable after the first resolution so dependencies use exact paths
+        ingot_graph_resolver.node_resolver.search_mode = true;
+
         // Root ingot resolution should never fail since directory existence is validated earlier.
         // If it fails, it indicates a bug in the resolver or an unexpected system condition.
         if let Err(err) = ingot_graph_resolver.graph_resolve(&mut handler, ingot_url) {
@@ -304,6 +316,7 @@ impl<'a> GraphResolutionHandler<Url, DiGraph<Url, (SmolStr, DependencyArguments)
             let from_url = &graph[edge.source()];
             let to_url = &graph[edge.target()];
             let (alias, arguments) = edge.weight();
+
             dependency_graph.add_dependency(
                 self.db,
                 from_url,
@@ -312,5 +325,11 @@ impl<'a> GraphResolutionHandler<Url, DiGraph<Url, (SmolStr, DependencyArguments)
                 arguments.clone(),
             );
         }
+
+        // Log total ingot count after resolution
+        let total_ingots = dependency_graph.all_urls(self.db).len();
+        if total_ingots > 0 {
+            tracing::info!(target: "resolver", "Total ingots in workspace: {}", total_ingots);
+        }
     }
 }

crates/fe/src/main.rs

@@ -33,7 +33,9 @@ pub enum Command {
 }
 
 fn default_project_path() -> Utf8PathBuf {
-    driver::files::find_project_root().unwrap_or(Utf8PathBuf::from("."))
+    // With search mode enabled in init_ingot, we can just use the current directory
+    // The FilesResolver will walk up to find the ingot root
+    Utf8PathBuf::from(".")
 }
 
 fn main() {

crates/fe/src/tree.rs

@@ -73,7 +73,9 @@ pub type IngotGraphResolver =
     resolver::graph::GraphResolverImpl<FilesResolver, TreeHandler, (SmolStr, DependencyArguments)>;
 
 pub fn tree_resolver() -> IngotGraphResolver {
-    let files_resolver = FilesResolver::new().with_required_file("fe.toml");
+    let files_resolver = FilesResolver::new()
+        .with_required_file("fe.toml")
+        .with_search_mode();
     resolver::graph::GraphResolverImpl::new(files_resolver)
 }
 

crates/language-server/src/backend/db.rs

@@ -255,6 +255,21 @@ pub async fn handle_file_change(
                     .db
                     .workspace()
                     .update(&mut backend.db, url.clone(), contents);
+
+                // If this is a .fe file, check if its ingot is loaded
+                if path.extension().and_then(|s| s.to_str()) == Some("fe") {
+                    // Use init_ingot to find and load the ingot root
+                    // It will walk up from the file's directory to find fe.toml
+                    let diagnostics = init_ingot(&mut backend.db, &url);
+
+                    // Log any diagnostics
+                    for diagnostic in diagnostics {
+                        warn!(
+                            "Ingot initialization diagnostic for file {:?}: {}",
+                            path, diagnostic
+                        );
+                    }
+                }
             }
         }
         ChangeKind::Create => {

crates/language-server/src/functionality/handlers.rs

@@ -59,7 +59,9 @@ async fn main() {
 async fn start_stdio_server() {
     let (server, client) = async_lsp::MainLoop::new_server(|client| {
         let tracing_layer = TracingLayer::default();
-        let lsp_service = setup(client.clone(), "LSP actor".to_string());
+
+        let pid = std::process::id();
+        let lsp_service = setup(client.clone(), format!("LSP actor {}", pid));
         ServiceBuilder::new()
             .layer(LifecycleLayer::default())
             .layer(CatchUnwindLayer::default())

crates/language-server/src/main.rs

@@ -0,0 +1,3 @@
+[ingot]
+name = "ingot_a"
+version = "0.1.0"