87e3cd3 · helix · git.iko.soy

git.iko.soy/helix

ui: Render diagnostic errors in sideline.

commit87e3cd3df283a6da055488bbea60637713bd1f35 authorBlaž Hrastnik <blaz@mxxn.io> dateMon 15 Mar 2021, 16:19 (6 years ago) parent1abf295

4 files changed+69−7

compare with master

unifiedsplit

helix-core/src/diagnostic.rs+5−3 helix-lsp/src/lib.rs+1−1 helix-term/src/application.rs+5−2 helix-term/src/ui/editor.rs+58−1

helix-core/src/diagnostic.rs+5−3

@@ -1,5 +1,3 @@

1−use crate::Range;

2−

31pub enum Severity {

42 Error,

53 Warning,

@@ -7,8 +5,12 @@ pub enum Severity {

75 Hint,

86}

8+pub struct Range {

9+ pub start: usize,

10+ pub end: usize,

11+}

1012pub struct Diagnostic {

11− pub range: (usize, usize),

13+ pub range: Range,

1214 pub line: usize,

1315 pub message: String,

1416 pub severity: Option<Severity>,

helix-lsp/src/lib.rs+1−1

@@ -35,7 +35,7 @@ pub mod util {

3535 pub fn lsp_pos_to_pos(doc: RopeSlice, pos: lsp::Position) -> usize {

3636 let line = doc.line_to_char(pos.line as usize);

3737 let line_start = doc.char_to_utf16_cu(line);

38− doc.utf16_cu_to_char(pos.character as usize + line_start)

38+ doc.utf16_cu_to_char(line_start + pos.character as usize)

3939 }

4040 pub fn pos_to_lsp_pos(doc: RopeSlice, pos: usize) -> lsp::Position {

4141 let line = doc.char_to_line(pos);

helix-term/src/application.rs+5−2

@@ -140,14 +140,17 @@ impl Application {

140140 .into_iter()

141141 .map(|diagnostic| {

142142 use helix_core::diagnostic::Severity::*;

143− use helix_core::{diagnostic::Severity, Diagnostic};

143+ use helix_core::{

144+ diagnostic::{Range, Severity},

145+ Diagnostic,

146+ };

144147 use helix_lsp::{lsp, util::lsp_pos_to_pos};

145148 use lsp::DiagnosticSeverity;

146149 let start = lsp_pos_to_pos(doc, diagnostic.range.start);

147150 let end = lsp_pos_to_pos(doc, diagnostic.range.end);

148151

149152 Diagnostic {

150− range: (start, end),

153+ range: Range { start, end },

151154 line: diagnostic.range.start.line as usize,

152155 message: diagnostic.message,

153156 severity: diagnostic.severity.map(

helix-term/src/ui/editor.rs+58−1

@@ -56,6 +56,8 @@ impl EditorView {

5656 // TODO: this seems to prevent setting style later

5757 // surface.set_style(viewport, theme.get("ui.background"));

5858

59+ self.render_diagnostics(&view.doc, area, surface, theme, is_focused);

60+

5961 let area = Rect::new(

6062 viewport.x,

6163 viewport.y + viewport.height.saturating_sub(1),

@@ -166,7 +168,8 @@ impl EditorView {

166168

167169 // ugh,interleave highlight spans with diagnostic spans

168170 let is_diagnostic = view.doc.diagnostics.iter().any(|diagnostic| {

169− diagnostic.range.0 <= char_index && diagnostic.range.1 > char_index

171+ diagnostic.range.start <= char_index

172+ && diagnostic.range.end > char_index

170173 });

171174

172175 let style = if is_diagnostic {

@@ -316,6 +319,60 @@ impl EditorView {

316319 }

317320 }

318321

322+ pub fn render_diagnostics(

323+ &self,

324+ doc: &Document,

325+ viewport: Rect,

326+ surface: &mut Surface,

327+ theme: &Theme,

328+ is_focused: bool,

329+ ) {

330+ use helix_core::diagnostic::Severity;

331+ use tui::{

332+ layout::Alignment,

333+ text::Text,

334+ widgets::{Paragraph, Widget},

335+ };

336+

337+ let cursor = doc.selection().cursor();

338+ let line = doc.text().char_to_line(cursor);

339+

340+ let diagnostics = doc.diagnostics.iter().filter(|diagnostic| {

341+ diagnostic.range.start <= cursor && diagnostic.range.end >= cursor

342+ });

343+

344+ let warning: Style = theme.get("warning");

345+ let error: Style = theme.get("error");

346+ let info: Style = theme.get("info");

347+ let hint: Style = theme.get("hint");

348+

349+ // Vec::with_capacity(diagnostics.len()); // rough estimate

350+ let mut lines = Vec::new();

351+ for diagnostic in diagnostics {

352+ let text = Text::styled(

353+ &diagnostic.message,

354+ match diagnostic.severity {

355+ Some(Severity::Error) => error,

356+ Some(Severity::Warning) | None => warning,

357+ Some(Severity::Info) => info,

358+ Some(Severity::Hint) => hint,

359+ },

360+ );

361+ lines.extend(text.lines);

362+ }

363+

364+ let paragraph = Paragraph::new(lines).alignment(Alignment::Right);

365+ paragraph.render(

366+ Rect::new(

367+ viewport.x + viewport.width - 80 - 1,

368+ viewport.y as u16 + 1,

369+ 80,

370+ 15,

371+ ),

372+ surface,

373+ );

374+ }

375+

319376 pub fn render_statusline(

320377 &self,

321378 doc: &Document,