forked from extern/nushell
The original purpose of this PR was to modernize the external parser to use the new Shape system. This commit does include some of that change, but a more important aspect of this change is an improvement to the expansion trace. Previous commit 6a7c00ea adding trace infrastructure to the syntax coloring feature. This commit adds tracing to the expander. The bulk of that work, in addition to the tree builder logic, was an overhaul of the formatter traits to make them more general purpose, and more structured. Some highlights: - `ToDebug` was split into two traits (`ToDebug` and `DebugFormat`) because implementations needed to become objects, but a convenience method on `ToDebug` didn't qualify - `DebugFormat`'s `fmt_debug` method now takes a `DebugFormatter` rather than a standard formatter, and `DebugFormatter` has a new (but still limited) facility for structured formatting. - Implementations of `ExpandSyntax` need to produce output that implements `DebugFormat`. Unlike the highlighter changes, these changes are fairly focused in the trace output, so these changes aren't behind a flag.
145 lines
4.0 KiB
Rust
145 lines
4.0 KiB
Rust
use crate::commands::{Command, UnevaluatedCallInfo};
|
|
use crate::parser::{hir, hir::syntax_shape::ExpandContext};
|
|
use crate::prelude::*;
|
|
use derive_new::new;
|
|
use indexmap::IndexMap;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::error::Error;
|
|
use std::sync::atomic::AtomicBool;
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
pub enum AnchorLocation {
|
|
Url(String),
|
|
File(String),
|
|
Source(Text),
|
|
}
|
|
|
|
#[derive(Clone, new)]
|
|
pub struct CommandRegistry {
|
|
#[new(value = "Arc::new(Mutex::new(IndexMap::default()))")]
|
|
registry: Arc<Mutex<IndexMap<String, Arc<Command>>>>,
|
|
}
|
|
|
|
impl CommandRegistry {
|
|
pub(crate) fn empty() -> CommandRegistry {
|
|
CommandRegistry {
|
|
registry: Arc::new(Mutex::new(IndexMap::default())),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn get_command(&self, name: &str) -> Option<Arc<Command>> {
|
|
let registry = self.registry.lock().unwrap();
|
|
|
|
registry.get(name).map(|c| c.clone())
|
|
}
|
|
|
|
pub(crate) fn expect_command(&self, name: &str) -> Arc<Command> {
|
|
self.get_command(name).unwrap()
|
|
}
|
|
|
|
pub(crate) fn has(&self, name: &str) -> bool {
|
|
let registry = self.registry.lock().unwrap();
|
|
|
|
registry.contains_key(name)
|
|
}
|
|
|
|
pub(crate) fn insert(&mut self, name: impl Into<String>, command: Arc<Command>) {
|
|
let mut registry = self.registry.lock().unwrap();
|
|
registry.insert(name.into(), command);
|
|
}
|
|
|
|
pub(crate) fn names(&self) -> Vec<String> {
|
|
let registry = self.registry.lock().unwrap();
|
|
registry.keys().cloned().collect()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct Context {
|
|
registry: CommandRegistry,
|
|
host: Arc<Mutex<dyn Host + Send>>,
|
|
pub ctrl_c: Arc<AtomicBool>,
|
|
pub(crate) shell_manager: ShellManager,
|
|
}
|
|
|
|
impl Context {
|
|
pub(crate) fn registry(&self) -> &CommandRegistry {
|
|
&self.registry
|
|
}
|
|
|
|
pub(crate) fn expand_context<'context>(
|
|
&'context self,
|
|
source: &'context Text,
|
|
) -> ExpandContext<'context> {
|
|
ExpandContext::new(&self.registry, source, self.shell_manager.homedir())
|
|
}
|
|
|
|
pub(crate) fn basic() -> Result<Context, Box<dyn Error>> {
|
|
let registry = CommandRegistry::new();
|
|
Ok(Context {
|
|
registry: registry.clone(),
|
|
host: Arc::new(Mutex::new(crate::env::host::BasicHost)),
|
|
ctrl_c: Arc::new(AtomicBool::new(false)),
|
|
shell_manager: ShellManager::basic(registry)?,
|
|
})
|
|
}
|
|
|
|
pub(crate) fn with_host(&mut self, block: impl FnOnce(&mut dyn Host)) {
|
|
let mut host = self.host.lock().unwrap();
|
|
|
|
block(&mut *host)
|
|
}
|
|
|
|
pub fn add_commands(&mut self, commands: Vec<Arc<Command>>) {
|
|
for command in commands {
|
|
self.registry.insert(command.name().to_string(), command);
|
|
}
|
|
}
|
|
|
|
pub(crate) fn get_command(&self, name: &str) -> Option<Arc<Command>> {
|
|
self.registry.get_command(name)
|
|
}
|
|
|
|
pub(crate) fn expect_command(&self, name: &str) -> Arc<Command> {
|
|
self.registry.expect_command(name)
|
|
}
|
|
|
|
pub(crate) fn run_command<'a>(
|
|
&mut self,
|
|
command: Arc<Command>,
|
|
name_tag: Tag,
|
|
args: hir::Call,
|
|
source: &Text,
|
|
input: InputStream,
|
|
is_first_command: bool,
|
|
) -> OutputStream {
|
|
let command_args = self.command_args(args, input, source, name_tag);
|
|
command.run(command_args, self.registry(), is_first_command)
|
|
}
|
|
|
|
fn call_info(&self, args: hir::Call, source: &Text, name_tag: Tag) -> UnevaluatedCallInfo {
|
|
UnevaluatedCallInfo {
|
|
args,
|
|
source: source.clone(),
|
|
name_tag,
|
|
}
|
|
}
|
|
|
|
fn command_args(
|
|
&self,
|
|
args: hir::Call,
|
|
input: InputStream,
|
|
source: &Text,
|
|
name_tag: Tag,
|
|
) -> CommandArgs {
|
|
CommandArgs {
|
|
host: self.host.clone(),
|
|
ctrl_c: self.ctrl_c.clone(),
|
|
shell_manager: self.shell_manager.clone(),
|
|
call_info: self.call_info(args, source, name_tag),
|
|
input,
|
|
}
|
|
}
|
|
}
|