cleanup

Author: Grant Wuerker

crates/common/src/config.rs

@@ -5,7 +5,7 @@ use smol_str::SmolStr;
 use toml::Value;
 use url::Url;
 
-use crate::ingot::Version;
+use crate::{ingot::Version, urlext::UrlExt};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Config {
@@ -152,25 +152,17 @@ impl Dependency {
             DependencyDescription::Path(path) => BasedDependency {
                 alias: self.alias.clone(),
                 arguments: IngotArguments::default(),
-                url: join_dependency_path(base_url, path),
+                url: base_url.join_directory(path).unwrap(),
             },
             DependencyDescription::PathWithArguments { path, arguments } => BasedDependency {
                 alias: self.alias.clone(),
                 arguments: IngotArguments::default(),
-                url: join_dependency_path(base_url, path),
+                url: base_url.join_directory(path).unwrap(),
             },
         }
     }
 }
 
-fn join_dependency_path(base_url: &Url, path: &Utf8PathBuf) -> Url {
-    if base_url.as_str().ends_with("/") {
-        base_url.join(path.as_str()).unwrap()
-    } else {
-        Url::from_str(&format!("{}/{}", base_url.as_str(), path.as_str())).unwrap()
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BasedDependency {
     pub alias: SmolStr,

crates/common/src/urlext.rs

@@ -10,6 +10,7 @@ pub enum UrlExtError {
 pub trait UrlExt {
     fn parent(&self) -> Option<Url>;
     fn directory(&self) -> Option<Url>;
+    fn join_directory(&self, path: &Utf8PathBuf) -> Result<Url, ()>;
 }
 
 impl UrlExt for Url {
@@ -50,6 +51,16 @@ impl UrlExt for Url {
             return Some(parent);
         }
     }
+
+    fn join_directory(&self, path: &Utf8PathBuf) -> Result<Url, ()> {
+        Ok(if path.as_str().ends_with("/") {
+            self.join(path.as_str()).map_err(|_| ())?
+        } else {
+            let mut path = path.clone();
+            path.push("");
+            self.join(path.as_str()).map_err(|_| ())?
+        })
+    }
 }
 
 pub fn canonical_url(path: &Utf8PathBuf) -> Result<Url, ()> {

crates/driver/src/lib.rs

@@ -4,7 +4,7 @@ pub mod files;
 
 use camino::Utf8PathBuf;
 
-use common::{urlext::canonical_url, InputDb};
+use common::{config::DependencyDescription, urlext::canonical_url, InputDb};
 pub use db::DriverDataBase;
 
 use common::{
@@ -13,7 +13,7 @@ use common::{
 };
 use hir::hir_def::TopLevelMod;
 use resolver::{
-    files::{File, FilesResolver},
+    files::{File, FilesResolutionError, FilesResolver},
     ingot::ingot_graph_resolver,
     ResolutionHandler, Resolver,
 };
@@ -22,7 +22,13 @@ use url::Url;
 
 pub fn setup_workspace(
     path: &Utf8PathBuf,
-) -> (DriverDataBase, Workspace, Vec<WorkspaceSetupDiagnostics>) {
+) -> (
+    DriverDataBase,
+    Workspace,
+    Url,
+    Vec<Url>,
+    Vec<WorkspaceSetupDiagnostics>,
+) {
     let mut db = DriverDataBase::default();
     let ingot_url = canonical_url(path).unwrap();
     let workspace = db.workspace();
@@ -31,12 +37,22 @@ pub fn setup_workspace(
         workspace,
     };
     let mut ingot_graph_resolver = ingot_graph_resolver(node_handler);
-    let _graph = ingot_graph_resolver.transient_resolve(&ingot_url).unwrap();
+    let graph = ingot_graph_resolver.transient_resolve(&ingot_url).unwrap();
+    let dependency_urls = graph
+        .node_weights()
+        .filter(|weight| *weight != &ingot_url)
+        .cloned()
+        .collect();
 
     let diagnostics = ingot_graph_resolver
         .take_diagnostics()
         .into_iter()
-        .map(|diagnostic| WorkspaceSetupDiagnostics::UnresolvableIngotDependency)
+        .map(
+            |diagnostic| WorkspaceSetupDiagnostics::UnresolvableIngotDependency {
+                target: diagnostic.0,
+                error: diagnostic.1,
+            },
+        )
         .chain(
             ingot_graph_resolver
                 .node_resolver
@@ -46,7 +62,7 @@ pub fn setup_workspace(
         )
         .collect();
 
-    (db, workspace, diagnostics)
+    (db, workspace, ingot_url, dependency_urls, diagnostics)
 }
 
 fn _dump_scope_graph(db: &DriverDataBase, top_mod: TopLevelMod) -> String {
@@ -57,9 +73,12 @@ fn _dump_scope_graph(db: &DriverDataBase, top_mod: TopLevelMod) -> String {
 
 // Maybe the driver should eventually only support WASI?
 
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub enum WorkspaceSetupDiagnostics {
-    UnresolvableIngotDependency,
+    UnresolvableIngotDependency {
+        target: Url,
+        error: FilesResolutionError,
+    },
     IngotDependencyCycle,
     FileError,
 }

crates/fe/src/check.rs

@@ -3,16 +3,25 @@ use common::urlext::canonical_url;
 use url::Url;
 
 pub fn check(path: &Utf8PathBuf) {
-    let (db, workspace, diagnostics) = driver::setup_workspace(path);
+    let (db, workspace, base_ingot_url, dependency_ingot_urls, diagnostics) =
+        driver::setup_workspace(path);
 
     for diagnostic in diagnostics {
         println!("{:?}", diagnostic);
     }
 
-    let ingot = workspace
-        // should probably get url from setup
-        .containing_ingot(&db, &canonical_url(path).unwrap())
-        .unwrap();
+    let ingot = workspace.containing_ingot(&db, &base_ingot_url).unwrap();
     let diags = db.run_on_ingot(ingot);
-    diags.emit(&db);
+    if !diags.is_empty() {
+        diags.emit(&db);
+    }
+
+    for dependency_url in dependency_ingot_urls {
+        println!("{}", dependency_url);
+        let ingot = workspace.containing_ingot(&db, &dependency_url).unwrap();
+        let diags = db.run_on_ingot(ingot);
+        if !diags.is_empty() {
+            diags.emit(&db);
+        }
+    }
 }

crates/resolver/src/graph.rs

@@ -57,7 +57,7 @@ where
 }
 
 #[derive(Debug)]
-pub struct UnresolvableNode<N, E>(N, E);
+pub struct UnresolvableNode<N, E>(pub N, pub E);
 
 #[derive(Debug)]
 pub struct UnresolvableRootNode;

todo

@@ -0,0 +1,2 @@
+- format workspace setup errors
+- add resolved graph to workspace and use it for easier access of salsa ingots