summaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authorBlaž Hrastnik2020-09-14 10:50:46 +0000
committerBlaž Hrastnik2020-09-14 10:50:46 +0000
commit31999d6528b247e223774d1a4edec7966dda3d9e (patch)
treefd14e9c223695a6f3fc3d67fbaf543014c6ce9a3 /helix-term/src
parent96db02742e85648e4ce0c2ab9b7cd239bdb763f8 (diff)
Make state fields read-only from outside the crate.
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/editor.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/helix-term/src/editor.rs b/helix-term/src/editor.rs
index fc1c836c..080c05aa 100644
--- a/helix-term/src/editor.rs
+++ b/helix-term/src/editor.rs
@@ -108,7 +108,7 @@ impl Editor {
let mut stdout = stdout();
// TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|)
- let source_code = state.doc.to_string();
+ let source_code = state.doc().to_string();
// TODO: cache highlight results
// TODO: only recalculate when state.doc is actually modified
@@ -137,10 +137,10 @@ impl Editor {
HighlightEvent::Source { start, end } => {
// TODO: filter out spans out of viewport for now..
- let start = state.doc.byte_to_char(start);
- let end = state.doc.byte_to_char(end);
+ let start = state.doc().byte_to_char(start);
+ let end = state.doc().byte_to_char(end);
- let text = state.doc.slice(start..end);
+ let text = state.doc().slice(start..end);
use helix_core::graphemes::{grapheme_width, RopeGraphemes};
@@ -225,14 +225,14 @@ impl Editor {
self.surface = surface;
// set cursor shape
- match state.mode {
+ match state.mode() {
Mode::Insert => write!(stdout, "\x1B[6 q"),
Mode::Normal => write!(stdout, "\x1B[2 q"),
};
// render the cursor
- let pos = state.selection.cursor();
- let coords = coords_at_pos(&state.doc.slice(..), pos);
+ let pos = state.selection().cursor();
+ let coords = coords_at_pos(&state.doc().slice(..), pos);
execute!(
stdout,
cursor::MoveTo((coords.1 + 2) as u16, coords.0 as u16)
@@ -261,7 +261,7 @@ impl Editor {
}
Some(Ok(Event::Key(event))) => {
if let Some(state) = &mut self.state {
- match state.mode {
+ match state.mode() {
Mode::Insert => {
match event {
KeyEvent {