Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

initial implementation of bufferline #2759

Merged
merged 23 commits into from
Sep 2, 2022
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions book/src/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ hidden = false
| `auto-info` | Whether to display infoboxes | `true` |
| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. | `false` |
| `rulers` | List of column positions at which to display the rulers. Can be overridden by language specific `rulers` in `languages.toml` file. | `[]` |
| `bufferline` | Renders a line at the top of the editor displaying open buffers. Can be `always`, `never` or `multiple` (only shown if more than one buffer is in use) | `multiple` |
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
aaron404 marked this conversation as resolved.
Show resolved Hide resolved

### `[editor.lsp]` Section

Expand Down
59 changes: 56 additions & 3 deletions helix-term/src/ui/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use helix_view::{
keyboard::{KeyCode, KeyModifiers},
Document, Editor, Theme, View,
};
use std::borrow::Cow;
use std::{borrow::Cow, path::PathBuf};

use crossterm::event::{Event, MouseButton, MouseEvent, MouseEventKind};
use tui::buffer::Buffer as Surface;
Expand Down Expand Up @@ -132,7 +132,7 @@ impl EditorView {
highlights,
&editor.config(),
);
Self::render_gutter(editor, doc, view, view.area, surface, theme, is_focused);
Self::render_gutter(editor, doc, view, area, surface, theme, is_focused);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the change here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I honestly cannot remember.. I have reverted it for now

Self::render_rulers(editor, doc, view, inner, surface, theme);

if is_focused {
Expand Down Expand Up @@ -578,6 +578,40 @@ impl EditorView {
}
}

/// Render bufferline at the top
pub fn render_bufferline(editor: &Editor, viewport: Rect, surface: &mut Surface) {
let pb = PathBuf::from(SCRATCH_BUFFER_NAME); // default filename to use for scratch buffer
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
surface.clear_with(viewport, editor.theme.get("ui.statusline"));
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
let mut len = 0usize;
for doc in editor.documents() {
let fname = doc
.path()
.unwrap_or(&pb)
.file_name()
.unwrap_or_default()
.to_str()
.unwrap();
aaron404 marked this conversation as resolved.
Show resolved Hide resolved

let style = if view!(editor).doc == doc.id() {
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
editor
.theme
.try_get("ui.bufferline.active")
.unwrap_or_else(|| editor.theme.get("ui.background"))
} else {
editor
.theme
.try_get("ui.bufferline")
.unwrap_or_else(|| editor.theme.get("ui.statusline"))
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
};

let text = format!(" {}{} ", fname, if doc.is_modified() { "[+]" } else { "" });
let offset = text.len();

surface.set_string(1 + viewport.x + len as u16, viewport.y, text, style);
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
len += offset;
}
}

pub fn render_gutter(
editor: &Editor,
doc: &Document,
Expand Down Expand Up @@ -1346,8 +1380,27 @@ impl Component for EditorView {
// clear with background color
surface.set_style(area, cx.editor.theme.get("ui.background"));
let config = cx.editor.config();

// check if bufferline should be rendered
use helix_view::editor::BufferLine;
let use_bufferline = match config.bufferline {
BufferLine::Always => true,
BufferLine::Multiple if cx.editor.documents().count() > 1 => true,
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
_ => false,
};

// -1 for commandline and -1 for bufferline
let editor_area = if use_bufferline {
area.clip_bottom(1).clip_top(1)
} else {
area.clip_bottom(1)
aaron404 marked this conversation as resolved.
Show resolved Hide resolved
};
// if the terminal size suddenly changed, we need to trigger a resize
cx.editor.resize(area.clip_bottom(1)); // -1 from bottom for commandline
cx.editor.resize(editor_area);

if use_bufferline {
Self::render_bufferline(cx.editor, area.with_height(1), surface);
}

for (view, is_focused) in cx.editor.tree.views() {
let doc = cx.editor.document(view.doc).unwrap();
Expand Down
21 changes: 21 additions & 0 deletions helix-view/src/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ pub struct Config {
pub rulers: Vec<u16>,
#[serde(default)]
pub whitespace: WhitespaceConfig,
/// Persistently display open buffers along the top
pub bufferline: BufferLine,
/// Vertical indent width guides.
pub indent_guides: IndentGuidesConfig,
}
Expand Down Expand Up @@ -229,6 +231,24 @@ impl Default for CursorShapeConfig {
}
}

/// bufferline render modes
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum BufferLine {
/// Don't render bufferline
Never,
/// Always render
Always,
/// Only if multiple buffers are open
Multiple,
}

impl Default for BufferLine {
fn default() -> Self {
BufferLine::Multiple
}
}

#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum LineNumber {
Expand Down Expand Up @@ -409,6 +429,7 @@ impl Default for Config {
lsp: LspConfig::default(),
rulers: Vec::new(),
whitespace: WhitespaceConfig::default(),
bufferline: BufferLine::default(),
indent_guides: IndentGuidesConfig::default(),
}
}
Expand Down