2019-06-09 05:04:40 -05:00
|
|
|
//! The current rustc diagnostics emitter.
|
|
|
|
//!
|
|
|
|
//! An `Emitter` takes care of generating the output from a `DiagnosticBuilder` struct.
|
|
|
|
//!
|
|
|
|
//! There are various `Emitter` implementations that generate different output formats such as
|
|
|
|
//! JSON and human readable output.
|
|
|
|
//!
|
2020-03-11 06:49:08 -05:00
|
|
|
//! The output types are defined in `rustc_session::config::ErrorOutputType`.
|
2019-06-09 05:04:40 -05:00
|
|
|
|
2019-02-06 12:53:01 -06:00
|
|
|
use Destination::*;
|
2015-12-14 19:11:27 -06:00
|
|
|
|
2019-12-31 11:15:40 -06:00
|
|
|
use rustc_span::source_map::SourceMap;
|
2022-06-13 06:22:26 -05:00
|
|
|
use rustc_span::{FileLines, SourceFile, Span};
|
2015-12-14 19:11:27 -06:00
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
use crate::snippet::{Annotation, AnnotationType, Line, MultilineAnnotation, Style, StyledString};
|
|
|
|
use crate::styled_buffer::StyledBuffer;
|
2021-06-21 21:07:19 -05:00
|
|
|
use crate::{
|
2022-03-26 02:27:43 -05:00
|
|
|
CodeSuggestion, Diagnostic, DiagnosticArg, DiagnosticId, DiagnosticMessage, FluentBundle,
|
2022-04-12 03:34:40 -05:00
|
|
|
Handler, LazyFallbackBundle, Level, MultiSpan, SubDiagnostic, SubstitutionHighlight,
|
|
|
|
SuggestionStyle,
|
2021-06-21 21:07:19 -05:00
|
|
|
};
|
2020-08-13 14:41:52 -05:00
|
|
|
|
|
|
|
use rustc_lint_defs::pluralize;
|
2015-12-14 19:11:27 -06:00
|
|
|
|
2018-08-18 05:55:43 -05:00
|
|
|
use rustc_data_structures::fx::FxHashMap;
|
2018-02-27 10:11:14 -06:00
|
|
|
use rustc_data_structures::sync::Lrc;
|
2022-03-26 02:27:43 -05:00
|
|
|
use rustc_error_messages::FluentArgs;
|
2020-01-20 17:27:14 -06:00
|
|
|
use rustc_span::hygiene::{ExpnKind, MacroKind};
|
2017-06-11 06:31:40 -05:00
|
|
|
use std::borrow::Cow;
|
2019-12-24 16:38:22 -06:00
|
|
|
use std::cmp::{max, min, Reverse};
|
2015-12-14 19:11:27 -06:00
|
|
|
use std::io;
|
2019-12-24 16:38:22 -06:00
|
|
|
use std::io::prelude::*;
|
2019-12-16 07:56:47 -06:00
|
|
|
use std::iter;
|
2019-05-01 21:06:33 -05:00
|
|
|
use std::path::Path;
|
2019-12-24 16:38:22 -06:00
|
|
|
use termcolor::{Ansi, BufferWriter, ColorChoice, ColorSpec, StandardStream};
|
|
|
|
use termcolor::{Buffer, Color, WriteColor};
|
2020-08-14 01:05:01 -05:00
|
|
|
use tracing::*;
|
2015-12-14 19:11:27 -06:00
|
|
|
|
2020-06-25 05:56:15 -05:00
|
|
|
/// Default column width, used in tests and when terminal dimensions cannot be determined.
|
|
|
|
const DEFAULT_COLUMN_WIDTH: usize = 140;
|
|
|
|
|
2019-03-25 05:16:58 -05:00
|
|
|
/// Describes the way the content of the `rendered` field of the json output is generated
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
|
|
pub enum HumanReadableErrorType {
|
|
|
|
Default(ColorConfig),
|
2019-06-05 14:13:56 -05:00
|
|
|
AnnotateSnippet(ColorConfig),
|
2019-03-25 05:16:58 -05:00
|
|
|
Short(ColorConfig),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl HumanReadableErrorType {
|
|
|
|
/// Returns a (`short`, `color`) tuple
|
|
|
|
pub fn unzip(self) -> (bool, ColorConfig) {
|
|
|
|
match self {
|
|
|
|
HumanReadableErrorType::Default(cc) => (false, cc),
|
|
|
|
HumanReadableErrorType::Short(cc) => (true, cc),
|
2019-06-05 14:13:56 -05:00
|
|
|
HumanReadableErrorType::AnnotateSnippet(cc) => (false, cc),
|
2019-03-25 05:16:58 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
pub fn new_emitter(
|
|
|
|
self,
|
|
|
|
dst: Box<dyn Write + Send>,
|
2019-11-15 07:32:31 -06:00
|
|
|
source_map: Option<Lrc<SourceMap>>,
|
2022-03-28 03:36:20 -05:00
|
|
|
bundle: Option<Lrc<FluentBundle>>,
|
2022-04-12 03:34:40 -05:00
|
|
|
fallback_bundle: LazyFallbackBundle,
|
2019-03-25 05:16:58 -05:00
|
|
|
teach: bool,
|
2022-07-06 05:57:41 -05:00
|
|
|
diagnostic_width: Option<usize>,
|
2019-12-15 09:12:30 -06:00
|
|
|
macro_backtrace: bool,
|
2019-03-25 05:16:58 -05:00
|
|
|
) -> EmitterWriter {
|
|
|
|
let (short, color_config) = self.unzip();
|
2019-08-14 19:57:28 -05:00
|
|
|
let color = color_config.suggests_using_colors();
|
2022-03-26 02:27:43 -05:00
|
|
|
EmitterWriter::new(
|
|
|
|
dst,
|
|
|
|
source_map,
|
2022-03-28 03:36:20 -05:00
|
|
|
bundle,
|
2022-03-26 02:27:43 -05:00
|
|
|
fallback_bundle,
|
|
|
|
short,
|
|
|
|
teach,
|
|
|
|
color,
|
2022-07-06 05:57:41 -05:00
|
|
|
diagnostic_width,
|
2022-03-26 02:27:43 -05:00
|
|
|
macro_backtrace,
|
|
|
|
)
|
2019-03-25 05:16:58 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-13 21:09:28 -05:00
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
|
|
struct Margin {
|
2019-08-14 11:34:09 -05:00
|
|
|
/// The available whitespace in the left that can be consumed when centering.
|
2019-08-13 21:09:28 -05:00
|
|
|
pub whitespace_left: usize,
|
2019-08-14 11:34:09 -05:00
|
|
|
/// The column of the beginning of left-most span.
|
2019-08-13 21:09:28 -05:00
|
|
|
pub span_left: usize,
|
2019-08-14 11:34:09 -05:00
|
|
|
/// The column of the end of right-most span.
|
2019-08-13 21:09:28 -05:00
|
|
|
pub span_right: usize,
|
2019-08-14 11:34:09 -05:00
|
|
|
/// The beginning of the line to be displayed.
|
2019-08-13 21:09:28 -05:00
|
|
|
pub computed_left: usize,
|
2019-08-14 11:34:09 -05:00
|
|
|
/// The end of the line to be displayed.
|
2019-08-13 21:09:28 -05:00
|
|
|
pub computed_right: usize,
|
2020-06-25 05:56:15 -05:00
|
|
|
/// The current width of the terminal. Uses value of `DEFAULT_COLUMN_WIDTH` constant by default
|
|
|
|
/// and in tests.
|
2019-08-13 21:09:28 -05:00
|
|
|
pub column_width: usize,
|
2019-08-14 11:34:09 -05:00
|
|
|
/// The end column of a span label, including the span. Doesn't account for labels not in the
|
|
|
|
/// same line as the span.
|
2019-08-13 21:09:28 -05:00
|
|
|
pub label_right: usize,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Margin {
|
|
|
|
fn new(
|
|
|
|
whitespace_left: usize,
|
|
|
|
span_left: usize,
|
|
|
|
span_right: usize,
|
|
|
|
label_right: usize,
|
2019-08-14 11:34:09 -05:00
|
|
|
column_width: usize,
|
|
|
|
max_line_len: usize,
|
2019-08-13 21:09:28 -05:00
|
|
|
) -> Self {
|
2019-08-14 11:34:09 -05:00
|
|
|
// The 6 is padding to give a bit of room for `...` when displaying:
|
|
|
|
// ```
|
|
|
|
// error: message
|
|
|
|
// --> file.rs:16:58
|
|
|
|
// |
|
|
|
|
// 16 | ... fn foo(self) -> Self::Bar {
|
|
|
|
// | ^^^^^^^^^
|
|
|
|
// ```
|
|
|
|
|
|
|
|
let mut m = Margin {
|
2019-09-25 14:55:04 -05:00
|
|
|
whitespace_left: whitespace_left.saturating_sub(6),
|
|
|
|
span_left: span_left.saturating_sub(6),
|
2019-08-14 11:34:09 -05:00
|
|
|
span_right: span_right + 6,
|
2019-08-13 21:09:28 -05:00
|
|
|
computed_left: 0,
|
|
|
|
computed_right: 0,
|
2019-08-14 11:34:09 -05:00
|
|
|
column_width,
|
|
|
|
label_right: label_right + 6,
|
|
|
|
};
|
|
|
|
m.compute(max_line_len);
|
|
|
|
m
|
2019-08-13 21:09:28 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn was_cut_left(&self) -> bool {
|
|
|
|
self.computed_left > 0
|
|
|
|
}
|
|
|
|
|
2019-08-14 11:34:09 -05:00
|
|
|
fn was_cut_right(&self, line_len: usize) -> bool {
|
2019-12-24 16:38:22 -06:00
|
|
|
let right =
|
|
|
|
if self.computed_right == self.span_right || self.computed_right == self.label_right {
|
|
|
|
// Account for the "..." padding given above. Otherwise we end up with code lines that
|
|
|
|
// do fit but end in "..." as if they were trimmed.
|
|
|
|
self.computed_right - 6
|
|
|
|
} else {
|
|
|
|
self.computed_right
|
|
|
|
};
|
2019-09-25 15:46:33 -05:00
|
|
|
right < line_len && self.computed_left + self.column_width < line_len
|
2019-08-13 21:09:28 -05:00
|
|
|
}
|
|
|
|
|
2019-08-14 11:34:09 -05:00
|
|
|
fn compute(&mut self, max_line_len: usize) {
|
|
|
|
// When there's a lot of whitespace (>20), we want to trim it as it is useless.
|
2019-08-13 21:09:28 -05:00
|
|
|
self.computed_left = if self.whitespace_left > 20 {
|
|
|
|
self.whitespace_left - 16 // We want some padding.
|
|
|
|
} else {
|
|
|
|
0
|
|
|
|
};
|
2019-08-14 11:34:09 -05:00
|
|
|
// We want to show as much as possible, max_line_len is the right-most boundary for the
|
|
|
|
// relevant code.
|
|
|
|
self.computed_right = max(max_line_len, self.computed_left);
|
2019-08-13 21:09:28 -05:00
|
|
|
|
|
|
|
if self.computed_right - self.computed_left > self.column_width {
|
|
|
|
// Trimming only whitespace isn't enough, let's get craftier.
|
|
|
|
if self.label_right - self.whitespace_left <= self.column_width {
|
2019-08-14 11:34:09 -05:00
|
|
|
// Attempt to fit the code window only trimming whitespace.
|
2019-08-13 21:09:28 -05:00
|
|
|
self.computed_left = self.whitespace_left;
|
|
|
|
self.computed_right = self.computed_left + self.column_width;
|
|
|
|
} else if self.label_right - self.span_left <= self.column_width {
|
2019-08-14 11:34:09 -05:00
|
|
|
// Attempt to fit the code window considering only the spans and labels.
|
2019-08-14 16:09:37 -05:00
|
|
|
let padding_left = (self.column_width - (self.label_right - self.span_left)) / 2;
|
2019-08-31 15:42:53 -05:00
|
|
|
self.computed_left = self.span_left.saturating_sub(padding_left);
|
2019-08-13 21:09:28 -05:00
|
|
|
self.computed_right = self.computed_left + self.column_width;
|
|
|
|
} else if self.span_right - self.span_left <= self.column_width {
|
2019-08-14 11:34:09 -05:00
|
|
|
// Attempt to fit the code window considering the spans and labels plus padding.
|
2019-08-14 19:06:09 -05:00
|
|
|
let padding_left = (self.column_width - (self.span_right - self.span_left)) / 5 * 2;
|
2019-08-31 15:42:53 -05:00
|
|
|
self.computed_left = self.span_left.saturating_sub(padding_left);
|
2019-08-13 21:09:28 -05:00
|
|
|
self.computed_right = self.computed_left + self.column_width;
|
2019-12-24 16:38:22 -06:00
|
|
|
} else {
|
|
|
|
// Mostly give up but still don't show the full line.
|
2019-08-13 21:09:28 -05:00
|
|
|
self.computed_left = self.span_left;
|
|
|
|
self.computed_right = self.span_right;
|
|
|
|
}
|
|
|
|
}
|
2019-08-14 11:34:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn left(&self, line_len: usize) -> usize {
|
|
|
|
min(self.computed_left, line_len)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn right(&self, line_len: usize) -> usize {
|
2019-09-25 14:55:04 -05:00
|
|
|
if line_len.saturating_sub(self.computed_left) <= self.column_width {
|
2019-08-14 11:34:09 -05:00
|
|
|
line_len
|
|
|
|
} else {
|
2019-09-25 15:08:09 -05:00
|
|
|
min(line_len, self.computed_right)
|
2019-08-13 21:09:28 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-22 18:18:53 -06:00
|
|
|
const ANONYMIZED_LINE_NUM: &str = "LL";
|
|
|
|
|
2016-07-07 13:57:09 -05:00
|
|
|
/// Emitter trait for emitting errors.
|
2015-12-14 19:11:27 -06:00
|
|
|
pub trait Emitter {
|
2015-12-23 15:54:37 -06:00
|
|
|
/// Emit a structured diagnostic.
|
2019-10-15 01:12:55 -05:00
|
|
|
fn emit_diagnostic(&mut self, diag: &Diagnostic);
|
2019-04-14 17:26:08 -05:00
|
|
|
|
2019-05-01 21:06:33 -05:00
|
|
|
/// Emit a notification that an artifact has been output.
|
|
|
|
/// This is currently only supported for the JSON format,
|
|
|
|
/// other formats can, and will, simply ignore it.
|
2019-05-21 14:38:46 -05:00
|
|
|
fn emit_artifact_notification(&mut self, _path: &Path, _artifact_type: &str) {}
|
2018-02-28 09:17:44 -06:00
|
|
|
|
2021-07-11 15:08:58 -05:00
|
|
|
fn emit_future_breakage_report(&mut self, _diags: Vec<Diagnostic>) {}
|
2020-08-13 14:41:52 -05:00
|
|
|
|
2020-06-30 11:58:15 -05:00
|
|
|
/// Emit list of unused externs
|
2022-04-15 03:24:49 -05:00
|
|
|
fn emit_unused_externs(
|
|
|
|
&mut self,
|
|
|
|
_lint_level: rustc_lint_defs::Level,
|
|
|
|
_unused_externs: &[&str],
|
|
|
|
) {
|
|
|
|
}
|
2020-06-30 11:58:15 -05:00
|
|
|
|
2019-02-08 07:53:55 -06:00
|
|
|
/// Checks if should show explanations about "rustc --explain"
|
2018-02-28 09:17:44 -06:00
|
|
|
fn should_show_explain(&self) -> bool {
|
|
|
|
true
|
|
|
|
}
|
2015-12-14 19:11:27 -06:00
|
|
|
|
2020-11-11 09:44:02 -06:00
|
|
|
/// Checks if we can use colors in the current output stream.
|
|
|
|
fn supports_color(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
2019-11-15 07:32:31 -06:00
|
|
|
fn source_map(&self) -> Option<&Lrc<SourceMap>>;
|
2019-10-13 23:48:39 -05:00
|
|
|
|
2022-03-26 02:27:43 -05:00
|
|
|
/// Return `FluentBundle` with localized diagnostics for the locale requested by the user. If no
|
|
|
|
/// language was requested by the user then this will be `None` and `fallback_fluent_bundle`
|
|
|
|
/// should be used.
|
|
|
|
fn fluent_bundle(&self) -> Option<&Lrc<FluentBundle>>;
|
|
|
|
|
|
|
|
/// Return `FluentBundle` with localized diagnostics for the default locale of the compiler.
|
|
|
|
/// Used when the user has not requested a specific language or when a localized diagnostic is
|
|
|
|
/// unavailable for the requested locale.
|
2022-04-12 03:34:40 -05:00
|
|
|
fn fallback_fluent_bundle(&self) -> &FluentBundle;
|
2022-03-26 02:27:43 -05:00
|
|
|
|
|
|
|
/// Convert diagnostic arguments (a rustc internal type that exists to implement
|
|
|
|
/// `Encodable`/`Decodable`) into `FluentArgs` which is necessary to perform translation.
|
|
|
|
///
|
|
|
|
/// Typically performed once for each diagnostic at the start of `emit_diagnostic` and then
|
|
|
|
/// passed around as a reference thereafter.
|
|
|
|
fn to_fluent_args<'arg>(&self, args: &[DiagnosticArg<'arg>]) -> FluentArgs<'arg> {
|
|
|
|
FromIterator::from_iter(args.to_vec().drain(..))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Convert `DiagnosticMessage`s to a string, performing translation if necessary.
|
|
|
|
fn translate_messages(
|
|
|
|
&self,
|
|
|
|
messages: &[(DiagnosticMessage, Style)],
|
|
|
|
args: &FluentArgs<'_>,
|
|
|
|
) -> Cow<'_, str> {
|
|
|
|
Cow::Owned(
|
|
|
|
messages.iter().map(|(m, _)| self.translate_message(m, args)).collect::<String>(),
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Convert a `DiagnosticMessage` to a string, performing translation if necessary.
|
|
|
|
fn translate_message<'a>(
|
|
|
|
&'a self,
|
|
|
|
message: &'a DiagnosticMessage,
|
|
|
|
args: &'a FluentArgs<'_>,
|
|
|
|
) -> Cow<'_, str> {
|
2022-03-31 02:35:17 -05:00
|
|
|
trace!(?message, ?args);
|
2022-03-26 02:27:43 -05:00
|
|
|
let (identifier, attr) = match message {
|
|
|
|
DiagnosticMessage::Str(msg) => return Cow::Borrowed(&msg),
|
|
|
|
DiagnosticMessage::FluentIdentifier(identifier, attr) => (identifier, attr),
|
|
|
|
};
|
|
|
|
|
|
|
|
let bundle = match self.fluent_bundle() {
|
|
|
|
Some(bundle) if bundle.has_message(&identifier) => bundle,
|
|
|
|
_ => self.fallback_fluent_bundle(),
|
|
|
|
};
|
|
|
|
|
|
|
|
let message = bundle.get_message(&identifier).expect("missing diagnostic in fluent bundle");
|
|
|
|
let value = match attr {
|
|
|
|
Some(attr) => {
|
2022-06-22 23:43:01 -05:00
|
|
|
if let Some(attr) = message.get_attribute(attr) {
|
|
|
|
attr.value()
|
|
|
|
} else {
|
|
|
|
panic!("missing attribute `{attr}` in fluent message `{identifier}`")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
if let Some(value) = message.value() {
|
|
|
|
value
|
|
|
|
} else {
|
|
|
|
panic!("missing value in fluent message `{identifier}`")
|
|
|
|
}
|
2022-03-26 02:27:43 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut err = vec![];
|
|
|
|
let translated = bundle.format_pattern(value, Some(&args), &mut err);
|
|
|
|
trace!(?translated, ?err);
|
2022-03-31 02:35:17 -05:00
|
|
|
debug_assert!(
|
|
|
|
err.is_empty(),
|
|
|
|
"identifier: {:?}, args: {:?}, errors: {:?}",
|
|
|
|
identifier,
|
|
|
|
args,
|
|
|
|
err
|
|
|
|
);
|
2022-03-26 02:27:43 -05:00
|
|
|
translated
|
|
|
|
}
|
|
|
|
|
2019-09-01 05:15:33 -05:00
|
|
|
/// Formats the substitutions of the primary_span
|
|
|
|
///
|
2021-11-26 05:51:09 -06:00
|
|
|
/// There are a lot of conditions to this method, but in short:
|
2019-09-01 05:15:33 -05:00
|
|
|
///
|
|
|
|
/// * If the current `Diagnostic` has only one visible `CodeSuggestion`,
|
|
|
|
/// we format the `help` suggestion depending on the content of the
|
|
|
|
/// substitutions. In that case, we return the modified span only.
|
|
|
|
///
|
|
|
|
/// * If the current `Diagnostic` has multiple suggestions,
|
|
|
|
/// we return the original `primary_span` and the original suggestions.
|
|
|
|
fn primary_span_formatted<'a>(
|
|
|
|
&mut self,
|
2019-10-15 01:12:55 -05:00
|
|
|
diag: &'a Diagnostic,
|
2022-03-26 02:27:43 -05:00
|
|
|
fluent_args: &FluentArgs<'_>,
|
2019-09-01 05:15:33 -05:00
|
|
|
) -> (MultiSpan, &'a [CodeSuggestion]) {
|
2019-10-15 01:12:55 -05:00
|
|
|
let mut primary_span = diag.span.clone();
|
2022-01-24 03:19:33 -06:00
|
|
|
let suggestions = diag.suggestions.as_ref().map_or(&[][..], |suggestions| &suggestions[..]);
|
|
|
|
if let Some((sugg, rest)) = suggestions.split_first() {
|
2022-03-26 02:27:43 -05:00
|
|
|
let msg = self.translate_message(&sugg.msg, fluent_args);
|
2017-05-11 08:26:22 -05:00
|
|
|
if rest.is_empty() &&
|
2019-09-01 05:15:33 -05:00
|
|
|
// ^ if there is only one suggestion
|
2017-05-09 03:04:24 -05:00
|
|
|
// don't display multi-suggestions as labels
|
2017-11-03 10:17:33 -05:00
|
|
|
sugg.substitutions.len() == 1 &&
|
|
|
|
// don't display multipart suggestions as labels
|
|
|
|
sugg.substitutions[0].parts.len() == 1 &&
|
2017-03-28 07:10:16 -05:00
|
|
|
// don't display long messages as labels
|
2022-03-26 02:27:43 -05:00
|
|
|
msg.split_whitespace().count() < 10 &&
|
2017-03-28 07:10:16 -05:00
|
|
|
// don't display multiline suggestions as labels
|
2019-02-08 05:02:42 -06:00
|
|
|
!sugg.substitutions[0].parts[0].snippet.contains('\n') &&
|
2019-10-03 21:32:56 -05:00
|
|
|
![
|
|
|
|
// when this style is set we want the suggestion to be a message, not inline
|
|
|
|
SuggestionStyle::HideCodeAlways,
|
|
|
|
// trivial suggestion for tooling's sake, never shown
|
|
|
|
SuggestionStyle::CompletelyHidden,
|
|
|
|
// subtle suggestion, never shown inline
|
|
|
|
SuggestionStyle::ShowAlways,
|
|
|
|
].contains(&sugg.style)
|
2019-02-08 05:02:42 -06:00
|
|
|
{
|
2017-12-09 15:04:27 -06:00
|
|
|
let substitution = &sugg.substitutions[0].parts[0].snippet.trim();
|
2020-02-28 07:20:33 -06:00
|
|
|
let msg = if substitution.is_empty() || sugg.style.hide_inline() {
|
2019-09-01 05:15:33 -05:00
|
|
|
// This substitution is only removal OR we explicitly don't want to show the
|
|
|
|
// code inline (`hide_inline`). Therefore, we don't show the substitution.
|
2022-03-26 02:27:43 -05:00
|
|
|
format!("help: {}", &msg)
|
2017-06-24 03:09:57 -05:00
|
|
|
} else {
|
2019-09-01 05:15:33 -05:00
|
|
|
// Show the default suggestion text with the substitution
|
2019-10-13 23:48:39 -05:00
|
|
|
format!(
|
|
|
|
"help: {}{}: `{}`",
|
2022-03-26 02:27:43 -05:00
|
|
|
&msg,
|
2019-12-24 16:38:22 -06:00
|
|
|
if self
|
|
|
|
.source_map()
|
|
|
|
.map(|sm| is_case_difference(
|
|
|
|
&**sm,
|
|
|
|
substitution,
|
|
|
|
sugg.substitutions[0].parts[0].span,
|
|
|
|
))
|
|
|
|
.unwrap_or(false)
|
|
|
|
{
|
2019-10-13 23:48:39 -05:00
|
|
|
" (notice the capitalization)"
|
|
|
|
} else {
|
|
|
|
""
|
|
|
|
},
|
|
|
|
substitution,
|
|
|
|
)
|
2017-06-24 03:09:57 -05:00
|
|
|
};
|
2017-11-03 10:17:33 -05:00
|
|
|
primary_span.push_span_label(sugg.substitutions[0].parts[0].span, msg);
|
2019-09-01 05:15:33 -05:00
|
|
|
|
|
|
|
// We return only the modified primary_span
|
|
|
|
(primary_span, &[])
|
2017-03-24 11:31:41 -05:00
|
|
|
} else {
|
2017-05-11 08:26:22 -05:00
|
|
|
// if there are multiple suggestions, print them all in full
|
|
|
|
// to be consistent. We could try to figure out if we can
|
|
|
|
// make one (or the first one) inline, but that would give
|
|
|
|
// undue importance to a semi-random suggestion
|
2022-01-24 03:19:33 -06:00
|
|
|
(primary_span, suggestions)
|
2017-03-24 11:31:41 -05:00
|
|
|
}
|
2019-09-01 05:15:33 -05:00
|
|
|
} else {
|
2022-01-24 03:19:33 -06:00
|
|
|
(primary_span, suggestions)
|
2017-03-24 11:31:41 -05:00
|
|
|
}
|
2019-09-01 05:15:33 -05:00
|
|
|
}
|
2019-09-05 14:31:12 -05:00
|
|
|
|
2019-12-15 09:47:51 -06:00
|
|
|
fn fix_multispans_in_extern_macros_and_render_macro_backtrace(
|
2019-12-24 16:38:22 -06:00
|
|
|
&self,
|
|
|
|
source_map: &Option<Lrc<SourceMap>>,
|
|
|
|
span: &mut MultiSpan,
|
|
|
|
children: &mut Vec<SubDiagnostic>,
|
|
|
|
level: &Level,
|
|
|
|
backtrace: bool,
|
|
|
|
) {
|
2019-12-16 07:56:47 -06:00
|
|
|
// Check for spans in macros, before `fix_multispans_in_extern_macros`
|
|
|
|
// has a chance to replace them.
|
2022-06-20 21:25:52 -05:00
|
|
|
let has_macro_spans: Vec<_> = iter::once(&*span)
|
2019-12-16 07:56:47 -06:00
|
|
|
.chain(children.iter().map(|child| &child.span))
|
|
|
|
.flat_map(|span| span.primary_spans())
|
2020-04-24 22:03:45 -05:00
|
|
|
.flat_map(|sp| sp.macro_backtrace())
|
2022-06-20 21:25:52 -05:00
|
|
|
.filter_map(|expn_data| {
|
2020-04-24 22:03:45 -05:00
|
|
|
match expn_data.kind {
|
|
|
|
ExpnKind::Root => None,
|
2019-12-16 07:56:47 -06:00
|
|
|
|
2020-04-24 22:03:45 -05:00
|
|
|
// Skip past non-macro entries, just in case there
|
|
|
|
// are some which do actually involve macros.
|
2020-09-19 11:56:32 -05:00
|
|
|
ExpnKind::Inlined | ExpnKind::Desugaring(..) | ExpnKind::AstPass(..) => None,
|
2019-12-16 07:56:47 -06:00
|
|
|
|
2021-07-10 14:14:52 -05:00
|
|
|
ExpnKind::Macro(macro_kind, name) => Some((macro_kind, name)),
|
2020-04-24 22:03:45 -05:00
|
|
|
}
|
2022-06-20 21:25:52 -05:00
|
|
|
})
|
|
|
|
.collect();
|
2019-12-16 07:56:47 -06:00
|
|
|
|
2019-12-15 09:47:51 -06:00
|
|
|
if !backtrace {
|
2019-12-16 07:56:47 -06:00
|
|
|
self.fix_multispans_in_extern_macros(source_map, span, children);
|
2019-12-15 09:47:51 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
self.render_multispans_macro_backtrace(span, children, backtrace);
|
2019-12-13 15:21:14 -06:00
|
|
|
|
|
|
|
if !backtrace {
|
2022-06-20 21:25:52 -05:00
|
|
|
if let Some((macro_kind, name)) = has_macro_spans.first() {
|
|
|
|
// Mark the actual macro this originates from
|
|
|
|
let and_then = if let Some((macro_kind, last_name)) = has_macro_spans.last()
|
|
|
|
&& last_name != name
|
|
|
|
{
|
|
|
|
let descr = macro_kind.descr();
|
|
|
|
format!(
|
|
|
|
" which comes from the expansion of the {descr} `{last_name}`",
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
"".to_string()
|
|
|
|
};
|
2021-02-13 13:52:25 -06:00
|
|
|
|
2022-06-20 21:25:52 -05:00
|
|
|
let descr = macro_kind.descr();
|
2020-01-15 09:50:26 -06:00
|
|
|
let msg = format!(
|
2022-06-20 21:25:52 -05:00
|
|
|
"this {level} originates in the {descr} `{name}`{and_then} \
|
2020-01-15 09:50:26 -06:00
|
|
|
(in Nightly builds, run with -Z macro-backtrace for more info)",
|
|
|
|
);
|
2019-12-13 15:21:14 -06:00
|
|
|
|
|
|
|
children.push(SubDiagnostic {
|
|
|
|
level: Level::Note,
|
2022-03-23 02:34:20 -05:00
|
|
|
message: vec![(DiagnosticMessage::Str(msg), Style::NoStyle)],
|
2019-12-13 15:21:14 -06:00
|
|
|
span: MultiSpan::new(),
|
|
|
|
render_span: None,
|
|
|
|
});
|
|
|
|
}
|
2019-09-05 14:31:12 -05:00
|
|
|
}
|
2019-12-13 15:21:14 -06:00
|
|
|
}
|
2019-09-05 14:31:12 -05:00
|
|
|
|
2019-12-13 15:21:14 -06:00
|
|
|
fn render_multispans_macro_backtrace(
|
|
|
|
&self,
|
|
|
|
span: &mut MultiSpan,
|
|
|
|
children: &mut Vec<SubDiagnostic>,
|
|
|
|
backtrace: bool,
|
|
|
|
) {
|
2019-12-16 07:56:47 -06:00
|
|
|
for span in iter::once(span).chain(children.iter_mut().map(|child| &mut child.span)) {
|
|
|
|
self.render_multispan_macro_backtrace(span, backtrace);
|
2019-09-05 14:31:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-15 09:47:51 -06:00
|
|
|
fn render_multispan_macro_backtrace(&self, span: &mut MultiSpan, always_backtrace: bool) {
|
2019-09-25 16:31:16 -05:00
|
|
|
let mut new_labels: Vec<(Span, String)> = vec![];
|
2019-09-05 14:31:12 -05:00
|
|
|
|
2019-12-13 15:21:14 -06:00
|
|
|
for &sp in span.primary_spans() {
|
2019-09-25 16:31:16 -05:00
|
|
|
if sp.is_dummy() {
|
|
|
|
continue;
|
|
|
|
}
|
2019-12-15 09:47:51 -06:00
|
|
|
|
|
|
|
// FIXME(eddyb) use `retain` on `macro_backtrace` to remove all the
|
|
|
|
// entries we don't want to print, to make sure the indices being
|
|
|
|
// printed are contiguous (or omitted if there's only one entry).
|
2020-01-20 17:46:53 -06:00
|
|
|
let macro_backtrace: Vec<_> = sp.macro_backtrace().collect();
|
|
|
|
for (i, trace) in macro_backtrace.iter().rev().enumerate() {
|
2020-01-20 17:27:14 -06:00
|
|
|
if trace.def_site.is_dummy() {
|
2019-09-05 14:31:12 -05:00
|
|
|
continue;
|
|
|
|
}
|
2019-12-15 09:47:51 -06:00
|
|
|
|
2021-07-17 13:13:50 -05:00
|
|
|
if always_backtrace && !matches!(trace.kind, ExpnKind::Inlined) {
|
2019-12-24 16:38:22 -06:00
|
|
|
new_labels.push((
|
2020-01-20 17:27:14 -06:00
|
|
|
trace.def_site,
|
2019-12-24 16:38:22 -06:00
|
|
|
format!(
|
2021-07-10 14:14:52 -05:00
|
|
|
"in this expansion of `{}`{}",
|
2020-01-20 17:27:14 -06:00
|
|
|
trace.kind.descr(),
|
2020-08-05 10:02:25 -05:00
|
|
|
if macro_backtrace.len() > 1 {
|
2019-12-13 15:21:14 -06:00
|
|
|
// if macro_backtrace.len() == 1 it'll be
|
|
|
|
// pointed at by "in this macro invocation"
|
2019-12-24 16:38:22 -06:00
|
|
|
format!(" (#{})", i + 1)
|
|
|
|
} else {
|
|
|
|
String::new()
|
2019-12-13 15:21:14 -06:00
|
|
|
},
|
2019-12-24 16:38:22 -06:00
|
|
|
),
|
|
|
|
));
|
2019-09-05 14:31:12 -05:00
|
|
|
}
|
2019-12-15 09:47:51 -06:00
|
|
|
|
|
|
|
// Don't add a label on the call site if the diagnostic itself
|
|
|
|
// already points to (a part of) that call site, as the label
|
|
|
|
// is meant for showing the relevant invocation when the actual
|
|
|
|
// diagnostic is pointing to some part of macro definition.
|
|
|
|
//
|
|
|
|
// This also handles the case where an external span got replaced
|
|
|
|
// with the call site span by `fix_multispans_in_extern_macros`.
|
|
|
|
//
|
|
|
|
// NB: `-Zmacro-backtrace` overrides this, for uniformity, as the
|
|
|
|
// "in this expansion of" label above is always added in that mode,
|
|
|
|
// and it needs an "in this macro invocation" label to match that.
|
|
|
|
let redundant_span = trace.call_site.contains(sp);
|
|
|
|
|
2021-07-17 13:13:50 -05:00
|
|
|
if !redundant_span || always_backtrace {
|
|
|
|
let msg: Cow<'static, _> = match trace.kind {
|
|
|
|
ExpnKind::Macro(MacroKind::Attr, _) => {
|
|
|
|
"this procedural macro expansion".into()
|
|
|
|
}
|
|
|
|
ExpnKind::Macro(MacroKind::Derive, _) => {
|
|
|
|
"this derive macro expansion".into()
|
|
|
|
}
|
|
|
|
ExpnKind::Macro(MacroKind::Bang, _) => "this macro invocation".into(),
|
2022-02-27 09:09:52 -06:00
|
|
|
ExpnKind::Inlined => "this inlined function call".into(),
|
|
|
|
ExpnKind::Root => "the crate root".into(),
|
2021-07-17 13:13:50 -05:00
|
|
|
ExpnKind::AstPass(kind) => kind.descr().into(),
|
|
|
|
ExpnKind::Desugaring(kind) => {
|
|
|
|
format!("this {} desugaring", kind.descr()).into()
|
|
|
|
}
|
|
|
|
};
|
2019-12-24 16:38:22 -06:00
|
|
|
new_labels.push((
|
|
|
|
trace.call_site,
|
|
|
|
format!(
|
2021-07-17 13:13:50 -05:00
|
|
|
"in {}{}",
|
|
|
|
msg,
|
2020-08-05 10:02:25 -05:00
|
|
|
if macro_backtrace.len() > 1 && always_backtrace {
|
2019-12-24 16:38:22 -06:00
|
|
|
// only specify order when the macro
|
|
|
|
// backtrace is multiple levels deep
|
|
|
|
format!(" (#{})", i + 1)
|
|
|
|
} else {
|
|
|
|
String::new()
|
2019-12-13 15:21:14 -06:00
|
|
|
},
|
2019-12-24 16:38:22 -06:00
|
|
|
),
|
|
|
|
));
|
2019-12-15 09:47:51 -06:00
|
|
|
}
|
|
|
|
if !always_backtrace {
|
|
|
|
break;
|
2019-09-05 14:31:12 -05:00
|
|
|
}
|
|
|
|
}
|
2019-09-25 16:31:16 -05:00
|
|
|
}
|
2019-12-16 07:56:47 -06:00
|
|
|
|
2019-09-25 16:31:16 -05:00
|
|
|
for (label_span, label_text) in new_labels {
|
|
|
|
span.push_span_label(label_span, label_text);
|
|
|
|
}
|
2019-12-13 15:21:14 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// This does a small "fix" for multispans by looking to see if it can find any that
|
2019-11-13 06:01:43 -06:00
|
|
|
// point directly at external macros. Since these are often difficult to read,
|
|
|
|
// this will change the span to point at the use site.
|
2019-12-13 15:21:14 -06:00
|
|
|
fn fix_multispans_in_extern_macros(
|
|
|
|
&self,
|
|
|
|
source_map: &Option<Lrc<SourceMap>>,
|
|
|
|
span: &mut MultiSpan,
|
|
|
|
children: &mut Vec<SubDiagnostic>,
|
2019-12-16 07:56:47 -06:00
|
|
|
) {
|
2021-10-15 20:45:14 -05:00
|
|
|
let Some(source_map) = source_map else { return };
|
2020-03-05 09:31:11 -06:00
|
|
|
debug!("fix_multispans_in_extern_macros: before: span={:?} children={:?}", span, children);
|
2021-03-23 18:09:11 -05:00
|
|
|
self.fix_multispan_in_extern_macros(source_map, span);
|
|
|
|
for child in children.iter_mut() {
|
|
|
|
self.fix_multispan_in_extern_macros(source_map, &mut child.span);
|
2019-09-25 16:31:16 -05:00
|
|
|
}
|
2020-03-05 09:31:11 -06:00
|
|
|
debug!("fix_multispans_in_extern_macros: after: span={:?} children={:?}", span, children);
|
2019-12-13 15:21:14 -06:00
|
|
|
}
|
|
|
|
|
2019-11-13 06:01:43 -06:00
|
|
|
// This "fixes" MultiSpans that contain `Span`s pointing to locations inside of external macros.
|
|
|
|
// Since these locations are often difficult to read,
|
|
|
|
// we move these spans from the external macros to their corresponding use site.
|
2021-03-23 18:09:11 -05:00
|
|
|
fn fix_multispan_in_extern_macros(&self, source_map: &Lrc<SourceMap>, span: &mut MultiSpan) {
|
2019-11-13 06:01:43 -06:00
|
|
|
// First, find all the spans in external macros and point instead at their use site.
|
2019-12-13 15:21:14 -06:00
|
|
|
let replacements: Vec<(Span, Span)> = span
|
|
|
|
.primary_spans()
|
|
|
|
.iter()
|
|
|
|
.copied()
|
|
|
|
.chain(span.span_labels().iter().map(|sp_label| sp_label.span))
|
|
|
|
.filter_map(|sp| {
|
2021-03-23 18:09:11 -05:00
|
|
|
if !sp.is_dummy() && source_map.is_imported(sp) {
|
2019-12-13 15:21:14 -06:00
|
|
|
let maybe_callsite = sp.source_callsite();
|
|
|
|
if sp != maybe_callsite {
|
|
|
|
return Some((sp, maybe_callsite));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
|
2019-11-13 06:01:43 -06:00
|
|
|
// After we have them, make sure we replace these 'bad' def sites with their use sites.
|
2019-12-13 15:21:14 -06:00
|
|
|
for (from, to) in replacements {
|
|
|
|
span.replace(from, to);
|
2019-09-05 14:31:12 -05:00
|
|
|
}
|
|
|
|
}
|
2019-09-01 05:15:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Emitter for EmitterWriter {
|
2019-11-15 07:32:31 -06:00
|
|
|
fn source_map(&self) -> Option<&Lrc<SourceMap>> {
|
2019-10-13 23:48:39 -05:00
|
|
|
self.sm.as_ref()
|
|
|
|
}
|
|
|
|
|
2022-03-26 02:27:43 -05:00
|
|
|
fn fluent_bundle(&self) -> Option<&Lrc<FluentBundle>> {
|
2022-03-28 03:36:20 -05:00
|
|
|
self.fluent_bundle.as_ref()
|
2022-03-26 02:27:43 -05:00
|
|
|
}
|
|
|
|
|
2022-04-12 03:34:40 -05:00
|
|
|
fn fallback_fluent_bundle(&self) -> &FluentBundle {
|
|
|
|
&**self.fallback_bundle
|
2022-03-26 02:27:43 -05:00
|
|
|
}
|
|
|
|
|
2019-10-15 01:12:55 -05:00
|
|
|
fn emit_diagnostic(&mut self, diag: &Diagnostic) {
|
2022-03-26 02:27:43 -05:00
|
|
|
let fluent_args = self.to_fluent_args(diag.args());
|
|
|
|
|
2019-10-15 01:12:55 -05:00
|
|
|
let mut children = diag.children.clone();
|
2022-03-26 02:27:43 -05:00
|
|
|
let (mut primary_span, suggestions) = self.primary_span_formatted(&diag, &fluent_args);
|
2020-03-05 09:31:11 -06:00
|
|
|
debug!("emit_diagnostic: suggestions={:?}", suggestions);
|
2017-03-24 11:31:41 -05:00
|
|
|
|
2019-12-15 09:47:51 -06:00
|
|
|
self.fix_multispans_in_extern_macros_and_render_macro_backtrace(
|
2019-12-24 16:38:22 -06:00
|
|
|
&self.sm,
|
|
|
|
&mut primary_span,
|
|
|
|
&mut children,
|
|
|
|
&diag.level,
|
2019-12-15 09:12:30 -06:00
|
|
|
self.macro_backtrace,
|
2019-12-24 16:38:22 -06:00
|
|
|
);
|
|
|
|
|
|
|
|
self.emit_messages_default(
|
|
|
|
&diag.level,
|
2022-03-26 02:27:43 -05:00
|
|
|
&diag.message,
|
|
|
|
&fluent_args,
|
2019-12-24 16:38:22 -06:00
|
|
|
&diag.code,
|
|
|
|
&primary_span,
|
|
|
|
&children,
|
|
|
|
&suggestions,
|
|
|
|
);
|
2016-04-20 14:52:52 -05:00
|
|
|
}
|
2018-02-28 09:17:44 -06:00
|
|
|
|
|
|
|
fn should_show_explain(&self) -> bool {
|
|
|
|
!self.short_message
|
|
|
|
}
|
2020-11-11 09:44:02 -06:00
|
|
|
|
|
|
|
fn supports_color(&self) -> bool {
|
|
|
|
self.dst.supports_color()
|
|
|
|
}
|
2016-04-20 14:52:52 -05:00
|
|
|
}
|
|
|
|
|
2021-10-02 12:15:45 -05:00
|
|
|
/// An emitter that does nothing when emitting a non-fatal diagnostic.
|
|
|
|
/// Fatal diagnostics are forwarded to `fatal_handler` to avoid silent
|
|
|
|
/// failures of rustc, as witnessed e.g. in issue #89358.
|
|
|
|
pub struct SilentEmitter {
|
|
|
|
pub fatal_handler: Handler,
|
|
|
|
pub fatal_note: Option<String>,
|
|
|
|
}
|
2019-11-03 11:04:01 -06:00
|
|
|
|
|
|
|
impl Emitter for SilentEmitter {
|
2019-12-24 16:38:22 -06:00
|
|
|
fn source_map(&self) -> Option<&Lrc<SourceMap>> {
|
|
|
|
None
|
|
|
|
}
|
2022-03-26 02:27:43 -05:00
|
|
|
|
|
|
|
fn fluent_bundle(&self) -> Option<&Lrc<FluentBundle>> {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
2022-04-12 03:34:40 -05:00
|
|
|
fn fallback_fluent_bundle(&self) -> &FluentBundle {
|
2022-03-26 02:27:43 -05:00
|
|
|
panic!("silent emitter attempted to translate message")
|
|
|
|
}
|
|
|
|
|
2021-10-02 12:15:45 -05:00
|
|
|
fn emit_diagnostic(&mut self, d: &Diagnostic) {
|
|
|
|
if d.level == Level::Fatal {
|
|
|
|
let mut d = d.clone();
|
|
|
|
if let Some(ref note) = self.fatal_note {
|
|
|
|
d.note(note);
|
|
|
|
}
|
2022-03-20 12:26:09 -05:00
|
|
|
self.fatal_handler.emit_diagnostic(&mut d);
|
2021-10-02 12:15:45 -05:00
|
|
|
}
|
|
|
|
}
|
2019-11-03 11:04:01 -06:00
|
|
|
}
|
|
|
|
|
2020-01-24 13:18:45 -06:00
|
|
|
/// Maximum number of suggestions to be shown
|
2017-05-10 06:19:29 -05:00
|
|
|
///
|
|
|
|
/// Arbitrary, but taken from trait import suggestion limit
|
|
|
|
pub const MAX_SUGGESTIONS: usize = 4;
|
2015-12-13 06:12:47 -06:00
|
|
|
|
2015-12-30 21:50:06 -06:00
|
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
2015-12-14 19:11:27 -06:00
|
|
|
pub enum ColorConfig {
|
|
|
|
Auto,
|
|
|
|
Always,
|
|
|
|
Never,
|
|
|
|
}
|
|
|
|
|
2015-12-14 21:42:05 -06:00
|
|
|
impl ColorConfig {
|
2019-03-25 05:16:58 -05:00
|
|
|
fn to_color_choice(self) -> ColorChoice {
|
|
|
|
match self {
|
2018-11-08 09:49:28 -06:00
|
|
|
ColorConfig::Always => {
|
|
|
|
if atty::is(atty::Stream::Stderr) {
|
|
|
|
ColorChoice::Always
|
|
|
|
} else {
|
|
|
|
ColorChoice::AlwaysAnsi
|
|
|
|
}
|
|
|
|
}
|
2018-02-27 12:33:02 -06:00
|
|
|
ColorConfig::Never => ColorChoice::Never,
|
2019-12-24 16:38:22 -06:00
|
|
|
ColorConfig::Auto if atty::is(atty::Stream::Stderr) => ColorChoice::Auto,
|
2018-02-27 12:33:02 -06:00
|
|
|
ColorConfig::Auto => ColorChoice::Never,
|
2015-12-14 21:51:13 -06:00
|
|
|
}
|
2015-12-14 21:42:05 -06:00
|
|
|
}
|
2019-04-09 13:43:54 -05:00
|
|
|
fn suggests_using_colors(self) -> bool {
|
2019-03-25 05:16:58 -05:00
|
|
|
match self {
|
2019-12-24 16:38:22 -06:00
|
|
|
ColorConfig::Always | ColorConfig::Auto => true,
|
2019-03-25 05:16:58 -05:00
|
|
|
ColorConfig::Never => false,
|
|
|
|
}
|
|
|
|
}
|
2015-12-14 21:42:05 -06:00
|
|
|
}
|
|
|
|
|
2019-05-25 14:45:51 -05:00
|
|
|
/// Handles the writing of `HumanReadableErrorType::Default` and `HumanReadableErrorType::Short`
|
2015-12-14 19:11:27 -06:00
|
|
|
pub struct EmitterWriter {
|
|
|
|
dst: Destination,
|
2019-11-15 07:32:31 -06:00
|
|
|
sm: Option<Lrc<SourceMap>>,
|
2022-03-28 03:36:20 -05:00
|
|
|
fluent_bundle: Option<Lrc<FluentBundle>>,
|
2022-04-12 03:34:40 -05:00
|
|
|
fallback_bundle: LazyFallbackBundle,
|
2017-09-16 12:24:08 -05:00
|
|
|
short_message: bool,
|
2018-01-28 20:37:55 -06:00
|
|
|
teach: bool,
|
2018-02-22 18:18:53 -06:00
|
|
|
ui_testing: bool,
|
2022-07-06 05:57:41 -05:00
|
|
|
diagnostic_width: Option<usize>,
|
2019-09-07 08:57:11 -05:00
|
|
|
|
2019-12-15 09:12:30 -06:00
|
|
|
macro_backtrace: bool,
|
2015-12-14 19:11:27 -06:00
|
|
|
}
|
|
|
|
|
2019-05-25 14:45:51 -05:00
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct FileWithAnnotatedLines {
|
2019-05-31 15:01:27 -05:00
|
|
|
pub file: Lrc<SourceFile>,
|
|
|
|
pub lines: Vec<Line>,
|
2016-10-23 19:22:06 -05:00
|
|
|
multiline_depth: usize,
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
|
2015-12-14 19:11:27 -06:00
|
|
|
impl EmitterWriter {
|
2019-08-14 19:57:28 -05:00
|
|
|
pub fn stderr(
|
|
|
|
color_config: ColorConfig,
|
2019-11-15 07:32:31 -06:00
|
|
|
source_map: Option<Lrc<SourceMap>>,
|
2022-03-28 03:36:20 -05:00
|
|
|
fluent_bundle: Option<Lrc<FluentBundle>>,
|
2022-04-12 03:34:40 -05:00
|
|
|
fallback_bundle: LazyFallbackBundle,
|
2019-08-14 19:57:28 -05:00
|
|
|
short_message: bool,
|
|
|
|
teach: bool,
|
2022-07-06 05:57:41 -05:00
|
|
|
diagnostic_width: Option<usize>,
|
2019-12-15 09:12:30 -06:00
|
|
|
macro_backtrace: bool,
|
2019-08-14 19:57:28 -05:00
|
|
|
) -> EmitterWriter {
|
2018-02-27 12:33:02 -06:00
|
|
|
let dst = Destination::from_stderr(color_config);
|
|
|
|
EmitterWriter {
|
|
|
|
dst,
|
2018-10-29 15:26:13 -05:00
|
|
|
sm: source_map,
|
2022-03-28 03:36:20 -05:00
|
|
|
fluent_bundle,
|
2022-03-26 02:27:43 -05:00
|
|
|
fallback_bundle,
|
2018-02-27 12:33:02 -06:00
|
|
|
short_message,
|
|
|
|
teach,
|
|
|
|
ui_testing: false,
|
2022-07-06 05:57:41 -05:00
|
|
|
diagnostic_width,
|
2019-12-15 09:12:30 -06:00
|
|
|
macro_backtrace,
|
2015-12-14 19:11:27 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-12 07:06:43 -05:00
|
|
|
pub fn new(
|
|
|
|
dst: Box<dyn Write + Send>,
|
2019-11-15 07:32:31 -06:00
|
|
|
source_map: Option<Lrc<SourceMap>>,
|
2022-03-28 03:36:20 -05:00
|
|
|
fluent_bundle: Option<Lrc<FluentBundle>>,
|
2022-04-12 03:34:40 -05:00
|
|
|
fallback_bundle: LazyFallbackBundle,
|
2019-03-12 07:06:43 -05:00
|
|
|
short_message: bool,
|
|
|
|
teach: bool,
|
|
|
|
colored: bool,
|
2022-07-06 05:57:41 -05:00
|
|
|
diagnostic_width: Option<usize>,
|
2019-12-15 09:12:30 -06:00
|
|
|
macro_backtrace: bool,
|
2019-03-12 07:06:43 -05:00
|
|
|
) -> EmitterWriter {
|
2016-09-26 17:45:50 -05:00
|
|
|
EmitterWriter {
|
2019-03-12 07:06:43 -05:00
|
|
|
dst: Raw(dst, colored),
|
2018-10-29 15:26:13 -05:00
|
|
|
sm: source_map,
|
2022-03-28 03:36:20 -05:00
|
|
|
fluent_bundle,
|
2022-03-26 02:27:43 -05:00
|
|
|
fallback_bundle,
|
2018-01-28 20:37:55 -06:00
|
|
|
short_message,
|
|
|
|
teach,
|
2018-02-22 18:18:53 -06:00
|
|
|
ui_testing: false,
|
2022-07-06 05:57:41 -05:00
|
|
|
diagnostic_width,
|
2019-12-15 09:12:30 -06:00
|
|
|
macro_backtrace,
|
2016-09-26 17:45:50 -05:00
|
|
|
}
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
|
|
|
|
2018-02-24 17:59:34 -06:00
|
|
|
pub fn ui_testing(mut self, ui_testing: bool) -> Self {
|
|
|
|
self.ui_testing = ui_testing;
|
|
|
|
self
|
2018-02-22 18:18:53 -06:00
|
|
|
}
|
|
|
|
|
2022-06-08 13:23:39 -05:00
|
|
|
fn maybe_anonymized(&self, line_num: usize) -> Cow<'static, str> {
|
|
|
|
if self.ui_testing {
|
|
|
|
Cow::Borrowed(ANONYMIZED_LINE_NUM)
|
|
|
|
} else {
|
|
|
|
Cow::Owned(line_num.to_string())
|
|
|
|
}
|
2018-02-23 15:42:59 -06:00
|
|
|
}
|
|
|
|
|
2019-08-14 11:34:09 -05:00
|
|
|
fn draw_line(
|
|
|
|
&self,
|
|
|
|
buffer: &mut StyledBuffer,
|
|
|
|
source_string: &str,
|
|
|
|
line_index: usize,
|
|
|
|
line_offset: usize,
|
|
|
|
width_offset: usize,
|
|
|
|
code_offset: usize,
|
|
|
|
margin: Margin,
|
|
|
|
) {
|
2020-12-05 18:39:07 -06:00
|
|
|
// Tabs are assumed to have been replaced by spaces in calling code.
|
2021-02-03 11:17:15 -06:00
|
|
|
debug_assert!(!source_string.contains('\t'));
|
2019-08-14 11:34:09 -05:00
|
|
|
let line_len = source_string.len();
|
|
|
|
// Create the source line we will highlight.
|
2019-08-14 16:09:37 -05:00
|
|
|
let left = margin.left(line_len);
|
|
|
|
let right = margin.right(line_len);
|
|
|
|
// On long lines, we strip the source line, accounting for unicode.
|
2019-09-26 16:58:18 -05:00
|
|
|
let mut taken = 0;
|
2019-12-24 16:38:22 -06:00
|
|
|
let code: String = source_string
|
|
|
|
.chars()
|
|
|
|
.skip(left)
|
|
|
|
.take_while(|ch| {
|
|
|
|
// Make sure that the trimming on the right will fall within the terminal width.
|
|
|
|
// FIXME: `unicode_width` sometimes disagrees with terminals on how wide a `char` is.
|
|
|
|
// For now, just accept that sometimes the code line will be longer than desired.
|
|
|
|
let next = unicode_width::UnicodeWidthChar::width(*ch).unwrap_or(1);
|
|
|
|
if taken + next > right - left {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
taken += next;
|
|
|
|
true
|
|
|
|
})
|
|
|
|
.collect();
|
2019-08-14 16:09:37 -05:00
|
|
|
buffer.puts(line_offset, code_offset, &code, Style::Quotation);
|
2019-08-14 13:44:56 -05:00
|
|
|
if margin.was_cut_left() {
|
|
|
|
// We have stripped some code/whitespace from the beginning, make it clear.
|
2019-08-14 11:34:09 -05:00
|
|
|
buffer.puts(line_offset, code_offset, "...", Style::LineNumber);
|
|
|
|
}
|
|
|
|
if margin.was_cut_right(line_len) {
|
|
|
|
// We have stripped some code after the right-most span end, make it clear we did so.
|
2019-08-14 19:06:09 -05:00
|
|
|
buffer.puts(line_offset, code_offset + taken - 3, "...", Style::LineNumber);
|
2019-08-14 11:34:09 -05:00
|
|
|
}
|
|
|
|
buffer.puts(line_offset, 0, &self.maybe_anonymized(line_index), Style::LineNumber);
|
|
|
|
|
2022-06-08 13:07:59 -05:00
|
|
|
draw_col_separator_no_space(buffer, line_offset, width_offset - 2);
|
2019-08-14 11:34:09 -05:00
|
|
|
}
|
|
|
|
|
2019-07-24 19:58:29 -05:00
|
|
|
fn render_source_line(
|
|
|
|
&self,
|
|
|
|
buffer: &mut StyledBuffer,
|
|
|
|
file: Lrc<SourceFile>,
|
|
|
|
line: &Line,
|
|
|
|
width_offset: usize,
|
|
|
|
code_offset: usize,
|
2019-08-14 11:34:09 -05:00
|
|
|
margin: Margin,
|
2019-07-24 19:58:29 -05:00
|
|
|
) -> Vec<(usize, Style)> {
|
|
|
|
// Draw:
|
|
|
|
//
|
|
|
|
// LL | ... code ...
|
|
|
|
// | ^^-^ span label
|
|
|
|
// | |
|
|
|
|
// | secondary span label
|
|
|
|
//
|
|
|
|
// ^^ ^ ^^^ ^^^^ ^^^ we don't care about code too far to the right of a span, we trim it
|
|
|
|
// | | | |
|
|
|
|
// | | | actual code found in your source code and the spans we use to mark it
|
2019-08-14 13:44:56 -05:00
|
|
|
// | | when there's too much wasted space to the left, trim it
|
2019-07-24 19:58:29 -05:00
|
|
|
// | vertical divider between the column number and the code
|
|
|
|
// column number
|
2019-08-13 21:09:28 -05:00
|
|
|
|
2018-01-23 02:08:16 -06:00
|
|
|
if line.line_index == 0 {
|
|
|
|
return Vec::new();
|
|
|
|
}
|
|
|
|
|
2017-05-01 02:27:36 -05:00
|
|
|
let source_string = match file.get_line(line.line_index - 1) {
|
2021-09-10 02:32:07 -05:00
|
|
|
Some(s) => normalize_whitespace(&*s),
|
2017-05-01 02:27:36 -05:00
|
|
|
None => return Vec::new(),
|
|
|
|
};
|
2016-07-11 15:02:03 -05:00
|
|
|
|
|
|
|
let line_offset = buffer.num_lines();
|
|
|
|
|
2021-11-26 05:51:09 -06:00
|
|
|
// Left trim
|
|
|
|
let left = margin.left(source_string.len());
|
|
|
|
|
2019-08-14 19:06:09 -05:00
|
|
|
// Account for unicode characters of width !=0 that were removed.
|
2019-12-24 16:38:22 -06:00
|
|
|
let left = source_string
|
|
|
|
.chars()
|
|
|
|
.take(left)
|
2019-09-25 15:23:19 -05:00
|
|
|
.map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
|
|
|
|
.sum();
|
2019-08-14 16:09:37 -05:00
|
|
|
|
2019-08-14 11:34:09 -05:00
|
|
|
self.draw_line(
|
|
|
|
buffer,
|
|
|
|
&source_string,
|
|
|
|
line.line_index,
|
2019-07-24 19:58:29 -05:00
|
|
|
line_offset,
|
2019-08-14 11:34:09 -05:00
|
|
|
width_offset,
|
2019-07-24 19:58:29 -05:00
|
|
|
code_offset,
|
2019-08-14 11:34:09 -05:00
|
|
|
margin,
|
2019-07-24 19:58:29 -05:00
|
|
|
);
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2017-04-14 18:38:10 -05:00
|
|
|
// Special case when there's only one annotation involved, it is the start of a multiline
|
|
|
|
// span and there's no text at the beginning of the code line. Instead of doing the whole
|
|
|
|
// graph:
|
|
|
|
//
|
|
|
|
// 2 | fn foo() {
|
|
|
|
// | _^
|
|
|
|
// 3 | |
|
|
|
|
// 4 | | }
|
|
|
|
// | |_^ test
|
|
|
|
//
|
|
|
|
// we simplify the output to:
|
|
|
|
//
|
|
|
|
// 2 | / fn foo() {
|
|
|
|
// 3 | |
|
|
|
|
// 4 | | }
|
|
|
|
// | |_^ test
|
2019-09-30 15:33:17 -05:00
|
|
|
if let [ann] = &line.annotations[..] {
|
|
|
|
if let AnnotationType::MultilineStart(depth) = ann.annotation_type {
|
|
|
|
if source_string.chars().take(ann.start_col).all(|c| c.is_whitespace()) {
|
|
|
|
let style = if ann.is_primary {
|
|
|
|
Style::UnderlinePrimary
|
|
|
|
} else {
|
|
|
|
Style::UnderlineSecondary
|
|
|
|
};
|
|
|
|
buffer.putc(line_offset, width_offset + depth - 1, '/', style);
|
|
|
|
return vec![(depth, style)];
|
2017-04-14 18:38:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-11 15:02:03 -05:00
|
|
|
// We want to display like this:
|
|
|
|
//
|
|
|
|
// vec.push(vec.pop().unwrap());
|
2016-10-23 19:22:06 -05:00
|
|
|
// --- ^^^ - previous borrow ends here
|
2016-07-11 15:02:03 -05:00
|
|
|
// | |
|
|
|
|
// | error occurs here
|
|
|
|
// previous borrow of `vec` occurs here
|
|
|
|
//
|
|
|
|
// But there are some weird edge cases to be aware of:
|
|
|
|
//
|
|
|
|
// vec.push(vec.pop().unwrap());
|
|
|
|
// -------- - previous borrow ends here
|
|
|
|
// ||
|
|
|
|
// |this makes no sense
|
|
|
|
// previous borrow of `vec` occurs here
|
|
|
|
//
|
|
|
|
// For this reason, we group the lines into "highlight lines"
|
2017-04-06 14:18:18 -05:00
|
|
|
// and "annotations lines", where the highlight lines have the `^`.
|
2016-07-11 15:02:03 -05:00
|
|
|
|
|
|
|
// Sort the annotations by (start, end col)
|
2017-07-05 11:58:22 -05:00
|
|
|
// The labels are reversed, sort and then reversed again.
|
|
|
|
// Consider a list of annotations (A1, A2, C1, C2, B1, B2) where
|
|
|
|
// the letter signifies the span. Here we are only sorting by the
|
|
|
|
// span and hence, the order of the elements with the same span will
|
|
|
|
// not change. On reversing the ordering (|a, b| but b.cmp(a)), you get
|
|
|
|
// (C1, C2, B1, B2, A1, A2). All the elements with the same span are
|
|
|
|
// still ordered first to last, but all the elements with different
|
|
|
|
// spans are ordered by their spans in last to first order. Last to
|
|
|
|
// first order is important, because the jiggly lines and | are on
|
|
|
|
// the left, so the rightmost span needs to be rendered first,
|
|
|
|
// otherwise the lines would end up needing to go over a message.
|
|
|
|
|
2016-07-11 15:02:03 -05:00
|
|
|
let mut annotations = line.annotations.clone();
|
2018-07-25 03:36:57 -05:00
|
|
|
annotations.sort_by_key(|a| Reverse(a.start_col));
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2016-10-23 19:22:06 -05:00
|
|
|
// First, figure out where each label will be positioned.
|
|
|
|
//
|
|
|
|
// In the case where you have the following annotations:
|
|
|
|
//
|
|
|
|
// vec.push(vec.pop().unwrap());
|
|
|
|
// -------- - previous borrow ends here [C]
|
|
|
|
// ||
|
|
|
|
// |this makes no sense [B]
|
|
|
|
// previous borrow of `vec` occurs here [A]
|
|
|
|
//
|
|
|
|
// `annotations_position` will hold [(2, A), (1, B), (0, C)].
|
|
|
|
//
|
|
|
|
// We try, when possible, to stick the rightmost annotation at the end
|
|
|
|
// of the highlight line:
|
2016-07-11 15:02:03 -05:00
|
|
|
//
|
|
|
|
// vec.push(vec.pop().unwrap());
|
|
|
|
// --- --- - previous borrow ends here
|
|
|
|
//
|
|
|
|
// But sometimes that's not possible because one of the other
|
|
|
|
// annotations overlaps it. For example, from the test
|
|
|
|
// `span_overlap_label`, we have the following annotations
|
|
|
|
// (written on distinct lines for clarity):
|
|
|
|
//
|
|
|
|
// fn foo(x: u32) {
|
|
|
|
// --------------
|
|
|
|
// -
|
|
|
|
//
|
|
|
|
// In this case, we can't stick the rightmost-most label on
|
|
|
|
// the highlight line, or we would get:
|
|
|
|
//
|
|
|
|
// fn foo(x: u32) {
|
|
|
|
// -------- x_span
|
|
|
|
// |
|
|
|
|
// fn_span
|
|
|
|
//
|
|
|
|
// which is totally weird. Instead we want:
|
|
|
|
//
|
|
|
|
// fn foo(x: u32) {
|
|
|
|
// --------------
|
|
|
|
// | |
|
|
|
|
// | x_span
|
|
|
|
// fn_span
|
|
|
|
//
|
|
|
|
// which is...less weird, at least. In fact, in general, if
|
|
|
|
// the rightmost span overlaps with any other span, we should
|
|
|
|
// use the "hang below" version, so we can at least make it
|
2017-01-20 20:57:21 -06:00
|
|
|
// clear where the span *starts*. There's an exception for this
|
|
|
|
// logic, when the labels do not have a message:
|
|
|
|
//
|
|
|
|
// fn foo(x: u32) {
|
|
|
|
// --------------
|
|
|
|
// |
|
|
|
|
// x_span
|
|
|
|
//
|
|
|
|
// instead of:
|
|
|
|
//
|
|
|
|
// fn foo(x: u32) {
|
|
|
|
// --------------
|
|
|
|
// | |
|
|
|
|
// | x_span
|
|
|
|
// <EMPTY LINE>
|
|
|
|
//
|
2016-10-23 19:22:06 -05:00
|
|
|
let mut annotations_position = vec![];
|
|
|
|
let mut line_len = 0;
|
|
|
|
let mut p = 0;
|
2017-03-05 20:51:46 -06:00
|
|
|
for (i, annotation) in annotations.iter().enumerate() {
|
|
|
|
for (j, next) in annotations.iter().enumerate() {
|
|
|
|
if overlaps(next, annotation, 0) // This label overlaps with another one and both
|
2017-04-14 18:38:10 -05:00
|
|
|
&& annotation.has_label() // take space (they have text and are not
|
|
|
|
&& j > i // multiline lines).
|
2019-12-24 16:38:22 -06:00
|
|
|
&& p == 0
|
|
|
|
// We're currently on the first line, move the label one line down
|
2017-01-20 20:57:21 -06:00
|
|
|
{
|
2019-04-16 17:26:41 -05:00
|
|
|
// If we're overlapping with an un-labelled annotation with the same span
|
|
|
|
// we can just merge them in the output
|
|
|
|
if next.start_col == annotation.start_col
|
2019-12-24 16:38:22 -06:00
|
|
|
&& next.end_col == annotation.end_col
|
|
|
|
&& !next.has_label()
|
2019-04-16 17:26:41 -05:00
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2017-01-20 20:57:21 -06:00
|
|
|
// This annotation needs a new line in the output.
|
2016-10-23 19:22:06 -05:00
|
|
|
p += 1;
|
2017-03-05 20:51:46 -06:00
|
|
|
break;
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
annotations_position.push((p, annotation));
|
2017-03-05 20:51:46 -06:00
|
|
|
for (j, next) in annotations.iter().enumerate() {
|
2019-12-24 16:38:22 -06:00
|
|
|
if j > i {
|
2019-09-30 19:22:07 -05:00
|
|
|
let l = next.label.as_ref().map_or(0, |label| label.len() + 2);
|
2017-04-14 18:38:10 -05:00
|
|
|
if (overlaps(next, annotation, l) // Do not allow two labels to be in the same
|
2017-03-05 20:51:46 -06:00
|
|
|
// line if they overlap including padding, to
|
|
|
|
// avoid situations like:
|
|
|
|
//
|
|
|
|
// fn foo(x: u32) {
|
|
|
|
// -------^------
|
|
|
|
// | |
|
|
|
|
// fn_spanx_span
|
|
|
|
//
|
|
|
|
&& annotation.has_label() // Both labels must have some text, otherwise
|
2017-04-14 18:38:10 -05:00
|
|
|
&& next.has_label()) // they are not overlapping.
|
|
|
|
// Do not add a new line if this annotation
|
|
|
|
// or the next are vertical line placeholders.
|
|
|
|
|| (annotation.takes_space() // If either this or the next annotation is
|
|
|
|
&& next.has_label()) // multiline start/end, move it to a new line
|
2020-10-29 10:51:46 -05:00
|
|
|
|| (annotation.has_label() // so as not to overlap the horizontal lines.
|
2017-04-14 18:38:10 -05:00
|
|
|
&& next.takes_space())
|
2017-06-12 17:54:04 -05:00
|
|
|
|| (annotation.takes_space() && next.takes_space())
|
|
|
|
|| (overlaps(next, annotation, l)
|
|
|
|
&& next.end_col <= annotation.end_col
|
|
|
|
&& next.has_label()
|
2019-12-24 16:38:22 -06:00
|
|
|
&& p == 0)
|
|
|
|
// Avoid #42595.
|
2017-03-05 20:51:46 -06:00
|
|
|
{
|
2017-04-14 18:38:10 -05:00
|
|
|
// This annotation needs a new line in the output.
|
2017-03-05 20:51:46 -06:00
|
|
|
p += 1;
|
|
|
|
break;
|
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
}
|
2019-09-25 15:08:09 -05:00
|
|
|
line_len = max(line_len, p);
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
2017-04-14 18:38:10 -05:00
|
|
|
|
2016-10-23 19:22:06 -05:00
|
|
|
if line_len != 0 {
|
|
|
|
line_len += 1;
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
|
2016-10-23 19:22:06 -05:00
|
|
|
// If there are no annotations or the only annotations on this line are
|
|
|
|
// MultilineLine, then there's only code being shown, stop processing.
|
2018-03-16 08:35:26 -05:00
|
|
|
if line.annotations.iter().all(|a| a.is_line()) {
|
2017-04-06 14:18:18 -05:00
|
|
|
return vec![];
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
|
2019-11-20 16:17:30 -06:00
|
|
|
// Write the column separator.
|
2017-01-20 20:57:21 -06:00
|
|
|
//
|
|
|
|
// After this we will have:
|
|
|
|
//
|
|
|
|
// 2 | fn foo() {
|
|
|
|
// |
|
|
|
|
// |
|
|
|
|
// |
|
|
|
|
// 3 |
|
|
|
|
// 4 | }
|
|
|
|
// |
|
2018-12-04 13:17:58 -06:00
|
|
|
for pos in 0..=line_len {
|
2016-10-23 19:22:06 -05:00
|
|
|
draw_col_separator(buffer, line_offset + pos + 1, width_offset - 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write the horizontal lines for multiline annotations
|
|
|
|
// (only the first and last lines need this).
|
|
|
|
//
|
|
|
|
// After this we will have:
|
|
|
|
//
|
|
|
|
// 2 | fn foo() {
|
|
|
|
// | __________
|
|
|
|
// |
|
|
|
|
// |
|
|
|
|
// 3 |
|
|
|
|
// 4 | }
|
|
|
|
// | _
|
|
|
|
for &(pos, annotation) in &annotations_position {
|
|
|
|
let style = if annotation.is_primary {
|
|
|
|
Style::UnderlinePrimary
|
|
|
|
} else {
|
|
|
|
Style::UnderlineSecondary
|
|
|
|
};
|
|
|
|
let pos = pos + 1;
|
|
|
|
match annotation.annotation_type {
|
2019-12-24 16:38:22 -06:00
|
|
|
AnnotationType::MultilineStart(depth) | AnnotationType::MultilineEnd(depth) => {
|
2019-08-14 11:34:09 -05:00
|
|
|
draw_range(
|
|
|
|
buffer,
|
|
|
|
'_',
|
|
|
|
line_offset + pos,
|
|
|
|
width_offset + depth,
|
2020-09-11 04:11:11 -05:00
|
|
|
(code_offset + annotation.start_col).saturating_sub(left),
|
2019-08-14 11:34:09 -05:00
|
|
|
style,
|
|
|
|
);
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
2018-01-28 20:37:55 -06:00
|
|
|
_ if self.teach => {
|
2019-08-14 11:34:09 -05:00
|
|
|
buffer.set_style_range(
|
|
|
|
line_offset,
|
2020-09-11 04:11:11 -05:00
|
|
|
(code_offset + annotation.start_col).saturating_sub(left),
|
|
|
|
(code_offset + annotation.end_col).saturating_sub(left),
|
2019-08-14 11:34:09 -05:00
|
|
|
style,
|
|
|
|
annotation.is_primary,
|
|
|
|
);
|
2018-01-28 20:37:55 -06:00
|
|
|
}
|
|
|
|
_ => {}
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-06 14:18:18 -05:00
|
|
|
// Write the vertical lines for labels that are on a different line as the underline.
|
2016-10-23 19:22:06 -05:00
|
|
|
//
|
|
|
|
// After this we will have:
|
|
|
|
//
|
|
|
|
// 2 | fn foo() {
|
|
|
|
// | __________
|
|
|
|
// | | |
|
|
|
|
// | |
|
2019-11-20 16:17:30 -06:00
|
|
|
// 3 | |
|
2016-10-23 19:22:06 -05:00
|
|
|
// 4 | | }
|
|
|
|
// | |_
|
|
|
|
for &(pos, annotation) in &annotations_position {
|
|
|
|
let style = if annotation.is_primary {
|
|
|
|
Style::UnderlinePrimary
|
|
|
|
} else {
|
|
|
|
Style::UnderlineSecondary
|
|
|
|
};
|
|
|
|
let pos = pos + 1;
|
2017-01-20 20:57:21 -06:00
|
|
|
|
2017-04-14 18:38:10 -05:00
|
|
|
if pos > 1 && (annotation.has_label() || annotation.takes_space()) {
|
2018-12-04 13:17:58 -06:00
|
|
|
for p in line_offset + 1..=line_offset + pos {
|
2019-12-24 16:38:22 -06:00
|
|
|
buffer.putc(
|
|
|
|
p,
|
|
|
|
(code_offset + annotation.start_col).saturating_sub(left),
|
|
|
|
'|',
|
|
|
|
style,
|
|
|
|
);
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
match annotation.annotation_type {
|
|
|
|
AnnotationType::MultilineStart(depth) => {
|
|
|
|
for p in line_offset + pos + 1..line_offset + line_len + 2 {
|
2019-12-24 16:38:22 -06:00
|
|
|
buffer.putc(p, width_offset + depth - 1, '|', style);
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
AnnotationType::MultilineEnd(depth) => {
|
2018-12-04 13:17:58 -06:00
|
|
|
for p in line_offset..=line_offset + pos {
|
2019-12-24 16:38:22 -06:00
|
|
|
buffer.putc(p, width_offset + depth - 1, '|', style);
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write the labels on the annotations that actually have a label.
|
|
|
|
//
|
|
|
|
// After this we will have:
|
|
|
|
//
|
|
|
|
// 2 | fn foo() {
|
2017-04-14 18:38:10 -05:00
|
|
|
// | __________
|
2017-04-06 14:18:18 -05:00
|
|
|
// | |
|
|
|
|
// | something about `foo`
|
|
|
|
// 3 |
|
|
|
|
// 4 | }
|
2017-04-14 18:38:10 -05:00
|
|
|
// | _ test
|
2016-10-23 19:22:06 -05:00
|
|
|
for &(pos, annotation) in &annotations_position {
|
2019-12-24 16:38:22 -06:00
|
|
|
let style =
|
|
|
|
if annotation.is_primary { Style::LabelPrimary } else { Style::LabelSecondary };
|
2016-10-23 19:22:06 -05:00
|
|
|
let (pos, col) = if pos == 0 {
|
2019-09-25 14:55:04 -05:00
|
|
|
(pos + 1, (annotation.end_col + 1).saturating_sub(left))
|
2016-10-23 19:22:06 -05:00
|
|
|
} else {
|
2019-09-25 14:55:04 -05:00
|
|
|
(pos + 2, annotation.start_col.saturating_sub(left))
|
2016-10-23 19:22:06 -05:00
|
|
|
};
|
|
|
|
if let Some(ref label) = annotation.label {
|
2019-08-14 16:09:37 -05:00
|
|
|
buffer.puts(line_offset + pos, code_offset + col, &label, style);
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sort from biggest span to smallest span so that smaller spans are
|
|
|
|
// represented in the output:
|
|
|
|
//
|
|
|
|
// x | fn foo()
|
|
|
|
// | ^^^---^^
|
|
|
|
// | | |
|
|
|
|
// | | something about `foo`
|
|
|
|
// | something about `fn foo()`
|
2019-09-30 18:38:35 -05:00
|
|
|
annotations_position.sort_by_key(|(_, ann)| {
|
|
|
|
// Decreasing order. When annotations share the same length, prefer `Primary`.
|
|
|
|
(Reverse(ann.len()), ann.is_primary)
|
2016-10-23 19:22:06 -05:00
|
|
|
});
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2016-10-23 19:22:06 -05:00
|
|
|
// Write the underlines.
|
|
|
|
//
|
|
|
|
// After this we will have:
|
|
|
|
//
|
|
|
|
// 2 | fn foo() {
|
2017-04-14 18:38:10 -05:00
|
|
|
// | ____-_____^
|
2017-04-06 14:18:18 -05:00
|
|
|
// | |
|
|
|
|
// | something about `foo`
|
|
|
|
// 3 |
|
|
|
|
// 4 | }
|
2017-04-14 18:38:10 -05:00
|
|
|
// | _^ test
|
2016-10-23 19:22:06 -05:00
|
|
|
for &(_, annotation) in &annotations_position {
|
|
|
|
let (underline, style) = if annotation.is_primary {
|
|
|
|
('^', Style::UnderlinePrimary)
|
2016-07-11 15:02:03 -05:00
|
|
|
} else {
|
2016-10-23 19:22:06 -05:00
|
|
|
('-', Style::UnderlineSecondary)
|
|
|
|
};
|
|
|
|
for p in annotation.start_col..annotation.end_col {
|
2019-08-14 16:09:37 -05:00
|
|
|
buffer.putc(
|
|
|
|
line_offset + 1,
|
2019-09-25 14:55:04 -05:00
|
|
|
(code_offset + p).saturating_sub(left),
|
2019-08-14 16:09:37 -05:00
|
|
|
underline,
|
|
|
|
style,
|
|
|
|
);
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
}
|
2019-12-24 16:38:22 -06:00
|
|
|
annotations_position
|
|
|
|
.iter()
|
|
|
|
.filter_map(|&(_, annotation)| match annotation.annotation_type {
|
2017-04-06 14:18:18 -05:00
|
|
|
AnnotationType::MultilineStart(p) | AnnotationType::MultilineEnd(p) => {
|
|
|
|
let style = if annotation.is_primary {
|
|
|
|
Style::LabelPrimary
|
|
|
|
} else {
|
|
|
|
Style::LabelSecondary
|
|
|
|
};
|
|
|
|
Some((p, style))
|
2017-09-16 12:24:08 -05:00
|
|
|
}
|
2019-12-24 16:38:22 -06:00
|
|
|
_ => None,
|
|
|
|
})
|
|
|
|
.collect::<Vec<_>>()
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn get_multispan_max_line_num(&mut self, msp: &MultiSpan) -> usize {
|
2022-02-18 17:48:49 -06:00
|
|
|
let Some(ref sm) = self.sm else {
|
|
|
|
return 0;
|
2019-09-30 15:43:24 -05:00
|
|
|
};
|
2019-09-30 18:30:52 -05:00
|
|
|
|
2022-05-28 21:29:49 -05:00
|
|
|
let will_be_emitted = |span: Span| {
|
|
|
|
!span.is_dummy() && {
|
|
|
|
let file = sm.lookup_source_file(span.hi());
|
|
|
|
sm.ensure_source_file_source_present(file)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-07-11 15:02:03 -05:00
|
|
|
let mut max = 0;
|
2019-09-30 15:43:24 -05:00
|
|
|
for primary_span in msp.primary_spans() {
|
2022-05-28 21:29:49 -05:00
|
|
|
if will_be_emitted(*primary_span) {
|
2019-09-30 15:43:24 -05:00
|
|
|
let hi = sm.lookup_char_pos(primary_span.hi());
|
2019-09-30 18:38:35 -05:00
|
|
|
max = (hi.line).max(max);
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2019-09-30 15:43:24 -05:00
|
|
|
}
|
|
|
|
if !self.short_message {
|
|
|
|
for span_label in msp.span_labels() {
|
2022-05-28 21:29:49 -05:00
|
|
|
if will_be_emitted(span_label.span) {
|
2019-09-30 15:43:24 -05:00
|
|
|
let hi = sm.lookup_char_pos(span_label.span.hi());
|
2019-09-30 18:38:35 -05:00
|
|
|
max = (hi.line).max(max);
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-09-30 18:30:52 -05:00
|
|
|
|
2016-07-11 15:02:03 -05:00
|
|
|
max
|
|
|
|
}
|
|
|
|
|
2018-07-27 09:50:28 -05:00
|
|
|
fn get_max_line_num(&mut self, span: &MultiSpan, children: &[SubDiagnostic]) -> usize {
|
2016-08-17 09:20:04 -05:00
|
|
|
let primary = self.get_multispan_max_line_num(span);
|
2019-12-24 16:38:22 -06:00
|
|
|
children
|
|
|
|
.iter()
|
2019-09-30 15:47:51 -05:00
|
|
|
.map(|sub| self.get_multispan_max_line_num(&sub.span))
|
|
|
|
.max()
|
2019-10-02 11:48:21 -05:00
|
|
|
.unwrap_or(0)
|
|
|
|
.max(primary)
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
|
2019-02-08 07:53:55 -06:00
|
|
|
/// Adds a left margin to every line but the first, given a padding length and the label being
|
2017-01-11 15:55:41 -06:00
|
|
|
/// displayed, keeping the provided highlighting.
|
2019-12-24 16:38:22 -06:00
|
|
|
fn msg_to_buffer(
|
|
|
|
&self,
|
|
|
|
buffer: &mut StyledBuffer,
|
2022-03-23 02:34:20 -05:00
|
|
|
msg: &[(DiagnosticMessage, Style)],
|
2022-03-26 02:27:43 -05:00
|
|
|
args: &FluentArgs<'_>,
|
2019-12-24 16:38:22 -06:00
|
|
|
padding: usize,
|
|
|
|
label: &str,
|
|
|
|
override_style: Option<Style>,
|
|
|
|
) {
|
2017-01-09 11:07:34 -06:00
|
|
|
// The extra 5 ` ` is padding that's always needed to align to the `note: `:
|
|
|
|
//
|
|
|
|
// error: message
|
|
|
|
// --> file.rs:13:20
|
|
|
|
// |
|
|
|
|
// 13 | <CODE>
|
|
|
|
// | ^^^^
|
|
|
|
// |
|
|
|
|
// = note: multiline
|
|
|
|
// message
|
|
|
|
// ++^^^----xx
|
|
|
|
// | | | |
|
|
|
|
// | | | magic `2`
|
|
|
|
// | | length of label
|
|
|
|
// | magic `3`
|
|
|
|
// `max_line_num_len`
|
2018-03-31 23:48:15 -05:00
|
|
|
let padding = " ".repeat(padding + label.len() + 5);
|
2017-01-09 11:07:34 -06:00
|
|
|
|
2019-09-30 15:50:58 -05:00
|
|
|
/// Returns `override` if it is present and `style` is `NoStyle` or `style` otherwise
|
2019-09-30 18:38:35 -05:00
|
|
|
fn style_or_override(style: Style, override_: Option<Style>) -> Style {
|
|
|
|
match (style, override_) {
|
|
|
|
(Style::NoStyle, Some(override_)) => override_,
|
2019-09-25 16:42:55 -05:00
|
|
|
_ => style,
|
2017-01-11 15:55:41 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut line_number = 0;
|
|
|
|
|
|
|
|
// Provided the following diagnostic message:
|
|
|
|
//
|
|
|
|
// let msg = vec![
|
|
|
|
// ("
|
|
|
|
// ("highlighted multiline\nstring to\nsee how it ", Style::NoStyle),
|
|
|
|
// ("looks", Style::Highlight),
|
|
|
|
// ("with\nvery ", Style::NoStyle),
|
|
|
|
// ("weird", Style::Highlight),
|
|
|
|
// (" formats\n", Style::NoStyle),
|
|
|
|
// ("see?", Style::Highlight),
|
|
|
|
// ];
|
|
|
|
//
|
2017-12-08 20:35:55 -06:00
|
|
|
// the expected output on a note is (* surround the highlighted text)
|
2017-01-11 15:55:41 -06:00
|
|
|
//
|
|
|
|
// = note: highlighted multiline
|
|
|
|
// string to
|
|
|
|
// see how it *looks* with
|
|
|
|
// very *weird* formats
|
|
|
|
// see?
|
|
|
|
for &(ref text, ref style) in msg.iter() {
|
2022-03-26 02:27:43 -05:00
|
|
|
let text = self.translate_message(text, args);
|
2017-01-11 15:55:41 -06:00
|
|
|
let lines = text.split('\n').collect::<Vec<_>>();
|
|
|
|
if lines.len() > 1 {
|
|
|
|
for (i, line) in lines.iter().enumerate() {
|
|
|
|
if i != 0 {
|
|
|
|
line_number += 1;
|
|
|
|
buffer.append(line_number, &padding, Style::NoStyle);
|
|
|
|
}
|
|
|
|
buffer.append(line_number, line, style_or_override(*style, override_style));
|
|
|
|
}
|
|
|
|
} else {
|
2022-03-26 02:27:43 -05:00
|
|
|
buffer.append(line_number, &text, style_or_override(*style, override_style));
|
2017-01-08 16:00:57 -06:00
|
|
|
}
|
2017-01-11 15:55:41 -06:00
|
|
|
}
|
2017-01-08 16:00:57 -06:00
|
|
|
}
|
|
|
|
|
2019-02-08 04:45:53 -06:00
|
|
|
fn emit_message_default(
|
|
|
|
&mut self,
|
|
|
|
msp: &MultiSpan,
|
2022-03-23 02:34:20 -05:00
|
|
|
msg: &[(DiagnosticMessage, Style)],
|
2022-03-26 02:27:43 -05:00
|
|
|
args: &FluentArgs<'_>,
|
2019-02-08 04:45:53 -06:00
|
|
|
code: &Option<DiagnosticId>,
|
|
|
|
level: &Level,
|
|
|
|
max_line_num_len: usize,
|
|
|
|
is_secondary: bool,
|
|
|
|
) -> io::Result<()> {
|
2016-07-11 15:02:03 -05:00
|
|
|
let mut buffer = StyledBuffer::new();
|
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
if !msp.has_primary_spans() && !msp.has_span_labels() && is_secondary && !self.short_message
|
|
|
|
{
|
2016-07-11 15:02:03 -05:00
|
|
|
// This is a secondary message with no span info
|
2016-07-12 14:18:16 -05:00
|
|
|
for _ in 0..max_line_num_len {
|
2016-07-11 15:02:03 -05:00
|
|
|
buffer.prepend(0, " ", Style::NoStyle);
|
|
|
|
}
|
|
|
|
draw_note_separator(&mut buffer, 0, max_line_num_len + 1);
|
2019-09-13 08:48:47 -05:00
|
|
|
if *level != Level::FailureNote {
|
2020-09-17 05:27:04 -05:00
|
|
|
buffer.append(0, level.to_str(), Style::MainHeaderMsg);
|
|
|
|
buffer.append(0, ": ", Style::NoStyle);
|
2018-02-28 09:17:44 -06:00
|
|
|
}
|
2022-03-26 02:27:43 -05:00
|
|
|
self.msg_to_buffer(&mut buffer, msg, args, max_line_num_len, "note", None);
|
2016-10-18 12:43:02 -05:00
|
|
|
} else {
|
2021-10-13 08:58:41 -05:00
|
|
|
let mut label_width = 0;
|
2019-09-13 08:48:47 -05:00
|
|
|
// The failure note level itself does not provide any useful diagnostic information
|
2020-09-17 05:27:04 -05:00
|
|
|
if *level != Level::FailureNote {
|
|
|
|
buffer.append(0, level.to_str(), Style::Level(*level));
|
2021-10-13 08:58:41 -05:00
|
|
|
label_width += level.to_str().len();
|
2018-02-28 09:17:44 -06:00
|
|
|
}
|
2017-10-27 01:21:22 -05:00
|
|
|
// only render error codes, not lint codes
|
|
|
|
if let Some(DiagnosticId::Error(ref code)) = *code {
|
2020-01-22 09:30:15 -06:00
|
|
|
buffer.append(0, "[", Style::Level(*level));
|
|
|
|
buffer.append(0, &code, Style::Level(*level));
|
|
|
|
buffer.append(0, "]", Style::Level(*level));
|
2021-10-13 08:58:41 -05:00
|
|
|
label_width += 2 + code.len();
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2021-03-23 18:09:11 -05:00
|
|
|
let header_style = if is_secondary { Style::HeaderMsg } else { Style::MainHeaderMsg };
|
2020-09-17 05:27:04 -05:00
|
|
|
if *level != Level::FailureNote {
|
2018-06-10 21:43:28 -05:00
|
|
|
buffer.append(0, ": ", header_style);
|
2021-10-13 08:58:41 -05:00
|
|
|
label_width += 2;
|
2018-02-28 09:17:44 -06:00
|
|
|
}
|
2017-01-11 15:55:41 -06:00
|
|
|
for &(ref text, _) in msg.iter() {
|
2022-03-26 02:27:43 -05:00
|
|
|
let text = self.translate_message(text, args);
|
2021-10-13 08:58:41 -05:00
|
|
|
// Account for newlines to align output to its label.
|
2022-03-26 02:27:43 -05:00
|
|
|
for (line, text) in normalize_whitespace(&text).lines().enumerate() {
|
2021-10-13 08:58:41 -05:00
|
|
|
buffer.append(
|
|
|
|
0 + line,
|
|
|
|
&format!(
|
|
|
|
"{}{}",
|
|
|
|
if line == 0 { String::new() } else { " ".repeat(label_width) },
|
|
|
|
text
|
|
|
|
),
|
|
|
|
header_style,
|
|
|
|
);
|
|
|
|
}
|
2017-01-11 15:55:41 -06:00
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
|
2022-03-26 02:27:43 -05:00
|
|
|
let mut annotated_files = FileWithAnnotatedLines::collect_annotations(self, args, msp);
|
2016-07-11 15:02:03 -05:00
|
|
|
|
|
|
|
// Make sure our primary file comes first
|
2018-10-29 15:26:13 -05:00
|
|
|
let (primary_lo, sm) = if let (Some(sm), Some(ref primary_span)) =
|
2019-12-24 16:38:22 -06:00
|
|
|
(self.sm.as_ref(), msp.primary_span().as_ref())
|
|
|
|
{
|
2018-06-24 17:00:21 -05:00
|
|
|
if !primary_span.is_dummy() {
|
2018-10-29 15:26:13 -05:00
|
|
|
(sm.lookup_char_pos(primary_span.lo()), sm)
|
2016-07-11 15:02:03 -05:00
|
|
|
} else {
|
2018-02-28 09:17:44 -06:00
|
|
|
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
|
2016-07-11 15:02:03 -05:00
|
|
|
return Ok(());
|
2016-10-18 12:43:02 -05:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// If we don't have span information, emit and exit
|
2018-02-28 09:17:44 -06:00
|
|
|
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
|
2016-10-18 12:43:02 -05:00
|
|
|
return Ok(());
|
|
|
|
};
|
2016-07-11 15:02:03 -05:00
|
|
|
if let Ok(pos) =
|
2019-12-24 16:38:22 -06:00
|
|
|
annotated_files.binary_search_by(|x| x.file.name.cmp(&primary_lo.file.name))
|
|
|
|
{
|
2016-07-11 15:02:03 -05:00
|
|
|
annotated_files.swap(0, pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Print out the annotate source lines that correspond with the error
|
|
|
|
for annotated_file in annotated_files {
|
2017-05-01 02:27:36 -05:00
|
|
|
// we can't annotate anything if the source is unavailable.
|
2018-10-29 15:26:13 -05:00
|
|
|
if !sm.ensure_source_file_source_present(annotated_file.file.clone()) {
|
2017-05-01 02:27:36 -05:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-07-11 15:02:03 -05:00
|
|
|
// print out the span location and spacer before we print the annotated source
|
|
|
|
// to do this, we need to know if this span will be primary
|
|
|
|
let is_primary = primary_lo.file.name == annotated_file.file.name;
|
|
|
|
if is_primary {
|
|
|
|
let loc = primary_lo.clone();
|
2017-09-16 12:24:08 -05:00
|
|
|
if !self.short_message {
|
|
|
|
// remember where we are in the output buffer for easy reference
|
|
|
|
let buffer_msg_line_offset = buffer.num_lines();
|
|
|
|
|
|
|
|
buffer.prepend(buffer_msg_line_offset, "--> ", Style::LineNumber);
|
2019-08-13 21:09:28 -05:00
|
|
|
buffer.append(
|
|
|
|
buffer_msg_line_offset,
|
|
|
|
&format!(
|
|
|
|
"{}:{}:{}",
|
2021-08-26 05:46:01 -05:00
|
|
|
sm.filename_for_diagnostics(&loc.file.name),
|
2019-08-13 21:09:28 -05:00
|
|
|
sm.doctest_offset_line(&loc.file.name, loc.line),
|
|
|
|
loc.col.0 + 1,
|
|
|
|
),
|
|
|
|
Style::LineAndColumn,
|
|
|
|
);
|
2017-09-16 12:24:08 -05:00
|
|
|
for _ in 0..max_line_num_len {
|
|
|
|
buffer.prepend(buffer_msg_line_offset, " ", Style::NoStyle);
|
|
|
|
}
|
|
|
|
} else {
|
2019-08-13 21:09:28 -05:00
|
|
|
buffer.prepend(
|
|
|
|
0,
|
|
|
|
&format!(
|
|
|
|
"{}:{}:{}: ",
|
2021-08-26 05:46:01 -05:00
|
|
|
sm.filename_for_diagnostics(&loc.file.name),
|
2019-08-13 21:09:28 -05:00
|
|
|
sm.doctest_offset_line(&loc.file.name, loc.line),
|
|
|
|
loc.col.0 + 1,
|
|
|
|
),
|
|
|
|
Style::LineAndColumn,
|
|
|
|
);
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2017-09-16 12:24:08 -05:00
|
|
|
} else if !self.short_message {
|
2016-07-11 15:02:03 -05:00
|
|
|
// remember where we are in the output buffer for easy reference
|
2016-07-12 14:18:16 -05:00
|
|
|
let buffer_msg_line_offset = buffer.num_lines();
|
2016-07-11 15:02:03 -05:00
|
|
|
|
|
|
|
// Add spacing line
|
2021-06-10 06:52:00 -05:00
|
|
|
draw_col_separator_no_space(
|
|
|
|
&mut buffer,
|
|
|
|
buffer_msg_line_offset,
|
|
|
|
max_line_num_len + 1,
|
|
|
|
);
|
2016-07-11 15:02:03 -05:00
|
|
|
|
|
|
|
// Then, the secondary file indicator
|
|
|
|
buffer.prepend(buffer_msg_line_offset + 1, "::: ", Style::LineNumber);
|
2018-01-26 09:33:05 -06:00
|
|
|
let loc = if let Some(first_line) = annotated_file.lines.first() {
|
|
|
|
let col = if let Some(first_annotation) = first_line.annotations.first() {
|
|
|
|
format!(":{}", first_annotation.start_col + 1)
|
2018-01-27 09:16:42 -06:00
|
|
|
} else {
|
2018-08-23 03:14:52 -05:00
|
|
|
String::new()
|
2018-01-27 09:16:42 -06:00
|
|
|
};
|
2019-12-24 16:38:22 -06:00
|
|
|
format!(
|
|
|
|
"{}:{}{}",
|
2021-08-26 05:46:01 -05:00
|
|
|
sm.filename_for_diagnostics(&annotated_file.file.name),
|
2019-12-24 16:38:22 -06:00
|
|
|
sm.doctest_offset_line(&annotated_file.file.name, first_line.line_index),
|
|
|
|
col
|
|
|
|
)
|
2018-01-26 09:33:05 -06:00
|
|
|
} else {
|
2021-08-26 05:46:01 -05:00
|
|
|
format!("{}", sm.filename_for_diagnostics(&annotated_file.file.name))
|
2018-01-26 09:33:05 -06:00
|
|
|
};
|
2019-12-24 16:38:22 -06:00
|
|
|
buffer.append(buffer_msg_line_offset + 1, &loc, Style::LineAndColumn);
|
2016-07-12 14:18:16 -05:00
|
|
|
for _ in 0..max_line_num_len {
|
2016-07-11 15:02:03 -05:00
|
|
|
buffer.prepend(buffer_msg_line_offset + 1, " ", Style::NoStyle);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-16 12:24:08 -05:00
|
|
|
if !self.short_message {
|
|
|
|
// Put in the spacer between the location and annotated source
|
|
|
|
let buffer_msg_line_offset = buffer.num_lines();
|
2019-12-24 16:38:22 -06:00
|
|
|
draw_col_separator_no_space(
|
|
|
|
&mut buffer,
|
|
|
|
buffer_msg_line_offset,
|
|
|
|
max_line_num_len + 1,
|
|
|
|
);
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2017-09-16 12:24:08 -05:00
|
|
|
// Contains the vertical lines' positions for active multiline annotations
|
2018-08-18 05:55:43 -05:00
|
|
|
let mut multilines = FxHashMap::default();
|
2017-04-06 14:18:18 -05:00
|
|
|
|
2019-07-24 19:58:29 -05:00
|
|
|
// Get the left-side margin to remove it
|
2020-04-06 16:09:56 -05:00
|
|
|
let mut whitespace_margin = usize::MAX;
|
2019-07-24 19:58:29 -05:00
|
|
|
for line_idx in 0..annotated_file.lines.len() {
|
|
|
|
let file = annotated_file.file.clone();
|
|
|
|
let line = &annotated_file.lines[line_idx];
|
|
|
|
if let Some(source_string) = file.get_line(line.line_index - 1) {
|
2020-12-05 18:39:07 -06:00
|
|
|
let leading_whitespace = source_string
|
|
|
|
.chars()
|
|
|
|
.take_while(|c| c.is_whitespace())
|
|
|
|
.map(|c| {
|
|
|
|
match c {
|
|
|
|
// Tabs are displayed as 4 spaces
|
|
|
|
'\t' => 4,
|
|
|
|
_ => 1,
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.sum();
|
2019-07-24 19:58:29 -05:00
|
|
|
if source_string.chars().any(|c| !c.is_whitespace()) {
|
2019-12-24 16:38:22 -06:00
|
|
|
whitespace_margin = min(whitespace_margin, leading_whitespace);
|
2019-07-24 19:58:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-04-06 16:09:56 -05:00
|
|
|
if whitespace_margin == usize::MAX {
|
2019-08-13 21:09:28 -05:00
|
|
|
whitespace_margin = 0;
|
2019-07-24 19:58:29 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Left-most column any visible span points at.
|
2020-04-06 16:09:56 -05:00
|
|
|
let mut span_left_margin = usize::MAX;
|
2019-07-24 19:58:29 -05:00
|
|
|
for line in &annotated_file.lines {
|
|
|
|
for ann in &line.annotations {
|
2019-08-14 11:34:09 -05:00
|
|
|
span_left_margin = min(span_left_margin, ann.start_col);
|
|
|
|
span_left_margin = min(span_left_margin, ann.end_col);
|
2019-07-24 19:58:29 -05:00
|
|
|
}
|
|
|
|
}
|
2020-04-06 16:09:56 -05:00
|
|
|
if span_left_margin == usize::MAX {
|
2019-07-24 19:58:29 -05:00
|
|
|
span_left_margin = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Right-most column any visible span points at.
|
|
|
|
let mut span_right_margin = 0;
|
2019-08-13 21:09:28 -05:00
|
|
|
let mut label_right_margin = 0;
|
2019-08-14 11:34:09 -05:00
|
|
|
let mut max_line_len = 0;
|
2019-07-24 19:58:29 -05:00
|
|
|
for line in &annotated_file.lines {
|
2019-12-24 16:38:22 -06:00
|
|
|
max_line_len = max(
|
|
|
|
max_line_len,
|
|
|
|
annotated_file.file.get_line(line.line_index - 1).map_or(0, |s| s.len()),
|
|
|
|
);
|
2019-07-24 19:58:29 -05:00
|
|
|
for ann in &line.annotations {
|
2019-08-14 11:34:09 -05:00
|
|
|
span_right_margin = max(span_right_margin, ann.start_col);
|
|
|
|
span_right_margin = max(span_right_margin, ann.end_col);
|
2019-08-14 13:44:56 -05:00
|
|
|
// FIXME: account for labels not in the same line
|
2019-09-25 15:41:27 -05:00
|
|
|
let label_right = ann.label.as_ref().map_or(0, |l| l.len() + 1);
|
2019-08-14 13:44:56 -05:00
|
|
|
label_right_margin = max(label_right_margin, ann.end_col + label_right);
|
2019-07-24 19:58:29 -05:00
|
|
|
}
|
|
|
|
}
|
2019-08-14 11:34:09 -05:00
|
|
|
|
|
|
|
let width_offset = 3 + max_line_num_len;
|
|
|
|
let code_offset = if annotated_file.multiline_depth == 0 {
|
|
|
|
width_offset
|
|
|
|
} else {
|
|
|
|
width_offset + annotated_file.multiline_depth + 1
|
|
|
|
};
|
|
|
|
|
2022-07-06 05:57:41 -05:00
|
|
|
let column_width = if let Some(width) = self.diagnostic_width {
|
2019-08-31 15:42:53 -05:00
|
|
|
width.saturating_sub(code_offset)
|
2019-08-14 19:57:28 -05:00
|
|
|
} else if self.ui_testing {
|
2020-06-25 05:56:15 -05:00
|
|
|
DEFAULT_COLUMN_WIDTH
|
2019-08-14 11:34:09 -05:00
|
|
|
} else {
|
2020-01-28 18:13:48 -06:00
|
|
|
termize::dimensions()
|
2019-08-31 15:42:53 -05:00
|
|
|
.map(|(w, _)| w.saturating_sub(code_offset))
|
2020-06-25 05:56:15 -05:00
|
|
|
.unwrap_or(DEFAULT_COLUMN_WIDTH)
|
2019-08-14 11:34:09 -05:00
|
|
|
};
|
|
|
|
|
2019-08-13 21:09:28 -05:00
|
|
|
let margin = Margin::new(
|
|
|
|
whitespace_margin,
|
|
|
|
span_left_margin,
|
|
|
|
span_right_margin,
|
|
|
|
label_right_margin,
|
2019-08-14 11:34:09 -05:00
|
|
|
column_width,
|
|
|
|
max_line_len,
|
2019-08-13 21:09:28 -05:00
|
|
|
);
|
2019-07-24 19:58:29 -05:00
|
|
|
|
2017-09-16 12:24:08 -05:00
|
|
|
// Next, output the annotate source for this file
|
|
|
|
for line_idx in 0..annotated_file.lines.len() {
|
|
|
|
let previous_buffer_line = buffer.num_lines();
|
2017-04-06 14:18:18 -05:00
|
|
|
|
2019-07-24 19:58:29 -05:00
|
|
|
let depths = self.render_source_line(
|
|
|
|
&mut buffer,
|
|
|
|
annotated_file.file.clone(),
|
|
|
|
&annotated_file.lines[line_idx],
|
|
|
|
width_offset,
|
|
|
|
code_offset,
|
|
|
|
margin,
|
|
|
|
);
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2018-08-18 05:55:43 -05:00
|
|
|
let mut to_add = FxHashMap::default();
|
2017-04-06 14:18:18 -05:00
|
|
|
|
2017-09-16 12:24:08 -05:00
|
|
|
for (depth, style) in depths {
|
2021-03-23 18:09:11 -05:00
|
|
|
if multilines.remove(&depth).is_none() {
|
2017-09-16 12:24:08 -05:00
|
|
|
to_add.insert(depth, style);
|
|
|
|
}
|
2017-04-06 14:18:18 -05:00
|
|
|
}
|
|
|
|
|
2017-09-16 12:24:08 -05:00
|
|
|
// Set the multiline annotation vertical lines to the left of
|
|
|
|
// the code in this line.
|
|
|
|
for (depth, style) in &multilines {
|
|
|
|
for line in previous_buffer_line..buffer.num_lines() {
|
2019-12-24 16:38:22 -06:00
|
|
|
draw_multiline_line(&mut buffer, line, width_offset, *depth, *style);
|
2017-04-06 14:18:18 -05:00
|
|
|
}
|
2017-09-16 12:24:08 -05:00
|
|
|
}
|
|
|
|
// check to see if we need to print out or elide lines that come between
|
|
|
|
// this annotated line and the next one.
|
|
|
|
if line_idx < (annotated_file.lines.len() - 1) {
|
2019-12-24 16:38:22 -06:00
|
|
|
let line_idx_delta = annotated_file.lines[line_idx + 1].line_index
|
|
|
|
- annotated_file.lines[line_idx].line_index;
|
2017-09-16 12:24:08 -05:00
|
|
|
if line_idx_delta > 2 {
|
|
|
|
let last_buffer_line_num = buffer.num_lines();
|
|
|
|
buffer.puts(last_buffer_line_num, 0, "...", Style::LineNumber);
|
|
|
|
|
|
|
|
// Set the multiline annotation vertical lines on `...` bridging line.
|
|
|
|
for (depth, style) in &multilines {
|
2019-12-24 16:38:22 -06:00
|
|
|
draw_multiline_line(
|
|
|
|
&mut buffer,
|
|
|
|
last_buffer_line_num,
|
|
|
|
width_offset,
|
|
|
|
*depth,
|
|
|
|
*style,
|
|
|
|
);
|
2017-09-16 12:24:08 -05:00
|
|
|
}
|
|
|
|
} else if line_idx_delta == 2 {
|
2019-12-24 16:38:22 -06:00
|
|
|
let unannotated_line = annotated_file
|
|
|
|
.file
|
2017-09-16 12:24:08 -05:00
|
|
|
.get_line(annotated_file.lines[line_idx].line_index)
|
|
|
|
.unwrap_or_else(|| Cow::from(""));
|
|
|
|
|
|
|
|
let last_buffer_line_num = buffer.num_lines();
|
|
|
|
|
2019-08-14 11:34:09 -05:00
|
|
|
self.draw_line(
|
2019-08-13 21:09:28 -05:00
|
|
|
&mut buffer,
|
2021-09-10 02:32:07 -05:00
|
|
|
&normalize_whitespace(&unannotated_line),
|
2019-08-14 11:34:09 -05:00
|
|
|
annotated_file.lines[line_idx + 1].line_index - 1,
|
2019-08-13 21:09:28 -05:00
|
|
|
last_buffer_line_num,
|
2019-08-14 11:34:09 -05:00
|
|
|
width_offset,
|
2019-08-13 21:09:28 -05:00
|
|
|
code_offset,
|
2019-08-14 11:34:09 -05:00
|
|
|
margin,
|
2019-08-13 21:09:28 -05:00
|
|
|
);
|
2017-09-16 12:24:08 -05:00
|
|
|
|
|
|
|
for (depth, style) in &multilines {
|
2019-08-14 11:34:09 -05:00
|
|
|
draw_multiline_line(
|
|
|
|
&mut buffer,
|
|
|
|
last_buffer_line_num,
|
|
|
|
width_offset,
|
|
|
|
*depth,
|
|
|
|
*style,
|
|
|
|
);
|
2017-09-16 12:24:08 -05:00
|
|
|
}
|
2017-04-06 14:18:18 -05:00
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2017-04-06 14:18:18 -05:00
|
|
|
|
2017-09-16 12:24:08 -05:00
|
|
|
multilines.extend(&to_add);
|
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// final step: take our styled buffer, render it, then output it
|
2018-02-28 09:17:44 -06:00
|
|
|
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
|
2016-07-11 15:02:03 -05:00
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
2017-12-08 20:35:55 -06:00
|
|
|
|
2019-02-08 04:45:53 -06:00
|
|
|
fn emit_suggestion_default(
|
|
|
|
&mut self,
|
2022-05-31 18:38:03 -05:00
|
|
|
span: &MultiSpan,
|
2019-02-08 04:45:53 -06:00
|
|
|
suggestion: &CodeSuggestion,
|
2022-03-26 02:27:43 -05:00
|
|
|
args: &FluentArgs<'_>,
|
2019-02-08 04:45:53 -06:00
|
|
|
level: &Level,
|
|
|
|
max_line_num_len: usize,
|
|
|
|
) -> io::Result<()> {
|
2022-02-18 17:48:49 -06:00
|
|
|
let Some(ref sm) = self.sm else {
|
|
|
|
return Ok(());
|
2019-09-30 16:01:22 -05:00
|
|
|
};
|
2020-01-16 20:27:18 -06:00
|
|
|
|
|
|
|
// Render the replacements for each suggestion
|
|
|
|
let suggestions = suggestion.splice_lines(&**sm);
|
2020-03-05 09:31:11 -06:00
|
|
|
debug!("emit_suggestion_default: suggestions={:?}", suggestions);
|
2020-01-16 20:27:18 -06:00
|
|
|
|
|
|
|
if suggestions.is_empty() {
|
2020-01-15 11:57:06 -06:00
|
|
|
// Suggestions coming from macros can have malformed spans. This is a heavy handed
|
|
|
|
// approach to avoid ICEs by ignoring the suggestion outright.
|
|
|
|
return Ok(());
|
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2019-09-30 16:01:22 -05:00
|
|
|
let mut buffer = StyledBuffer::new();
|
|
|
|
|
|
|
|
// Render the suggestion message
|
2020-09-17 05:27:04 -05:00
|
|
|
buffer.append(0, level.to_str(), Style::Level(*level));
|
|
|
|
buffer.append(0, ": ", Style::HeaderMsg);
|
|
|
|
|
2019-09-30 16:01:22 -05:00
|
|
|
self.msg_to_buffer(
|
|
|
|
&mut buffer,
|
|
|
|
&[(suggestion.msg.to_owned(), Style::NoStyle)],
|
2022-03-26 02:27:43 -05:00
|
|
|
args,
|
2019-09-30 16:01:22 -05:00
|
|
|
max_line_num_len,
|
|
|
|
"suggestion",
|
|
|
|
Some(Style::HeaderMsg),
|
|
|
|
);
|
|
|
|
|
|
|
|
let mut row_num = 2;
|
2021-06-21 21:07:19 -05:00
|
|
|
draw_col_separator_no_space(&mut buffer, 1, max_line_num_len + 1);
|
2019-10-13 23:48:39 -05:00
|
|
|
let mut notice_capitalization = false;
|
2021-06-21 21:07:19 -05:00
|
|
|
for (complete, parts, highlights, only_capitalization) in
|
|
|
|
suggestions.iter().take(MAX_SUGGESTIONS)
|
|
|
|
{
|
2019-10-13 23:48:39 -05:00
|
|
|
notice_capitalization |= only_capitalization;
|
2019-09-30 16:01:22 -05:00
|
|
|
|
2021-06-21 21:07:19 -05:00
|
|
|
let has_deletion = parts.iter().any(|p| p.is_deletion());
|
|
|
|
let is_multiline = complete.lines().count() > 1;
|
|
|
|
|
2022-05-31 18:38:03 -05:00
|
|
|
if let Some(span) = span.primary_span() {
|
|
|
|
// Compare the primary span of the diagnostic with the span of the suggestion
|
|
|
|
// being emitted. If they belong to the same file, we don't *need* to show the
|
|
|
|
// file name, saving in verbosity, but if it *isn't* we do need it, otherwise we're
|
|
|
|
// telling users to make a change but not clarifying *where*.
|
|
|
|
let loc = sm.lookup_char_pos(parts[0].span.lo());
|
|
|
|
if loc.file.name != sm.span_to_filename(span) && loc.file.name.is_real() {
|
|
|
|
buffer.puts(row_num - 1, 0, "--> ", Style::LineNumber);
|
|
|
|
buffer.append(
|
|
|
|
row_num - 1,
|
|
|
|
&format!(
|
|
|
|
"{}:{}:{}",
|
|
|
|
sm.filename_for_diagnostics(&loc.file.name),
|
|
|
|
sm.doctest_offset_line(&loc.file.name, loc.line),
|
|
|
|
loc.col.0 + 1,
|
|
|
|
),
|
|
|
|
Style::LineAndColumn,
|
|
|
|
);
|
|
|
|
for _ in 0..max_line_num_len {
|
|
|
|
buffer.prepend(row_num - 1, " ", Style::NoStyle);
|
|
|
|
}
|
|
|
|
row_num += 1;
|
|
|
|
}
|
|
|
|
}
|
2021-11-26 05:51:09 -06:00
|
|
|
let show_code_change = if has_deletion && !is_multiline {
|
|
|
|
DisplaySuggestion::Diff
|
|
|
|
} else if (parts.len() != 1 || parts[0].snippet.trim() != complete.trim())
|
|
|
|
&& !is_multiline
|
|
|
|
{
|
|
|
|
DisplaySuggestion::Underline
|
|
|
|
} else {
|
|
|
|
DisplaySuggestion::None
|
|
|
|
};
|
2021-06-21 21:07:19 -05:00
|
|
|
|
2021-11-26 05:51:09 -06:00
|
|
|
if let DisplaySuggestion::Diff = show_code_change {
|
2021-06-21 21:07:19 -05:00
|
|
|
row_num += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
let file_lines = sm
|
2020-01-15 11:57:06 -06:00
|
|
|
.span_to_lines(parts[0].span)
|
|
|
|
.expect("span_to_lines failed when emitting suggestion");
|
2019-09-30 16:01:22 -05:00
|
|
|
|
2021-06-21 21:07:19 -05:00
|
|
|
assert!(!file_lines.lines.is_empty() || parts[0].span.is_dummy());
|
2019-09-30 16:01:22 -05:00
|
|
|
|
|
|
|
let line_start = sm.lookup_char_pos(parts[0].span.lo()).line;
|
2022-05-31 18:38:03 -05:00
|
|
|
draw_col_separator_no_space(&mut buffer, row_num - 1, max_line_num_len + 1);
|
2019-09-30 16:01:22 -05:00
|
|
|
let mut lines = complete.lines();
|
2022-03-09 16:47:00 -06:00
|
|
|
if lines.clone().next().is_none() {
|
|
|
|
// Account for a suggestion to completely remove a line(s) with whitespace (#94192).
|
|
|
|
let line_end = sm.lookup_char_pos(parts[0].span.hi()).line;
|
|
|
|
for line in line_start..=line_end {
|
|
|
|
buffer.puts(
|
|
|
|
row_num - 1 + line - line_start,
|
|
|
|
0,
|
|
|
|
&self.maybe_anonymized(line),
|
|
|
|
Style::LineNumber,
|
|
|
|
);
|
|
|
|
buffer.puts(
|
|
|
|
row_num - 1 + line - line_start,
|
|
|
|
max_line_num_len + 1,
|
|
|
|
"- ",
|
|
|
|
Style::Removal,
|
|
|
|
);
|
|
|
|
buffer.puts(
|
|
|
|
row_num - 1 + line - line_start,
|
|
|
|
max_line_num_len + 3,
|
|
|
|
&normalize_whitespace(&*file_lines.file.get_line(line - 1).unwrap()),
|
|
|
|
Style::Removal,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
row_num += line_end - line_start;
|
|
|
|
}
|
2022-06-06 09:04:42 -05:00
|
|
|
let mut unhighlighted_lines = Vec::new();
|
|
|
|
for (line_pos, (line, highlight_parts)) in lines.by_ref().zip(highlights).enumerate() {
|
|
|
|
debug!(%line_pos, %line, ?highlight_parts);
|
|
|
|
|
2022-06-13 06:22:26 -05:00
|
|
|
// Remember lines that are not highlighted to hide them if needed
|
2022-06-06 09:04:42 -05:00
|
|
|
if highlight_parts.is_empty() {
|
|
|
|
unhighlighted_lines.push((line_pos, line));
|
|
|
|
continue;
|
2021-06-21 21:07:19 -05:00
|
|
|
}
|
|
|
|
|
2022-06-06 09:04:42 -05:00
|
|
|
match unhighlighted_lines.len() {
|
|
|
|
0 => (),
|
|
|
|
// Since we show first line, "..." line and last line,
|
|
|
|
// There is no reason to hide if there are 3 or less lines
|
|
|
|
// (because then we just replace a line with ... which is
|
|
|
|
// not helpful)
|
|
|
|
n if n <= 3 => unhighlighted_lines.drain(..).for_each(|(p, l)| {
|
2022-06-13 06:22:26 -05:00
|
|
|
self.draw_code_line(
|
|
|
|
&mut buffer,
|
|
|
|
&mut row_num,
|
|
|
|
&Vec::new(),
|
|
|
|
p,
|
|
|
|
l,
|
|
|
|
line_start,
|
|
|
|
show_code_change,
|
|
|
|
max_line_num_len,
|
|
|
|
&file_lines,
|
|
|
|
is_multiline,
|
|
|
|
)
|
2022-06-06 09:04:42 -05:00
|
|
|
}),
|
2022-06-13 06:22:26 -05:00
|
|
|
// Print first unhighlighted line, "..." and last unhighlighted line, like so:
|
|
|
|
//
|
|
|
|
// LL | this line was highlighted
|
|
|
|
// LL | this line is just for context
|
|
|
|
// ...
|
|
|
|
// LL | this line is just for context
|
|
|
|
// LL | this line was highlighted
|
2022-06-06 09:04:42 -05:00
|
|
|
_ => {
|
2022-06-13 06:22:26 -05:00
|
|
|
let last_line = unhighlighted_lines.pop();
|
|
|
|
let first_line = unhighlighted_lines.drain(..).next();
|
|
|
|
|
|
|
|
first_line.map(|(p, l)| {
|
|
|
|
self.draw_code_line(
|
|
|
|
&mut buffer,
|
|
|
|
&mut row_num,
|
|
|
|
&Vec::new(),
|
|
|
|
p,
|
|
|
|
l,
|
|
|
|
line_start,
|
|
|
|
show_code_change,
|
|
|
|
max_line_num_len,
|
|
|
|
&file_lines,
|
|
|
|
is_multiline,
|
|
|
|
)
|
|
|
|
});
|
|
|
|
|
2022-06-06 09:04:42 -05:00
|
|
|
buffer.puts(row_num, max_line_num_len - 1, "...", Style::LineNumber);
|
|
|
|
row_num += 1;
|
2022-06-13 06:22:26 -05:00
|
|
|
|
|
|
|
last_line.map(|(p, l)| {
|
|
|
|
self.draw_code_line(
|
|
|
|
&mut buffer,
|
|
|
|
&mut row_num,
|
|
|
|
&Vec::new(),
|
|
|
|
p,
|
|
|
|
l,
|
|
|
|
line_start,
|
|
|
|
show_code_change,
|
|
|
|
max_line_num_len,
|
|
|
|
&file_lines,
|
|
|
|
is_multiline,
|
|
|
|
)
|
|
|
|
});
|
2022-06-06 09:04:42 -05:00
|
|
|
}
|
2021-06-21 21:07:19 -05:00
|
|
|
}
|
2022-06-06 09:04:42 -05:00
|
|
|
|
2022-06-13 06:22:26 -05:00
|
|
|
self.draw_code_line(
|
|
|
|
&mut buffer,
|
|
|
|
&mut row_num,
|
|
|
|
highlight_parts,
|
|
|
|
line_pos,
|
|
|
|
line,
|
|
|
|
line_start,
|
|
|
|
show_code_change,
|
|
|
|
max_line_num_len,
|
|
|
|
&file_lines,
|
|
|
|
is_multiline,
|
|
|
|
)
|
2018-02-28 09:17:44 -06:00
|
|
|
}
|
2018-05-23 20:31:54 -05:00
|
|
|
|
2019-09-30 16:01:22 -05:00
|
|
|
// This offset and the ones below need to be signed to account for replacement code
|
|
|
|
// that is shorter than the original code.
|
2020-01-04 17:58:41 -06:00
|
|
|
let mut offsets: Vec<(usize, isize)> = Vec::new();
|
2019-09-30 16:01:22 -05:00
|
|
|
// Only show an underline in the suggestions if the suggestion is not the
|
|
|
|
// entirety of the code being shown and the displayed code is not multiline.
|
2021-11-26 05:51:09 -06:00
|
|
|
if let DisplaySuggestion::Diff | DisplaySuggestion::Underline = show_code_change {
|
2022-06-08 12:34:57 -05:00
|
|
|
draw_col_separator_no_space(&mut buffer, row_num, max_line_num_len + 1);
|
2019-09-30 16:01:22 -05:00
|
|
|
for part in parts {
|
|
|
|
let span_start_pos = sm.lookup_char_pos(part.span.lo()).col_display;
|
|
|
|
let span_end_pos = sm.lookup_char_pos(part.span.hi()).col_display;
|
|
|
|
|
|
|
|
// Do not underline the leading...
|
2019-12-24 16:38:22 -06:00
|
|
|
let start = part.snippet.len().saturating_sub(part.snippet.trim_start().len());
|
2019-09-30 16:01:22 -05:00
|
|
|
// ...or trailing spaces. Account for substitutions containing unicode
|
|
|
|
// characters.
|
2019-12-24 16:38:22 -06:00
|
|
|
let sub_len: usize = part
|
|
|
|
.snippet
|
|
|
|
.trim()
|
|
|
|
.chars()
|
2019-09-30 16:01:22 -05:00
|
|
|
.map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
|
|
|
|
.sum();
|
|
|
|
|
2020-01-04 17:58:41 -06:00
|
|
|
let offset: isize = offsets
|
|
|
|
.iter()
|
|
|
|
.filter_map(
|
|
|
|
|(start, v)| if span_start_pos <= *start { None } else { Some(v) },
|
|
|
|
)
|
|
|
|
.sum();
|
2019-09-30 16:01:22 -05:00
|
|
|
let underline_start = (span_start_pos + start) as isize + offset;
|
|
|
|
let underline_end = (span_start_pos + start + sub_len) as isize + offset;
|
2020-01-04 17:58:41 -06:00
|
|
|
assert!(underline_start >= 0 && underline_end >= 0);
|
2021-06-21 21:07:19 -05:00
|
|
|
let padding: usize = max_line_num_len + 3;
|
2019-09-30 16:01:22 -05:00
|
|
|
for p in underline_start..underline_end {
|
2021-11-26 05:51:09 -06:00
|
|
|
if let DisplaySuggestion::Underline = show_code_change {
|
2021-06-21 21:07:19 -05:00
|
|
|
// If this is a replacement, underline with `^`, if this is an addition
|
|
|
|
// underline with `+`.
|
2019-12-24 16:38:22 -06:00
|
|
|
buffer.putc(
|
|
|
|
row_num,
|
2021-06-21 21:07:19 -05:00
|
|
|
(padding as isize + p) as usize,
|
|
|
|
if part.is_addition(&sm) { '+' } else { '~' },
|
|
|
|
Style::Addition,
|
2019-12-24 16:38:22 -06:00
|
|
|
);
|
2018-05-22 23:05:35 -05:00
|
|
|
}
|
2017-06-28 01:16:04 -05:00
|
|
|
}
|
2021-11-26 05:51:09 -06:00
|
|
|
if let DisplaySuggestion::Diff = show_code_change {
|
2021-06-21 21:07:19 -05:00
|
|
|
// Colorize removal with red in diff format.
|
|
|
|
buffer.set_style_range(
|
|
|
|
row_num - 2,
|
|
|
|
(padding as isize + span_start_pos as isize) as usize,
|
|
|
|
(padding as isize + span_end_pos as isize) as usize,
|
|
|
|
Style::Removal,
|
|
|
|
true,
|
|
|
|
);
|
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2019-09-30 16:01:22 -05:00
|
|
|
// length of the code after substitution
|
2019-12-24 16:38:22 -06:00
|
|
|
let full_sub_len = part
|
|
|
|
.snippet
|
|
|
|
.chars()
|
2019-09-30 18:38:35 -05:00
|
|
|
.map(|ch| unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1))
|
2019-09-30 19:04:01 -05:00
|
|
|
.sum::<usize>() as isize;
|
2019-09-30 16:01:22 -05:00
|
|
|
|
|
|
|
// length of the code to be substituted
|
|
|
|
let snippet_len = span_end_pos as isize - span_start_pos as isize;
|
|
|
|
// For multiple substitutions, use the position *after* the previous
|
2020-01-04 17:58:41 -06:00
|
|
|
// substitutions have happened, only when further substitutions are
|
|
|
|
// located strictly after.
|
|
|
|
offsets.push((span_end_pos, full_sub_len - snippet_len));
|
2017-05-09 03:04:24 -05:00
|
|
|
}
|
2019-09-30 16:01:22 -05:00
|
|
|
row_num += 1;
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2019-09-30 16:01:22 -05:00
|
|
|
|
|
|
|
// if we elided some lines, add an ellipsis
|
|
|
|
if lines.next().is_some() {
|
|
|
|
buffer.puts(row_num, max_line_num_len - 1, "...", Style::LineNumber);
|
2021-11-26 05:51:09 -06:00
|
|
|
} else if let DisplaySuggestion::None = show_code_change {
|
2019-09-30 16:01:22 -05:00
|
|
|
draw_col_separator_no_space(&mut buffer, row_num, max_line_num_len + 1);
|
|
|
|
row_num += 1;
|
2017-05-10 06:19:29 -05:00
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2019-09-30 16:01:22 -05:00
|
|
|
if suggestions.len() > MAX_SUGGESTIONS {
|
2019-10-19 12:08:54 -05:00
|
|
|
let others = suggestions.len() - MAX_SUGGESTIONS;
|
2019-11-05 14:10:24 -06:00
|
|
|
let msg = format!("and {} other candidate{}", others, pluralize!(others));
|
2019-10-13 23:48:39 -05:00
|
|
|
buffer.puts(row_num, max_line_num_len + 3, &msg, Style::NoStyle);
|
|
|
|
} else if notice_capitalization {
|
|
|
|
let msg = "notice the capitalization difference";
|
|
|
|
buffer.puts(row_num, max_line_num_len + 3, &msg, Style::NoStyle);
|
2019-09-30 16:01:22 -05:00
|
|
|
}
|
|
|
|
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
|
2016-07-11 15:02:03 -05:00
|
|
|
Ok(())
|
|
|
|
}
|
2017-12-08 20:35:55 -06:00
|
|
|
|
2019-10-24 17:44:43 -05:00
|
|
|
fn emit_messages_default(
|
|
|
|
&mut self,
|
|
|
|
level: &Level,
|
2022-03-23 02:34:20 -05:00
|
|
|
message: &[(DiagnosticMessage, Style)],
|
2022-03-26 02:27:43 -05:00
|
|
|
args: &FluentArgs<'_>,
|
2019-10-24 17:44:43 -05:00
|
|
|
code: &Option<DiagnosticId>,
|
|
|
|
span: &MultiSpan,
|
|
|
|
children: &[SubDiagnostic],
|
|
|
|
suggestions: &[CodeSuggestion],
|
|
|
|
) {
|
2018-02-22 18:18:53 -06:00
|
|
|
let max_line_num_len = if self.ui_testing {
|
|
|
|
ANONYMIZED_LINE_NUM.len()
|
|
|
|
} else {
|
2021-02-26 15:00:16 -06:00
|
|
|
let n = self.get_max_line_num(span, children);
|
|
|
|
num_decimal_digits(n)
|
2018-02-22 18:18:53 -06:00
|
|
|
};
|
2016-07-11 15:02:03 -05:00
|
|
|
|
2022-03-26 02:27:43 -05:00
|
|
|
match self.emit_message_default(span, message, args, code, level, max_line_num_len, false) {
|
2016-07-11 15:02:03 -05:00
|
|
|
Ok(()) => {
|
2019-12-24 16:38:22 -06:00
|
|
|
if !children.is_empty()
|
|
|
|
|| suggestions.iter().any(|s| s.style != SuggestionStyle::CompletelyHidden)
|
|
|
|
{
|
2016-07-11 15:02:03 -05:00
|
|
|
let mut buffer = StyledBuffer::new();
|
2017-09-16 12:24:08 -05:00
|
|
|
if !self.short_message {
|
|
|
|
draw_col_separator_no_space(&mut buffer, 0, max_line_num_len + 1);
|
|
|
|
}
|
2021-03-23 18:09:11 -05:00
|
|
|
if let Err(e) = emit_to_destination(
|
2019-12-24 16:38:22 -06:00
|
|
|
&buffer.render(),
|
|
|
|
level,
|
|
|
|
&mut self.dst,
|
|
|
|
self.short_message,
|
|
|
|
) {
|
2021-03-23 18:09:11 -05:00
|
|
|
panic!("failed to emit error: {}", e)
|
2016-07-12 14:18:16 -05:00
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2017-09-16 12:24:08 -05:00
|
|
|
if !self.short_message {
|
|
|
|
for child in children {
|
2017-11-16 09:36:49 -06:00
|
|
|
let span = child.render_span.as_ref().unwrap_or(&child.span);
|
2020-03-22 07:36:56 -05:00
|
|
|
if let Err(err) = self.emit_message_default(
|
2019-02-08 04:45:53 -06:00
|
|
|
&span,
|
2022-03-26 02:27:43 -05:00
|
|
|
&child.message,
|
|
|
|
args,
|
2019-02-08 04:45:53 -06:00
|
|
|
&None,
|
|
|
|
&child.level,
|
|
|
|
max_line_num_len,
|
|
|
|
true,
|
|
|
|
) {
|
2020-03-22 07:36:56 -05:00
|
|
|
panic!("failed to emit error: {}", err);
|
2017-11-16 09:36:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
for sugg in suggestions {
|
2019-02-09 05:39:08 -06:00
|
|
|
if sugg.style == SuggestionStyle::CompletelyHidden {
|
|
|
|
// do not display this suggestion, it is meant only for tools
|
|
|
|
} else if sugg.style == SuggestionStyle::HideCodeAlways {
|
2020-03-22 07:36:56 -05:00
|
|
|
if let Err(e) = self.emit_message_default(
|
2019-02-08 04:45:53 -06:00
|
|
|
&MultiSpan::new(),
|
|
|
|
&[(sugg.msg.to_owned(), Style::HeaderMsg)],
|
2022-03-26 02:27:43 -05:00
|
|
|
args,
|
2019-02-08 04:45:53 -06:00
|
|
|
&None,
|
|
|
|
&Level::Help,
|
|
|
|
max_line_num_len,
|
|
|
|
true,
|
|
|
|
) {
|
2020-03-22 07:36:56 -05:00
|
|
|
panic!("failed to emit error: {}", e);
|
2019-02-08 04:45:53 -06:00
|
|
|
}
|
2022-05-31 18:38:03 -05:00
|
|
|
} else if let Err(e) = self.emit_suggestion_default(
|
|
|
|
span,
|
|
|
|
sugg,
|
|
|
|
args,
|
|
|
|
&Level::Help,
|
|
|
|
max_line_num_len,
|
|
|
|
) {
|
2020-03-22 07:36:56 -05:00
|
|
|
panic!("failed to emit error: {}", e);
|
|
|
|
};
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-10-18 12:43:02 -05:00
|
|
|
Err(e) => panic!("failed to emit error: {}", e),
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2018-02-27 12:33:02 -06:00
|
|
|
|
|
|
|
let mut dst = self.dst.writable();
|
2019-06-26 07:11:40 -05:00
|
|
|
match writeln!(dst) {
|
2016-07-12 14:18:16 -05:00
|
|
|
Err(e) => panic!("failed to emit error: {}", e),
|
2020-03-22 07:36:56 -05:00
|
|
|
_ => {
|
|
|
|
if let Err(e) = dst.flush() {
|
|
|
|
panic!("failed to emit error: {}", e)
|
|
|
|
}
|
|
|
|
}
|
2016-07-12 14:18:16 -05:00
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2022-06-13 06:22:26 -05:00
|
|
|
|
|
|
|
fn draw_code_line(
|
|
|
|
&self,
|
|
|
|
buffer: &mut StyledBuffer,
|
|
|
|
row_num: &mut usize,
|
|
|
|
highlight_parts: &Vec<SubstitutionHighlight>,
|
|
|
|
line_pos: usize,
|
|
|
|
line: &str,
|
|
|
|
line_start: usize,
|
|
|
|
show_code_change: DisplaySuggestion,
|
|
|
|
max_line_num_len: usize,
|
|
|
|
file_lines: &FileLines,
|
|
|
|
is_multiline: bool,
|
|
|
|
) {
|
|
|
|
// Print the span column to avoid confusion
|
|
|
|
buffer.puts(*row_num, 0, &self.maybe_anonymized(line_start + line_pos), Style::LineNumber);
|
|
|
|
if let DisplaySuggestion::Diff = show_code_change {
|
|
|
|
// Add the line number for both addition and removal to drive the point home.
|
|
|
|
//
|
|
|
|
// N - fn foo<A: T>(bar: A) {
|
|
|
|
// N + fn foo(bar: impl T) {
|
|
|
|
buffer.puts(
|
|
|
|
*row_num - 1,
|
|
|
|
0,
|
|
|
|
&self.maybe_anonymized(line_start + line_pos),
|
|
|
|
Style::LineNumber,
|
|
|
|
);
|
|
|
|
buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal);
|
|
|
|
buffer.puts(
|
|
|
|
*row_num - 1,
|
|
|
|
max_line_num_len + 3,
|
|
|
|
&normalize_whitespace(
|
|
|
|
&*file_lines.file.get_line(file_lines.lines[line_pos].line_index).unwrap(),
|
|
|
|
),
|
|
|
|
Style::NoStyle,
|
|
|
|
);
|
|
|
|
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
|
|
|
|
} else if is_multiline {
|
|
|
|
match &highlight_parts[..] {
|
|
|
|
[SubstitutionHighlight { start: 0, end }] if *end == line.len() => {
|
|
|
|
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
|
|
|
|
}
|
|
|
|
[] => {
|
|
|
|
draw_col_separator(buffer, *row_num, max_line_num_len + 1);
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
buffer.puts(*row_num, max_line_num_len + 1, "~ ", Style::Addition);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
draw_col_separator(buffer, *row_num, max_line_num_len + 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
// print the suggestion
|
|
|
|
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);
|
|
|
|
|
|
|
|
// Colorize addition/replacements with green.
|
|
|
|
for &SubstitutionHighlight { start, end } in highlight_parts {
|
|
|
|
// Account for tabs when highlighting (#87972).
|
|
|
|
let tabs: usize = line
|
|
|
|
.chars()
|
|
|
|
.take(start)
|
|
|
|
.map(|ch| match ch {
|
|
|
|
'\t' => 3,
|
|
|
|
_ => 0,
|
|
|
|
})
|
|
|
|
.sum();
|
|
|
|
buffer.set_style_range(
|
|
|
|
*row_num,
|
|
|
|
max_line_num_len + 3 + start + tabs,
|
|
|
|
max_line_num_len + 3 + end + tabs,
|
|
|
|
Style::Addition,
|
|
|
|
true,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
*row_num += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Clone, Copy)]
|
|
|
|
enum DisplaySuggestion {
|
|
|
|
Underline,
|
|
|
|
Diff,
|
|
|
|
None,
|
2015-12-14 19:11:27 -06:00
|
|
|
}
|
|
|
|
|
2019-05-25 14:45:51 -05:00
|
|
|
impl FileWithAnnotatedLines {
|
|
|
|
/// Preprocess all the annotations so that they are grouped by file and by line number
|
|
|
|
/// This helps us quickly iterate over the whole message (including secondary file spans)
|
|
|
|
pub fn collect_annotations(
|
2022-03-26 02:27:43 -05:00
|
|
|
emitter: &dyn Emitter,
|
|
|
|
args: &FluentArgs<'_>,
|
2019-05-25 14:45:51 -05:00
|
|
|
msp: &MultiSpan,
|
|
|
|
) -> Vec<FileWithAnnotatedLines> {
|
2019-12-24 16:38:22 -06:00
|
|
|
fn add_annotation_to_file(
|
|
|
|
file_vec: &mut Vec<FileWithAnnotatedLines>,
|
|
|
|
file: Lrc<SourceFile>,
|
|
|
|
line_index: usize,
|
|
|
|
ann: Annotation,
|
|
|
|
) {
|
2019-09-30 19:22:07 -05:00
|
|
|
for slot in file_vec.iter_mut() {
|
2019-05-25 14:45:51 -05:00
|
|
|
// Look through each of our files for the one we're adding to
|
|
|
|
if slot.file.name == file.name {
|
|
|
|
// See if we already have a line for it
|
|
|
|
for line_slot in &mut slot.lines {
|
|
|
|
if line_slot.line_index == line_index {
|
|
|
|
line_slot.annotations.push(ann);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// We don't have a line yet, create one
|
2019-12-24 16:38:22 -06:00
|
|
|
slot.lines.push(Line { line_index, annotations: vec![ann] });
|
2019-05-25 14:45:51 -05:00
|
|
|
slot.lines.sort();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// This is the first time we're seeing the file
|
|
|
|
file_vec.push(FileWithAnnotatedLines {
|
|
|
|
file,
|
2019-12-24 16:38:22 -06:00
|
|
|
lines: vec![Line { line_index, annotations: vec![ann] }],
|
2019-05-25 14:45:51 -05:00
|
|
|
multiline_depth: 0,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut output = vec![];
|
|
|
|
let mut multiline_annotations = vec![];
|
|
|
|
|
2022-03-26 02:27:43 -05:00
|
|
|
if let Some(ref sm) = emitter.source_map() {
|
2019-05-25 14:45:51 -05:00
|
|
|
for span_label in msp.span_labels() {
|
|
|
|
if span_label.span.is_dummy() {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
let lo = sm.lookup_char_pos(span_label.span.lo());
|
|
|
|
let mut hi = sm.lookup_char_pos(span_label.span.hi());
|
|
|
|
|
|
|
|
// Watch out for "empty spans". If we get a span like 6..6, we
|
|
|
|
// want to just display a `^` at 6, so convert that to
|
|
|
|
// 6..7. This is degenerate input, but it's best to degrade
|
|
|
|
// gracefully -- and the parser likes to supply a span like
|
|
|
|
// that for EOF, in particular.
|
|
|
|
|
|
|
|
if lo.col_display == hi.col_display && lo.line == hi.line {
|
|
|
|
hi.col_display += 1;
|
|
|
|
}
|
|
|
|
|
2019-09-30 17:08:51 -05:00
|
|
|
if lo.line != hi.line {
|
2019-05-25 14:45:51 -05:00
|
|
|
let ml = MultilineAnnotation {
|
|
|
|
depth: 1,
|
|
|
|
line_start: lo.line,
|
|
|
|
line_end: hi.line,
|
|
|
|
start_col: lo.col_display,
|
|
|
|
end_col: hi.col_display,
|
|
|
|
is_primary: span_label.is_primary,
|
2022-03-26 02:27:43 -05:00
|
|
|
label: span_label
|
|
|
|
.label
|
|
|
|
.as_ref()
|
|
|
|
.map(|m| emitter.translate_message(m, args).to_string()),
|
2019-05-25 14:45:51 -05:00
|
|
|
overlaps_exactly: false,
|
|
|
|
};
|
2019-09-30 17:08:51 -05:00
|
|
|
multiline_annotations.push((lo.file, ml));
|
2019-05-25 14:45:51 -05:00
|
|
|
} else {
|
2019-09-30 17:08:51 -05:00
|
|
|
let ann = Annotation {
|
|
|
|
start_col: lo.col_display,
|
|
|
|
end_col: hi.col_display,
|
|
|
|
is_primary: span_label.is_primary,
|
2022-03-26 02:27:43 -05:00
|
|
|
label: span_label
|
|
|
|
.label
|
|
|
|
.as_ref()
|
|
|
|
.map(|m| emitter.translate_message(m, args).to_string()),
|
2019-09-30 17:08:51 -05:00
|
|
|
annotation_type: AnnotationType::Singleline,
|
|
|
|
};
|
2019-05-25 14:45:51 -05:00
|
|
|
add_annotation_to_file(&mut output, lo.file, lo.line, ann);
|
2019-09-30 17:08:51 -05:00
|
|
|
};
|
2019-05-25 14:45:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find overlapping multiline annotations, put them at different depths
|
|
|
|
multiline_annotations.sort_by_key(|&(_, ref ml)| (ml.line_start, ml.line_end));
|
2019-09-30 17:12:36 -05:00
|
|
|
for (_, ann) in multiline_annotations.clone() {
|
|
|
|
for (_, a) in multiline_annotations.iter_mut() {
|
2019-05-25 14:45:51 -05:00
|
|
|
// Move all other multiline annotations overlapping with this one
|
|
|
|
// one level to the right.
|
2019-12-24 16:38:22 -06:00
|
|
|
if !(ann.same_span(a))
|
|
|
|
&& num_overlap(ann.line_start, ann.line_end, a.line_start, a.line_end, true)
|
2019-05-25 14:45:51 -05:00
|
|
|
{
|
|
|
|
a.increase_depth();
|
|
|
|
} else if ann.same_span(a) && &ann != a {
|
|
|
|
a.overlaps_exactly = true;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
let mut max_depth = 0; // max overlapping multiline spans
|
2019-05-25 14:45:51 -05:00
|
|
|
for (file, ann) in multiline_annotations {
|
2019-09-25 15:08:09 -05:00
|
|
|
max_depth = max(max_depth, ann.depth);
|
2019-05-25 14:45:51 -05:00
|
|
|
let mut end_ann = ann.as_end();
|
|
|
|
if !ann.overlaps_exactly {
|
|
|
|
// avoid output like
|
|
|
|
//
|
|
|
|
// | foo(
|
|
|
|
// | _____^
|
|
|
|
// | |_____|
|
|
|
|
// | || bar,
|
|
|
|
// | || );
|
|
|
|
// | || ^
|
|
|
|
// | ||______|
|
|
|
|
// | |______foo
|
|
|
|
// | baz
|
|
|
|
//
|
|
|
|
// and instead get
|
|
|
|
//
|
|
|
|
// | foo(
|
|
|
|
// | _____^
|
|
|
|
// | | bar,
|
|
|
|
// | | );
|
|
|
|
// | | ^
|
|
|
|
// | | |
|
|
|
|
// | |______foo
|
|
|
|
// | baz
|
|
|
|
add_annotation_to_file(&mut output, file.clone(), ann.line_start, ann.as_start());
|
|
|
|
// 4 is the minimum vertical length of a multiline span when presented: two lines
|
|
|
|
// of code and two lines of underline. This is not true for the special case where
|
|
|
|
// the beginning doesn't have an underline, but the current logic seems to be
|
|
|
|
// working correctly.
|
|
|
|
let middle = min(ann.line_start + 4, ann.line_end);
|
|
|
|
for line in ann.line_start + 1..middle {
|
|
|
|
// Every `|` that joins the beginning of the span (`___^`) to the end (`|__^`).
|
|
|
|
add_annotation_to_file(&mut output, file.clone(), line, ann.as_line());
|
|
|
|
}
|
2019-10-25 11:21:31 -05:00
|
|
|
let line_end = ann.line_end - 1;
|
|
|
|
if middle < line_end {
|
|
|
|
add_annotation_to_file(&mut output, file.clone(), line_end, ann.as_line());
|
2019-05-25 14:45:51 -05:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
end_ann.annotation_type = AnnotationType::Singleline;
|
|
|
|
}
|
|
|
|
add_annotation_to_file(&mut output, file, ann.line_end, end_ann);
|
|
|
|
}
|
|
|
|
for file_vec in output.iter_mut() {
|
|
|
|
file_vec.multiline_depth = max_depth;
|
|
|
|
}
|
|
|
|
output
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-26 15:00:16 -06:00
|
|
|
// instead of taking the String length or dividing by 10 while > 0, we multiply a limit by 10 until
|
|
|
|
// we're higher. If the loop isn't exited by the `return`, the last multiplication will wrap, which
|
|
|
|
// is OK, because while we cannot fit a higher power of 10 in a usize, the loop will end anyway.
|
|
|
|
// This is also why we need the max number of decimal digits within a `usize`.
|
|
|
|
fn num_decimal_digits(num: usize) -> usize {
|
|
|
|
#[cfg(target_pointer_width = "64")]
|
|
|
|
const MAX_DIGITS: usize = 20;
|
|
|
|
|
|
|
|
#[cfg(target_pointer_width = "32")]
|
|
|
|
const MAX_DIGITS: usize = 10;
|
|
|
|
|
|
|
|
#[cfg(target_pointer_width = "16")]
|
|
|
|
const MAX_DIGITS: usize = 5;
|
|
|
|
|
|
|
|
let mut lim = 10;
|
|
|
|
for num_digits in 1..MAX_DIGITS {
|
|
|
|
if num < lim {
|
|
|
|
return num_digits;
|
|
|
|
}
|
|
|
|
lim = lim.wrapping_mul(10);
|
|
|
|
}
|
|
|
|
MAX_DIGITS
|
|
|
|
}
|
|
|
|
|
2021-08-19 13:40:00 -05:00
|
|
|
// We replace some characters so the CLI output is always consistent and underlines aligned.
|
|
|
|
const OUTPUT_REPLACEMENTS: &[(char, &str)] = &[
|
|
|
|
('\t', " "), // We do our own tab replacement
|
2021-09-09 10:01:43 -05:00
|
|
|
('\u{200D}', ""), // Replace ZWJ with nothing for consistent terminal output of grapheme clusters.
|
2021-08-19 13:40:00 -05:00
|
|
|
('\u{202A}', ""), // The following unicode text flow control characters are inconsistently
|
2021-11-29 10:31:10 -06:00
|
|
|
('\u{202B}', ""), // supported across CLIs and can cause confusion due to the bytes on disk
|
2021-08-19 13:40:00 -05:00
|
|
|
('\u{202D}', ""), // not corresponding to the visible source code, so we replace them always.
|
|
|
|
('\u{202E}', ""),
|
|
|
|
('\u{2066}', ""),
|
|
|
|
('\u{2067}', ""),
|
|
|
|
('\u{2068}', ""),
|
|
|
|
('\u{202C}', ""),
|
|
|
|
('\u{2069}', ""),
|
|
|
|
];
|
|
|
|
|
2021-09-10 02:32:07 -05:00
|
|
|
fn normalize_whitespace(str: &str) -> String {
|
2021-08-19 13:40:00 -05:00
|
|
|
let mut s = str.to_string();
|
|
|
|
for (c, replacement) in OUTPUT_REPLACEMENTS {
|
|
|
|
s = s.replace(*c, replacement);
|
|
|
|
}
|
|
|
|
s
|
2020-12-05 18:39:07 -06:00
|
|
|
}
|
|
|
|
|
2016-07-11 15:02:03 -05:00
|
|
|
fn draw_col_separator(buffer: &mut StyledBuffer, line: usize, col: usize) {
|
|
|
|
buffer.puts(line, col, "| ", Style::LineNumber);
|
|
|
|
}
|
|
|
|
|
2016-07-12 15:10:01 -05:00
|
|
|
fn draw_col_separator_no_space(buffer: &mut StyledBuffer, line: usize, col: usize) {
|
2016-10-23 19:22:06 -05:00
|
|
|
draw_col_separator_no_space_with_style(buffer, line, col, Style::LineNumber);
|
|
|
|
}
|
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
fn draw_col_separator_no_space_with_style(
|
|
|
|
buffer: &mut StyledBuffer,
|
|
|
|
line: usize,
|
|
|
|
col: usize,
|
|
|
|
style: Style,
|
|
|
|
) {
|
2016-10-23 19:22:06 -05:00
|
|
|
buffer.putc(line, col, '|', style);
|
|
|
|
}
|
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
fn draw_range(
|
|
|
|
buffer: &mut StyledBuffer,
|
|
|
|
symbol: char,
|
|
|
|
line: usize,
|
|
|
|
col_from: usize,
|
|
|
|
col_to: usize,
|
|
|
|
style: Style,
|
|
|
|
) {
|
2016-10-23 19:22:06 -05:00
|
|
|
for col in col_from..col_to {
|
|
|
|
buffer.putc(line, col, symbol, style);
|
|
|
|
}
|
2016-07-12 15:10:01 -05:00
|
|
|
}
|
|
|
|
|
2016-07-11 15:02:03 -05:00
|
|
|
fn draw_note_separator(buffer: &mut StyledBuffer, line: usize, col: usize) {
|
|
|
|
buffer.puts(line, col, "= ", Style::LineNumber);
|
|
|
|
}
|
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
fn draw_multiline_line(
|
|
|
|
buffer: &mut StyledBuffer,
|
|
|
|
line: usize,
|
|
|
|
offset: usize,
|
|
|
|
depth: usize,
|
|
|
|
style: Style,
|
|
|
|
) {
|
2017-04-06 14:18:18 -05:00
|
|
|
buffer.putc(line, offset + depth - 1, '|', style);
|
|
|
|
}
|
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
fn num_overlap(
|
|
|
|
a_start: usize,
|
|
|
|
a_end: usize,
|
|
|
|
b_start: usize,
|
|
|
|
b_end: usize,
|
|
|
|
inclusive: bool,
|
|
|
|
) -> bool {
|
|
|
|
let extra = if inclusive { 1 } else { 0 };
|
|
|
|
(b_start..b_end + extra).contains(&a_start) || (a_start..a_end + extra).contains(&b_start)
|
2016-10-23 19:22:06 -05:00
|
|
|
}
|
2017-03-05 20:51:46 -06:00
|
|
|
fn overlaps(a1: &Annotation, a2: &Annotation, padding: usize) -> bool {
|
|
|
|
num_overlap(a1.start_col, a1.end_col + padding, a2.start_col, a2.end_col, false)
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
|
|
|
|
2019-12-24 16:38:22 -06:00
|
|
|
fn emit_to_destination(
|
|
|
|
rendered_buffer: &[Vec<StyledString>],
|
|
|
|
lvl: &Level,
|
|
|
|
dst: &mut Destination,
|
|
|
|
short_message: bool,
|
|
|
|
) -> io::Result<()> {
|
2019-02-06 12:53:01 -06:00
|
|
|
use crate::lock;
|
2016-08-25 15:28:35 -05:00
|
|
|
|
2018-02-27 12:33:02 -06:00
|
|
|
let mut dst = dst.writable();
|
|
|
|
|
2016-08-25 15:28:35 -05:00
|
|
|
// In order to prevent error message interleaving, where multiple error lines get intermixed
|
|
|
|
// when multiple compiler processes error simultaneously, we emit errors with additional
|
|
|
|
// steps.
|
|
|
|
//
|
|
|
|
// On Unix systems, we write into a buffered terminal rather than directly to a terminal. When
|
|
|
|
// the .flush() is called we take the buffer created from the buffered writes and write it at
|
|
|
|
// one shot. Because the Unix systems use ANSI for the colors, which is a text-based styling
|
|
|
|
// scheme, this buffered approach works and maintains the styling.
|
|
|
|
//
|
|
|
|
// On Windows, styling happens through calls to a terminal API. This prevents us from using the
|
|
|
|
// same buffering approach. Instead, we use a global Windows mutex, which we acquire long
|
|
|
|
// enough to output the full error message, then we release.
|
|
|
|
let _buffer_lock = lock::acquire_global_lock("rustc_errors");
|
2018-02-28 09:17:44 -06:00
|
|
|
for (pos, line) in rendered_buffer.iter().enumerate() {
|
2016-07-11 15:02:03 -05:00
|
|
|
for part in line {
|
2020-04-15 17:00:22 -05:00
|
|
|
dst.apply_style(*lvl, part.style)?;
|
2016-07-12 14:18:16 -05:00
|
|
|
write!(dst, "{}", part.text)?;
|
2018-02-27 12:33:02 -06:00
|
|
|
dst.reset()?;
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2018-02-28 09:17:44 -06:00
|
|
|
if !short_message && (!lvl.is_failure_note() || pos != rendered_buffer.len() - 1) {
|
2019-06-26 07:11:40 -05:00
|
|
|
writeln!(dst)?;
|
2017-09-16 12:24:08 -05:00
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
}
|
2016-08-25 15:28:35 -05:00
|
|
|
dst.flush()?;
|
2016-07-11 15:02:03 -05:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
pub enum Destination {
|
2018-02-27 12:33:02 -06:00
|
|
|
Terminal(StandardStream),
|
|
|
|
Buffered(BufferWriter),
|
2019-03-25 05:16:58 -05:00
|
|
|
// The bool denotes whether we should be emitting ansi color codes or not
|
2019-03-12 07:06:43 -05:00
|
|
|
Raw(Box<(dyn Write + Send)>, bool),
|
2015-12-14 19:11:27 -06:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:33:02 -06:00
|
|
|
pub enum WritableDst<'a> {
|
|
|
|
Terminal(&'a mut StandardStream),
|
|
|
|
Buffered(&'a mut BufferWriter, Buffer),
|
2019-03-12 07:06:43 -05:00
|
|
|
Raw(&'a mut (dyn Write + Send)),
|
|
|
|
ColoredRaw(Ansi<&'a mut (dyn Write + Send)>),
|
2016-08-25 15:28:35 -05:00
|
|
|
}
|
|
|
|
|
2015-12-14 19:11:27 -06:00
|
|
|
impl Destination {
|
2018-02-27 12:33:02 -06:00
|
|
|
fn from_stderr(color: ColorConfig) -> Destination {
|
|
|
|
let choice = color.to_color_choice();
|
|
|
|
// On Windows we'll be performing global synchronization on the entire
|
|
|
|
// system for emitting rustc errors, so there's no need to buffer
|
|
|
|
// anything.
|
|
|
|
//
|
|
|
|
// On non-Windows we rely on the atomicity of `write` to ensure errors
|
|
|
|
// don't get all jumbled up.
|
|
|
|
if cfg!(windows) {
|
|
|
|
Terminal(StandardStream::stderr(choice))
|
|
|
|
} else {
|
|
|
|
Buffered(BufferWriter::stderr(choice))
|
2016-08-25 15:28:35 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-21 13:27:44 -05:00
|
|
|
fn writable(&mut self) -> WritableDst<'_> {
|
2018-02-27 12:33:02 -06:00
|
|
|
match *self {
|
|
|
|
Destination::Terminal(ref mut t) => WritableDst::Terminal(t),
|
|
|
|
Destination::Buffered(ref mut t) => {
|
|
|
|
let buf = t.buffer();
|
|
|
|
WritableDst::Buffered(t, buf)
|
|
|
|
}
|
2019-03-12 07:06:43 -05:00
|
|
|
Destination::Raw(ref mut t, false) => WritableDst::Raw(t),
|
|
|
|
Destination::Raw(ref mut t, true) => WritableDst::ColoredRaw(Ansi::new(t)),
|
2015-12-14 21:42:05 -06:00
|
|
|
}
|
|
|
|
}
|
2020-11-11 09:44:02 -06:00
|
|
|
|
|
|
|
fn supports_color(&self) -> bool {
|
|
|
|
match *self {
|
|
|
|
Self::Terminal(ref stream) => stream.supports_color(),
|
|
|
|
Self::Buffered(ref buffer) => buffer.buffer().supports_color(),
|
|
|
|
Self::Raw(_, supports_color) => supports_color,
|
|
|
|
}
|
|
|
|
}
|
2018-02-27 12:33:02 -06:00
|
|
|
}
|
2015-12-14 21:42:05 -06:00
|
|
|
|
2018-02-27 12:33:02 -06:00
|
|
|
impl<'a> WritableDst<'a> {
|
2016-10-18 12:43:02 -05:00
|
|
|
fn apply_style(&mut self, lvl: Level, style: Style) -> io::Result<()> {
|
2018-02-27 12:33:02 -06:00
|
|
|
let mut spec = ColorSpec::new();
|
2016-04-20 13:56:01 -05:00
|
|
|
match style {
|
2021-06-21 21:07:19 -05:00
|
|
|
Style::Addition => {
|
|
|
|
spec.set_fg(Some(Color::Green)).set_intense(true);
|
|
|
|
}
|
|
|
|
Style::Removal => {
|
|
|
|
spec.set_fg(Some(Color::Red)).set_intense(true);
|
|
|
|
}
|
2017-07-02 15:46:38 -05:00
|
|
|
Style::LineAndColumn => {}
|
2016-04-20 13:56:01 -05:00
|
|
|
Style::LineNumber => {
|
2018-02-27 12:33:02 -06:00
|
|
|
spec.set_bold(true);
|
|
|
|
spec.set_intense(true);
|
2016-08-31 17:19:43 -05:00
|
|
|
if cfg!(windows) {
|
2018-02-27 12:33:02 -06:00
|
|
|
spec.set_fg(Some(Color::Cyan));
|
2016-08-31 17:19:43 -05:00
|
|
|
} else {
|
2018-02-27 12:33:02 -06:00
|
|
|
spec.set_fg(Some(Color::Blue));
|
2016-08-31 17:19:43 -05:00
|
|
|
}
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
2016-07-11 15:02:03 -05:00
|
|
|
Style::Quotation => {}
|
2019-05-23 01:01:38 -05:00
|
|
|
Style::MainHeaderMsg => {
|
2018-02-27 12:33:02 -06:00
|
|
|
spec.set_bold(true);
|
2016-08-31 17:19:43 -05:00
|
|
|
if cfg!(windows) {
|
2019-12-24 16:38:22 -06:00
|
|
|
spec.set_intense(true).set_fg(Some(Color::White));
|
2016-08-31 17:19:43 -05:00
|
|
|
}
|
2016-05-16 07:50:01 -05:00
|
|
|
}
|
2016-04-20 13:56:01 -05:00
|
|
|
Style::UnderlinePrimary | Style::LabelPrimary => {
|
2018-02-27 12:33:02 -06:00
|
|
|
spec = lvl.color();
|
|
|
|
spec.set_bold(true);
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
2019-12-24 16:38:22 -06:00
|
|
|
Style::UnderlineSecondary | Style::LabelSecondary => {
|
|
|
|
spec.set_bold(true).set_intense(true);
|
2016-08-31 17:19:43 -05:00
|
|
|
if cfg!(windows) {
|
2018-02-27 12:33:02 -06:00
|
|
|
spec.set_fg(Some(Color::Cyan));
|
2016-08-31 17:19:43 -05:00
|
|
|
} else {
|
2018-02-27 12:33:02 -06:00
|
|
|
spec.set_fg(Some(Color::Blue));
|
2016-08-31 17:19:43 -05:00
|
|
|
}
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
2019-12-24 16:38:22 -06:00
|
|
|
Style::HeaderMsg | Style::NoStyle => {}
|
2018-02-27 12:33:02 -06:00
|
|
|
Style::Level(lvl) => {
|
|
|
|
spec = lvl.color();
|
|
|
|
spec.set_bold(true);
|
|
|
|
}
|
|
|
|
Style::Highlight => {
|
|
|
|
spec.set_bold(true);
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
|
|
|
}
|
2018-02-27 12:33:02 -06:00
|
|
|
self.set_color(&spec)
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:33:02 -06:00
|
|
|
fn set_color(&mut self, color: &ColorSpec) -> io::Result<()> {
|
2016-04-20 13:56:01 -05:00
|
|
|
match *self {
|
2018-02-27 12:33:02 -06:00
|
|
|
WritableDst::Terminal(ref mut t) => t.set_color(color),
|
|
|
|
WritableDst::Buffered(_, ref mut t) => t.set_color(color),
|
2019-03-12 07:06:43 -05:00
|
|
|
WritableDst::ColoredRaw(ref mut t) => t.set_color(color),
|
2019-12-24 16:38:22 -06:00
|
|
|
WritableDst::Raw(_) => Ok(()),
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-27 12:33:02 -06:00
|
|
|
fn reset(&mut self) -> io::Result<()> {
|
2016-04-20 13:56:01 -05:00
|
|
|
match *self {
|
2018-02-27 12:33:02 -06:00
|
|
|
WritableDst::Terminal(ref mut t) => t.reset(),
|
|
|
|
WritableDst::Buffered(_, ref mut t) => t.reset(),
|
2019-03-12 07:06:43 -05:00
|
|
|
WritableDst::ColoredRaw(ref mut t) => t.reset(),
|
2018-02-27 12:33:02 -06:00
|
|
|
WritableDst::Raw(_) => Ok(()),
|
2016-04-20 13:56:01 -05:00
|
|
|
}
|
|
|
|
}
|
2015-12-14 19:11:27 -06:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:33:02 -06:00
|
|
|
impl<'a> Write for WritableDst<'a> {
|
2015-12-14 19:11:27 -06:00
|
|
|
fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
|
|
|
|
match *self {
|
2018-02-27 12:33:02 -06:00
|
|
|
WritableDst::Terminal(ref mut t) => t.write(bytes),
|
|
|
|
WritableDst::Buffered(_, ref mut buf) => buf.write(bytes),
|
|
|
|
WritableDst::Raw(ref mut w) => w.write(bytes),
|
2019-03-12 07:06:43 -05:00
|
|
|
WritableDst::ColoredRaw(ref mut t) => t.write(bytes),
|
2015-12-14 19:11:27 -06:00
|
|
|
}
|
|
|
|
}
|
2018-02-27 12:33:02 -06:00
|
|
|
|
2015-12-14 19:11:27 -06:00
|
|
|
fn flush(&mut self) -> io::Result<()> {
|
|
|
|
match *self {
|
2018-02-27 12:33:02 -06:00
|
|
|
WritableDst::Terminal(ref mut t) => t.flush(),
|
|
|
|
WritableDst::Buffered(_, ref mut buf) => buf.flush(),
|
|
|
|
WritableDst::Raw(ref mut w) => w.flush(),
|
2019-03-12 07:06:43 -05:00
|
|
|
WritableDst::ColoredRaw(ref mut w) => w.flush(),
|
2018-02-27 12:33:02 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Drop for WritableDst<'a> {
|
|
|
|
fn drop(&mut self) {
|
2020-03-22 07:36:56 -05:00
|
|
|
if let WritableDst::Buffered(ref mut dst, ref mut buf) = self {
|
|
|
|
drop(dst.print(buf));
|
2015-12-14 19:11:27 -06:00
|
|
|
}
|
|
|
|
}
|
2016-08-27 04:21:36 -05:00
|
|
|
}
|
2019-10-14 16:30:59 -05:00
|
|
|
|
|
|
|
/// Whether the original and suggested code are visually similar enough to warrant extra wording.
|
2019-11-15 07:32:31 -06:00
|
|
|
pub fn is_case_difference(sm: &SourceMap, suggested: &str, sp: Span) -> bool {
|
2019-10-14 16:30:59 -05:00
|
|
|
// FIXME: this should probably be extended to also account for `FO0` → `FOO` and unicode.
|
2020-01-28 12:57:03 -06:00
|
|
|
let found = match sm.span_to_snippet(sp) {
|
|
|
|
Ok(snippet) => snippet,
|
|
|
|
Err(e) => {
|
2021-10-07 12:48:48 -05:00
|
|
|
warn!(error = ?e, "Invalid span {:?}", sp);
|
2020-01-28 12:57:03 -06:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
};
|
2019-10-14 16:30:59 -05:00
|
|
|
let ascii_confusables = &['c', 'f', 'i', 'k', 'o', 's', 'u', 'v', 'w', 'x', 'y', 'z'];
|
2019-10-14 16:48:45 -05:00
|
|
|
// All the chars that differ in capitalization are confusable (above):
|
2021-03-08 17:32:41 -06:00
|
|
|
let confusable = iter::zip(found.chars(), suggested.chars())
|
2019-12-24 16:38:22 -06:00
|
|
|
.filter(|(f, s)| f != s)
|
|
|
|
.all(|(f, s)| (ascii_confusables.contains(&f) || ascii_confusables.contains(&s)));
|
2019-10-14 16:30:59 -05:00
|
|
|
confusable && found.to_lowercase() == suggested.to_lowercase()
|
|
|
|
// FIXME: We sometimes suggest the same thing we already have, which is a
|
|
|
|
// bug, but be defensive against that here.
|
|
|
|
&& found != suggested
|
|
|
|
}
|