3017141 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Gutter functions

3017141Blaž Hrastnik5 years ago

helix-core/src/diagnostic.rs+2−2

compare with master

unifiedsplit

@@ -1,7 +1,7 @@

1//! LSP diagnostic utility types.

3/// Describes the severity level of a [`Diagnostic`].

4−#[derive(Debug, Eq, PartialEq)]

4+#[derive(Debug, Clone, Copy, Eq, PartialEq)]

5pub enum Severity {

6 Error,

7 Warning,

@@ -17,7 +17,7 @@ pub struct Range {

17}

19/// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.91.0/lsp_types/struct.Diagnostic.html)

20−#[derive(Debug)]

20+#[derive(Debug, Clone)]

21pub struct Diagnostic {

22 pub range: Range,

23 pub line: usize,

helix-term/src/ui/editor.rs+91−59

@@ -17,7 +17,7 @@ use helix_core::{

17};

18use helix_view::{

19 document::{Mode, SCRATCH_BUFFER_NAME},

20− editor::LineNumber,

20+ editor::{Config, LineNumber},

21 graphics::{CursorKind, Modifier, Rect, Style},

22 info::Info,

23 input::KeyEvent,

@@ -412,22 +412,6 @@ impl EditorView {

412 let text = doc.text().slice(..);

413 let last_line = view.last_line(doc);

414

415− let linenr = theme.get("ui.linenr");

416− let linenr_select: Style = theme.try_get("ui.linenr.selected").unwrap_or(linenr);

417−

418− let warning = theme.get("warning");

419− let error = theme.get("error");

420− let info = theme.get("info");

421− let hint = theme.get("hint");

422−

423− // Whether to draw the line number for the last line of the

424− // document or not. We only draw it if it's not an empty line.

425− let draw_last = text.line_to_byte(last_line) < text.len_bytes();

426−

427− let current_line = doc

428− .text()

429− .char_to_line(doc.selection(view.id).primary().cursor(text));

430−

431 // it's used inside an iterator so the collect isn't needless:

415 // it's used inside an iterator so the collect isn't needless:

432 // https://github.com/rust-lang/rust-clippy/issues/6164

416 // https://github.com/rust-lang/rust-clippy/issues/6164

433 #[allow(clippy::needless_collect)]

417 #[allow(clippy::needless_collect)]

@@ -437,51 +421,99 @@ impl EditorView {

437 .map(|range| range.cursor_line(text))

421 .map(|range| range.cursor_line(text))

438 .collect();

422 .collect();

439

423

440− for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {

424+ fn diagnostic(

425+ doc: &Document,

426+ _view: &View,

427+ theme: &Theme,

428+ _config: &Config,

429+ _is_focused: bool,

430+ _width: usize,

431+ ) -> GutterFn {

432+ let warning = theme.get("warning");

433+ let error = theme.get("error");

434+ let info = theme.get("info");

435+ let hint = theme.get("hint");

436+ let diagnostics = doc.diagnostics().to_vec(); // TODO

437+

438+ Box::new(move |line: usize, _selected: bool| {

441− use helix_core::diagnostic::Severity;

439+ use helix_core::diagnostic::Severity;

442− if let Some(diagnostic) = doc.diagnostics().iter().find(|d| d.line == line) {

440+ if let Some(diagnostic) = diagnostics.iter().find(|d| d.line == line) {

443− surface.set_stringn(

441+ return Some((

444− viewport.x,

445− viewport.y + i as u16,

446− "●",

442+ "●".to_string(),

447− 1,

448− match diagnostic.severity {

443+ match diagnostic.severity {

449− Some(Severity::Error) => error,

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

450− Some(Severity::Warning) | None => warning,

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

451− Some(Severity::Info) => info,

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

452− Some(Severity::Hint) => hint,

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

453− },

448+ },

454− );

449+ ));

450+ }

451+ None

455− }

452+ })

453+ }

456

454

457− let selected = cursors.contains(&line);

455+ fn line_number(

456+ doc: &Document,

457+ view: &View,

458+ theme: &Theme,

459+ config: &Config,

460+ is_focused: bool,

461+ width: usize,

462+ ) -> GutterFn {

463+ let text = doc.text().slice(..);

464+ let last_line = view.last_line(doc);

465+ // Whether to draw the line number for the last line of the

466+ // document or not. We only draw it if it's not an empty line.

467+ let draw_last = text.line_to_byte(last_line) < text.len_bytes();

458

468

469+ let linenr = theme.get("ui.linenr");

470+ let linenr_select: Style = theme.try_get("ui.linenr.selected").unwrap_or(linenr);

471+

472+ let current_line = doc

473+ .text()

474+ .char_to_line(doc.selection(view.id).primary().cursor(text));

475+

476+ let config = config.line_number;

477+

478+ Box::new(move |line: usize, selected: bool| {

459− let text = if line == last_line && !draw_last {

479+ if line == last_line && !draw_last {

460− " ~".into()

480+ Some((format!("{:>1$}", '~', width), linenr))

461− } else {

462− let line = match config.line_number {

463− LineNumber::Absolute => line + 1,

464− LineNumber::Relative => {

465− if current_line == line {

466− line + 1

467− } else {

468− abs_diff(current_line, line)

469− }

470− }

471− };

472− format!("{:>5}", line)

473− };

474− surface.set_stringn(

475− viewport.x + 1,

476− viewport.y + i as u16,

477− text,

478− 5,

479− if selected && is_focused {

480− linenr_select

481 } else {

482+ let line = match config {

483+ LineNumber::Absolute => line + 1,

484+ LineNumber::Relative => {

485+ if current_line == line {

486+ line + 1

487+ } else {

488+ abs_diff(current_line, line)

489+ }

490+ }

491+ };

492+ let style = if selected && is_focused {

493+ linenr_select

494+ } else {

482− linenr

495+ linenr

496+ };

497+ Some((format!("{:>1$}", line, width), style))

483− },

498+ }

484− );

499+ })

500+ }

501+

502+ type GutterFn = Box<dyn Fn(usize, bool) -> Option<(String, Style)>>;

503+ type Gutter = fn(&Document, &View, &Theme, &Config, bool, usize) -> GutterFn;

504+ let gutters: &[(Gutter, usize)] = &[(diagnostic, 1), (line_number, 5)];

505+

506+ let mut offset = 0;

507+ for (constructor, width) in gutters {

508+ let gutter = constructor(doc, view, theme, config, is_focused, *width);

509+ for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {

510+ let selected = cursors.contains(&line);

511+

512+ if let Some((text, style)) = gutter(line, selected) {

513+ surface.set_stringn(viewport.x + offset, viewport.y + i as u16, text, 5, style);

514+ }

515+ }

516+ offset += *width as u16;

485 }

517 }

486 }

518 }

487

519

helix-view/src/editor.rs+1−1

@@ -106,7 +106,7 @@ pub struct Config {

106 pub file_picker: FilePickerConfig,

107}

108

109−#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]

109+#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize)]

110#[serde(rename_all = "kebab-case")]

111pub enum LineNumber {

112 /// Show absolute line number