[wip]

fmease · May 4, 2024 · a01540c · a01540c
1 parent bdcd36d
commit a01540c
Show file tree

Hide file tree

Showing 17 changed files with 528 additions and 549 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/documenter/src/format.rs b/compiler/documenter/src/format.rs
@@ -3,7 +3,7 @@ use super::{
     node::{Attributable, Element},
 };
 use hir::DeclarationIndex;
-use hir_format::{ComponentExt, Display, SessionExt};
+use hir_format::{Display, SessionExt as _};
 use joinery::JoinableIterator;
 use session::Session;
 use std::fmt::Write;
@@ -257,10 +257,8 @@ impl<'a> Formatter<'a> {
     }
 
     fn module_url_fragment(&self, index: DeclarationIndex) -> String {
-        let component = self.session.component_of(index);
-
-        let mut segments = component.local_index_to_path_segments(index.local_unchecked());
-        segments.push_front(component.name().into_inner());
+        let mut segments = self.session.index_to_path_segments(index);
+        segments.push_front(self.session.component_of(index).name().into_inner());
 
         format!(
             "{}{}/index.html",

diff --git a/compiler/documenter/src/lib.rs b/compiler/documenter/src/lib.rs
@@ -11,12 +11,11 @@ use crossbeam::thread::Scope;
 use derivation::Elements;
 use diagnostics::error::Result;
 use hir::{Attribute, AttributeName, Attributes, BareAttribute};
-use hir_format::ComponentExt;
+use hir_format::SessionExt;
 use joinery::JoinableIterator;
 use lexer::word::Word;
 use node::{Attributable, Document, Element, Node, VoidElement};
 use session::{
-    component::{DeclarationIndexExt, IdentifierExt},
     package::{ManifestPath, Package},
     Context, Session, OUTPUT_FOLDER_NAME,
 };
@@ -203,11 +202,7 @@ impl<'a, 'scope> Documenter<'a, 'scope> {
                         // incorrect on top of that!)
                         let path = self
                             .session
-                            .component()
-                            .local_index_with_root_to_extern_path(
-                                index.local(self.session).unwrap(),
-                                component_name.to_owned(),
-                            );
+                            .index_with_root_to_extern_path(index, component_name.to_owned());
 
                         write!(
                             search_index,
@@ -534,10 +529,10 @@ impl<'a, 'scope> Documenter<'a, 'scope> {
     }
 
     fn add_module_page(&self, module: &hir::Module, attributes: &Attributes) -> Page {
-        let index = module.binder.local_declaration_index(self.session).unwrap();
+        let index = module.binder.declaration_index().unwrap();
         let component_name = self.session.component().name();
 
-        let mut segments = self.session.component().local_index_to_path_segments(index);
+        let mut segments = self.session.index_to_path_segments(index);
         segments.push_front(component_name.into_inner());
         let page_depth = segments.len();
         let url_prefix = format!("./{}", "../".repeat(page_depth));
@@ -571,7 +566,7 @@ impl<'a, 'scope> Documenter<'a, 'scope> {
             {
                 let mut heading = Element::new("h1");
 
-                heading.add_child(match index == self.session.component().root_local() {
+                heading.add_child(match index.is_root() {
                     true => "Component",
                     false => "Module",
                 });
@@ -613,8 +608,7 @@ impl<'a, 'scope> Documenter<'a, 'scope> {
 
         let title = self
             .session
-            .component()
-            .local_index_with_root_to_extern_path(index, component_name.to_string());
+            .index_with_root_to_extern_path(index, component_name.to_string());
 
         Page {
             path: segments

diff --git a/compiler/driver/Cargo.toml b/compiler/driver/Cargo.toml
@@ -19,7 +19,6 @@ derivation = { path = "../../project/library/derivation" }
 diagnostics = { path = "../diagnostics" }
 documenter = { path = "../documenter" }
 hir_format = { path = "../hir_format" }
-index_map = { path = "../../project/library/index_map" }
 lexer = { path = "../lexer" }
 lo_ast = { path = "../lo_ast" }
 lowerer = { path = "../lowerer" }

diff --git a/compiler/driver/src/cli.rs b/compiler/driver/src/cli.rs
@@ -14,10 +14,6 @@ use utility::{
     paint::{paint_to_string, AnsiColor, ColorChoice},
 };
 
-// @Task update the color scheme of the `-Zhelp` output from clap-3-style to clap-4-style
-//       i.e. from upper-case section titles and the use of yellow & green to
-//       bold & underlined section titles and the use of bold letters
-
 pub(crate) fn arguments() -> Result<(Command, GlobalOptions)> {
     let short_version = format!(
         "{} ({} {})",
@@ -134,7 +130,7 @@ pub(crate) fn arguments() -> Result<(Command, GlobalOptions)> {
         .action(ArgAction::Append)
         .help("Set an unstable option. See ‘-Z help’ for details");
 
-    // @Task use `try_get_matches` (no real block, just def an error type and smh exit with code 2 instead of 1 on error)
+    // @Task use `try_get_matches` (just define an error type and smh exit with code 2 instead of 1 on error)
     let matches = clap::Command::new("lushui")
         .bin_name("lushui")
         .version(short_version)
@@ -238,6 +234,8 @@ pub(crate) fn arguments() -> Result<(Command, GlobalOptions)> {
                         .required(true)
                         .help("The path to the Recnot file"),
                 ),
+            clap::Command::new(subcommand::TREE)
+                .about("Display a tree visualization of a dependency graph"),
         ])
         .get_matches();
 
@@ -341,6 +339,7 @@ pub(crate) fn arguments() -> Result<(Command, GlobalOptions)> {
         (subcommand::RECNOT, matches) => Command::Recnot {
             path: matches.get_one(argument::PATH).cloned().unwrap(),
         },
+        (subcommand::TREE, _matches) => Command::Tree,
         _ => unreachable!(),
     };
 
@@ -359,6 +358,7 @@ mod subcommand {
     pub(super) const RUN: &str = "run";
     #[cfg(feature = "lsp")]
     pub(super) const SERVE: &str = "serve";
+    pub(super) const TREE: &str = "tree";
 }
 
 mod argument {
@@ -396,16 +396,17 @@ pub(crate) enum Command {
         mode: BuildMode,
         options: FileBuildOptions,
     },
-    #[cfg(feature = "lsp")]
-    Serve,
-    Explain,
     CreatePackage {
         mode: PackageCreationMode,
         options: PackageCreationOptions,
     },
+    Explain,
     Recnot {
         path: PathBuf,
     },
+    #[cfg(feature = "lsp")]
+    Serve,
+    Tree,
 }
 
 pub(crate) struct GlobalOptions {