suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prefer Document::set_selection to inserting selections directly (#2411) 

Inserting these with the `HashMap::insert` method evades the call
to `Selection::ensure_invariants`. The effect is that the scratch
buffer (or other buffers opened through these code-paths) can start
with a selection at (0, 0), when a file with equivalent contents ("\n")
would start with (0, 1).

I.e.:

    hx

and

    touch f
    hx f

start with different selections even though they have an equivalent
Rope. With this change they both start with (0, 1).
pull/2461/head
Michael Davis 2022-05-10 19:53:54 -05:00 committed by GitHub
parent e0b5cdfb47
commit 247ab25bc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helix-view/src/editor.rs
View File

@ -700,7 +700,7 @@ impl Editor {
let view_id = view!(self).id; let view_id = view!(self).id;
let doc = self.documents.get_mut(&id).unwrap(); let doc = self.documents.get_mut(&id).unwrap();
if doc.selections().is_empty() { if doc.selections().is_empty() {
doc.selections.insert(view_id, Selection::point(0)); doc.set_selection(view_id, Selection::point(0));
} }
return; return;
} }
@ -716,7 +716,7 @@ impl Editor {
); );
// initialize selection for view // initialize selection for view
let doc = self.documents.get_mut(&id).unwrap(); let doc = self.documents.get_mut(&id).unwrap();
doc.selections.insert(view_id, Selection::point(0)); doc.set_selection(view_id, Selection::point(0));
} }
} }
@ -851,7 +851,7 @@ impl Editor {
let view = View::new(doc_id, self.config().gutters.clone()); let view = View::new(doc_id, self.config().gutters.clone());
let view_id = self.tree.insert(view); let view_id = self.tree.insert(view);
let doc = self.documents.get_mut(&doc_id).unwrap(); let doc = self.documents.get_mut(&doc_id).unwrap();
doc.selections.insert(view_id, Selection::point(0)); doc.set_selection(view_id, Selection::point(0));
} }
self._refresh(); self._refresh();