git.iko.soy/helix
on master help sign in
doc: Be smarter about calculating modified status.
28c167dBlaž Hrastnik
helix-core/src/history.rs+5
compare with master
unifiedsplit
@@ -55,6 +55,11 @@ impl History {
55 self.cursor = new_cursor;
55 self.cursor = new_cursor;
56 }
56 }
57
57
58+ #[inline]
59+ pub fn current_revision(&self) -> usize {
60+ self.cursor
61+ }
62+
58 #[inline]
63 #[inline]
59 pub const fn at_root(&self) -> bool {
64 pub const fn at_root(&self) -> bool {
60 self.cursor == 0
65 self.cursor == 0
helix-term/src/ui/editor.rs+1−1
@@ -440,7 +440,7 @@ impl EditorView {
440 if let Some(path) = doc.relative_path() {
440 if let Some(path) = doc.relative_path() {
441 let path = path.to_string_lossy();
441 let path = path.to_string_lossy();
442
442
443− let title = format!("{}{}", path, if doc.modified() { "[+]" } else { "" });
443+ let title = format!("{}{}", path, if doc.is_modified() { "[+]" } else { "" });
444 surface.set_stringn(
444 surface.set_stringn(
445 viewport.x + 6,
445 viewport.x + 6,
446 viewport.y,
446 viewport.y,
helix-view/src/document.rs+7−9
@@ -35,13 +35,13 @@ pub struct Document {
35 // /// Corresponding language scope name. Usually `source.<lang>`.
35 // /// Corresponding language scope name. Usually `source.<lang>`.
36 pub(crate) language: Option<Arc<LanguageConfiguration>>,
36 pub(crate) language: Option<Arc<LanguageConfiguration>>,
37
37
38− modified: bool,
39 /// Pending changes since last history commit.
38 /// Pending changes since last history commit.
40 changes: ChangeSet,
39 changes: ChangeSet,
41 /// State at last commit. Used for calculating reverts.
40 /// State at last commit. Used for calculating reverts.
42 old_state: Option<State>,
41 old_state: Option<State>,
43 /// Undo tree.
42 /// Undo tree.
44 history: History,
43 history: History,
44+ last_saved_revision: usize,
45 version: i32, // should be usize?
45 version: i32, // should be usize?
46
46
47 pub diagnostics: Vec<Diagnostic>,
47 pub diagnostics: Vec<Diagnostic>,
@@ -81,12 +81,12 @@ impl Document {
81 restore_cursor: false,
81 restore_cursor: false,
82 syntax: None,
82 syntax: None,
83 language: None,
83 language: None,
84− modified: false,
85 changes,
84 changes,
86 old_state,
85 old_state,
87 diagnostics: Vec::new(),
86 diagnostics: Vec::new(),
88 version: 0,
87 version: 0,
89 history: History::default(),
88 history: History::default(),
89+ last_saved_revision: 0,
90 language_server: None,
90 language_server: None,
91 }
91 }
92 }
92 }
@@ -131,7 +131,7 @@ impl Document {
131 let language_server = self.language_server.clone();
131 let language_server = self.language_server.clone();
132
132
133 // reset the modified flag
133 // reset the modified flag
134− self.modified = false;
134+ self.last_saved_revision = self.history.current_revision();
135
135
136 async move {
136 async move {
137 use smol::{fs::File, prelude::*};
137 use smol::{fs::File, prelude::*};
@@ -246,10 +246,6 @@ impl Document {
246
246
247 let success = self._apply(transaction, view_id);
247 let success = self._apply(transaction, view_id);
248
248
249− self.modified = true;
250− // TODO: be smarter about modified by keeping track of saved version instead. That way if
251− // current version == version then it's not modified.
252−
253 if !transaction.changes().is_empty() {
249 if !transaction.changes().is_empty() {
254 // Compose this transaction with the previous one
250 // Compose this transaction with the previous one
255 take_with(&mut self.changes, |changes| {
251 take_with(&mut self.changes, |changes| {
@@ -307,8 +303,10 @@ impl Document {
307 }
303 }
308
304
309 #[inline]
305 #[inline]
310− pub fn modified(&self) -> bool {
306+ pub fn is_modified(&self) -> bool {
311− self.modified
307+ self.path.is_some()
308+ && (self.history.current_revision() != self.last_saved_revision
309+ || !self.changes.is_empty())
312 }
310 }
313
311
314 #[inline]
312 #[inline]