Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'src/rnd.rs')
| -rw-r--r-- | src/rnd.rs | 39 |
1 files changed, 24 insertions, 15 deletions
@@ -262,14 +262,23 @@ pub fn render( .flat_map(|diag| { let sev = diag .severity - .unwrap_or(DiagnosticSeverity::ERROR); + .unwrap_or(DiagnosticSeverity::Error); let sev_ = match sev { - DiagnosticSeverity::ERROR => EType::Error, - DiagnosticSeverity::WARNING => EType::Warning, - DiagnosticSeverity::HINT => EType::Hint, + DiagnosticSeverity::Error => EType::Error, + DiagnosticSeverity::Warning => EType::Warning, + DiagnosticSeverity::Hint => EType::Hint, _ => EType::Info, }; - once((diag.range, &*diag.message, sev_)).chain( + once(( + diag.range, + match &diag.message { + Message::String(x) => &**x, + Message::MarkupContent(x) => + unimplemented!(), + }, + sev_, + )) + .chain( diag.related_information .iter() .flatten() @@ -285,7 +294,7 @@ pub fn render( }) .for_each(|(mut r, m, sev)| { if let EType::Related(x) = sev - && x != DiagnosticSeverity::ERROR + && x != DiagnosticSeverity::Error { return; } @@ -301,7 +310,7 @@ pub fn render( | EType::Hint | EType::Info => col!("#9469242c"), EType::Related( - DiagnosticSeverity::ERROR, + DiagnosticSeverity::Error, ) => col!("#dfbfff26"), EType::Related(_) => col!("#ffad6625"), }); @@ -342,7 +351,7 @@ pub fn render( col!("#ff942f1b", "#f26462") } EType::Related( - DiagnosticSeverity::WARNING, + DiagnosticSeverity::Warning, ) => { col!("#dfbfff26", "#DFBFFF") } @@ -581,13 +590,13 @@ pub fn render( continue; } - let r = if let Some(r) = e.sticky_range { - let r = text.l_range(r).unwrap(); - text.char_to_line(r.start)..=text.char_to_line(r.end) - } else { - let x = text.char_to_line(p); - x..=x - }; + // let r = if let Some(r) = e.sticky_range { + // let r = text.l_range(r).unwrap(); + // text.char_to_line(r.start)..=text.char_to_line(r.end) + // } else { + let x = text.char_to_line(p); + let r = x..=x; + // }; let d = Cell { style: Style { |