mirror of
https://github.com/nushell/nushell.git
synced 2024-12-27 01:19:25 +01:00
86cd387439
# Description Our config exists both as a `Config` struct for internal consumption and as a `Value`. The latter is exposed through `$env.config` and can be both set and read. Thus we have a complex bug-prone mechanism, that reads a `Value` and then tries to plug anything where the value is unrepresentable in `Config` with the correct state from `Config`. The parsing involves therefore mutation of the `Value` in a nested `Record` structure. Previously this was wholy done manually, with indices. To enable deletion for example, things had to be iterated over from the back. Also things were indexed in a bunch of places. This was hard to read and an invitation for bugs. With #10876 we can now use `Record::retain_mut` to traverse the records, modify anything that needs fixing, and drop invalid fields. # Parts: - Error messages now consistently use the correct spans pointing to the problematic value and the paths displayed in some messages are also aligned with the keys used for lookup. - Reconstruction of values has been fixed for: - `table.padding` - `buffer_editor` - `hooks.command_not_found` - `datetime_format` (partial solution) - Fix validation of `table.padding` input so value is not set (and underflows `usize` causing `table` to run forever with negative values) - New proper types for settings. Fully validated enums instead of strings: - `config.edit_mode` -> `EditMode` - Don't fall back to vi-mode on invalid string - `config.table.mode` -> `TableMode` - there is still a fall back to `rounded` if given an invalid `TableMode` as argument to the `nu` binary - `config.completions.algorithm` -> `CompletionAlgorithm` - `config.error_style` -> `ErrorStyle` - don't implicitly fall back to `fancy` when given an invalid value. - This should also shrink the size of `Config` as instead of 4x24 bytes those fields now need only 4x1 bytes in `Config` - Completely removed macros relying on the scope of `Value::into_config` so we can break it up into smaller parts in the future. - Factored everything into smaller files with the types and helpers for particular topics. - `NuCursorShape` now explicitly expresses the `Inherit` setting. conversion to option only happens at the interface to `reedline`
113 lines
3.4 KiB
Rust
113 lines
3.4 KiB
Rust
use crate::{
|
|
engine::{EngineState, StateWorkingSet},
|
|
ErrorStyle,
|
|
};
|
|
use miette::{
|
|
LabeledSpan, MietteHandlerOpts, NarratableReportHandler, ReportHandler, RgbColors, Severity,
|
|
SourceCode,
|
|
};
|
|
use thiserror::Error;
|
|
|
|
/// This error exists so that we can defer SourceCode handling. It simply
|
|
/// forwards most methods, except for `.source_code()`, which we provide.
|
|
#[derive(Error)]
|
|
#[error("{0}")]
|
|
pub struct CliError<'src>(
|
|
pub &'src (dyn miette::Diagnostic + Send + Sync + 'static),
|
|
pub &'src StateWorkingSet<'src>,
|
|
);
|
|
|
|
pub fn format_error(
|
|
working_set: &StateWorkingSet,
|
|
error: &(dyn miette::Diagnostic + Send + Sync + 'static),
|
|
) -> String {
|
|
format!("Error: {:?}", CliError(error, working_set))
|
|
}
|
|
|
|
pub fn report_error(
|
|
working_set: &StateWorkingSet,
|
|
error: &(dyn miette::Diagnostic + Send + Sync + 'static),
|
|
) {
|
|
eprintln!("Error: {:?}", CliError(error, working_set));
|
|
// reset vt processing, aka ansi because illbehaved externals can break it
|
|
#[cfg(windows)]
|
|
{
|
|
let _ = nu_utils::enable_vt_processing();
|
|
}
|
|
}
|
|
|
|
pub fn report_error_new(
|
|
engine_state: &EngineState,
|
|
error: &(dyn miette::Diagnostic + Send + Sync + 'static),
|
|
) {
|
|
let working_set = StateWorkingSet::new(engine_state);
|
|
|
|
report_error(&working_set, error);
|
|
}
|
|
|
|
impl std::fmt::Debug for CliError<'_> {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
let config = self.1.get_config();
|
|
|
|
let ansi_support = &config.use_ansi_coloring;
|
|
let ansi_support = *ansi_support;
|
|
|
|
let error_style = &config.error_style;
|
|
|
|
let miette_handler: Box<dyn ReportHandler> = match error_style {
|
|
ErrorStyle::Plain => Box::new(NarratableReportHandler::new()),
|
|
ErrorStyle::Fancy => Box::new(
|
|
MietteHandlerOpts::new()
|
|
// For better support of terminal themes use the ANSI coloring
|
|
.rgb_colors(RgbColors::Never)
|
|
// If ansi support is disabled in the config disable the eye-candy
|
|
.color(ansi_support)
|
|
.unicode(ansi_support)
|
|
.terminal_links(ansi_support)
|
|
.build(),
|
|
),
|
|
};
|
|
|
|
// Ignore error to prevent format! panics. This can happen if span points at some
|
|
// inaccessible location, for example by calling `report_error()` with wrong working set.
|
|
let _ = miette_handler.debug(self, f);
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl<'src> miette::Diagnostic for CliError<'src> {
|
|
fn code<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
|
|
self.0.code()
|
|
}
|
|
|
|
fn severity(&self) -> Option<Severity> {
|
|
self.0.severity()
|
|
}
|
|
|
|
fn help<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
|
|
self.0.help()
|
|
}
|
|
|
|
fn url<'a>(&'a self) -> Option<Box<dyn std::fmt::Display + 'a>> {
|
|
self.0.url()
|
|
}
|
|
|
|
fn labels<'a>(&'a self) -> Option<Box<dyn Iterator<Item = LabeledSpan> + 'a>> {
|
|
self.0.labels()
|
|
}
|
|
|
|
// Finally, we redirect the source_code method to our own source.
|
|
fn source_code(&self) -> Option<&dyn SourceCode> {
|
|
if let Some(source_code) = self.0.source_code() {
|
|
Some(source_code)
|
|
} else {
|
|
Some(&self.1)
|
|
}
|
|
}
|
|
|
|
fn related<'a>(&'a self) -> Option<Box<dyn Iterator<Item = &'a dyn miette::Diagnostic> + 'a>> {
|
|
self.0.related()
|
|
}
|
|
}
|