Skip to content

Commit

Permalink
Fix closing buffer with custom keymap (#3633)
Browse files Browse the repository at this point in the history
* Fix closing buffer with custom keymap

* Add comment explaining if
  • Loading branch information
A-Walrus authored Sep 1, 2022
1 parent ec28b2b commit 45dbcb6
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 11 deletions.
25 changes: 14 additions & 11 deletions helix-term/src/ui/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1263,17 +1263,20 @@ impl Component for EditorView {
if cx.editor.should_close() {
return EventResult::Ignored(None);
}
let config = cx.editor.config();
let mode = cx.editor.mode();
let view = cx.editor.tree.get_mut(focus);
let doc = cx.editor.documents.get_mut(&view.doc).unwrap();

view.ensure_cursor_in_view(doc, config.scrolloff);

// Store a history state if not in insert mode. This also takes care of
// committing changes when leaving insert mode.
if mode != Mode::Insert {
doc.append_changes_to_history(view.id);
// if the focused view still exists and wasn't closed
if cx.editor.tree.contains(focus) {
let config = cx.editor.config();
let mode = cx.editor.mode();
let view = cx.editor.tree.get_mut(focus);
let doc = cx.editor.documents.get_mut(&view.doc).unwrap();

view.ensure_cursor_in_view(doc, config.scrolloff);

// Store a history state if not in insert mode. This also takes care of
// committing changes when leaving insert mode.
if mode != Mode::Insert {
doc.append_changes_to_history(view.id);
}
}

EventResult::Consumed(callback)
Expand Down
17 changes: 17 additions & 0 deletions helix-view/src/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,18 @@ impl Tree {
})
}

/// Get reference to a [`view`] by index.
/// # Panics
///
/// Panics if `index` is not in self.nodes, or if the node's content is not [`Content::View`] . This can be checked with [`contains`]
pub fn get(&self, index: ViewId) -> &View {
self.try_get(index).unwrap()
}

/// Try to get reference to a [`view`] by index. Returns `None` if node content is not a [`Content::View`]
/// # Panics
///
/// Panics if `index` is not in self.nodes. This can be checked with [`Self::contains`]
pub fn try_get(&self, index: ViewId) -> Option<&View> {
match &self.nodes[index] {
Node {
Expand All @@ -284,6 +292,10 @@ impl Tree {
}
}

/// Get a mutable reference to a [`view`] by index.
/// # Panics
///
/// Panics if `index` is not in self.nodes, or if the node's content is not [`Content::View`] . This can be checked with [`Self::contains`]
pub fn get_mut(&mut self, index: ViewId) -> &mut View {
match &mut self.nodes[index] {
Node {
Expand All @@ -294,6 +306,11 @@ impl Tree {
}
}

/// Check if tree contains a [`Node`] with a given index.
pub fn contains(&self, index: ViewId) -> bool {
self.nodes.contains_key(index)
}

pub fn is_empty(&self) -> bool {
match &self.nodes[self.root] {
Node {
Expand Down

0 comments on commit 45dbcb6

Please sign in to comment.