git.iko.soy/helix
on master help sign in
Rename padding to spacer, remove by default
255c173Blaž Hrastnik
book/src/configuration.md+1−1
compare with master
unifiedsplit
@@ -38,7 +38,7 @@ hidden = false
38| `shell` | Shell to use when running external commands. | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |
38| `shell` | Shell to use when running external commands. | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |
39| `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |
39| `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |
40| `cursorline` | Highlight all lines with a cursor. | `false` |
40| `cursorline` | Highlight all lines with a cursor. | `false` |
41−| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `padding`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "line-numbers", "padding"]` |
41+| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "line-numbers"]` |
42| `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
42| `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
43| `auto-format` | Enable automatic formatting on save. | `true` |
43| `auto-format` | Enable automatic formatting on save. | `true` |
44| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant. | `400` |
44| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant. | `400` |
helix-view/src/editor.rs+2−6
@@ -336,7 +336,7 @@ pub enum GutterType {
336 /// Show line numbers
336 /// Show line numbers
337 LineNumbers,
337 LineNumbers,
338 /// Show one blank space
338 /// Show one blank space
339− Padding,
339+ Spacer,
340}
340}
341
341
342impl std::str::FromStr for GutterType {
342impl std::str::FromStr for GutterType {
@@ -473,11 +473,7 @@ impl Default for Config {
473 },
473 },
474 line_number: LineNumber::Absolute,
474 line_number: LineNumber::Absolute,
475 cursorline: false,
475 cursorline: false,
476− gutters: vec![
477− GutterType::Diagnostics,
476+ gutters: vec![GutterType::Diagnostics, GutterType::LineNumbers],
478− GutterType::LineNumbers,
479− GutterType::Padding,
480− ],
481 middle_click_paste: true,
477 middle_click_paste: true,
482 auto_pairs: AutoPairConfig::default(),
478 auto_pairs: AutoPairConfig::default(),
483 auto_completion: true,
479 auto_completion: true,
helix-view/src/view.rs+2−2
@@ -106,14 +106,14 @@ impl View {
106 let width = match gutter_type {
106 let width = match gutter_type {
107 GutterType::Diagnostics => 1,
107 GutterType::Diagnostics => 1,
108 GutterType::LineNumbers => 5,
108 GutterType::LineNumbers => 5,
109− GutterType::Padding => 1,
109+ GutterType::Spacer => 1,
110 };
110 };
111 gutter_offset += width;
111 gutter_offset += width;
112 gutters.push((
112 gutters.push((
113 match gutter_type {
113 match gutter_type {
114 GutterType::Diagnostics => gutter::diagnostics_or_breakpoints,
114 GutterType::Diagnostics => gutter::diagnostics_or_breakpoints,
115 GutterType::LineNumbers => gutter::line_numbers,
115 GutterType::LineNumbers => gutter::line_numbers,
116− GutterType::Padding => gutter::padding,
116+ GutterType::Spacer => gutter::padding,
117 },
117 },
118 width as usize,
118 width as usize,
119 ));
119 ));