From a787c7b56a2258612572db309113894474825dd7 Mon Sep 17 00:00:00 2001 From: Robert Kroeger Date: Fri, 4 Feb 2022 17:23:37 -0500 Subject: [PATCH] Remove HasUncommitedChanges from SaveableAndDirty SaveableAndDirty only needs to be true for buffers with Undo so there's no need to invoke HasUncommitedChanges. Helps with #97 because file.Buffer does not have a Commit concept. --- file/file_test.go | 2 +- file/observable_editable_buffer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/file/file_test.go b/file/file_test.go index d2cd44e7..84b623ee 100644 --- a/file/file_test.go +++ b/file/file_test.go @@ -65,7 +65,7 @@ func TestFileInsertAtWithoutCommit(t *testing.T) { } check(t, "TestFileInsertAt after TestFileInsertAtWithoutCommit", f, - &stateSummary{true, true, false, true, s1}) + &stateSummary{true, true, false, false, s1}) } const s1 = "hi 海老麺" diff --git a/file/observable_editable_buffer.go b/file/observable_editable_buffer.go index 8959530d..4acc91c6 100644 --- a/file/observable_editable_buffer.go +++ b/file/observable_editable_buffer.go @@ -249,7 +249,7 @@ func (e *ObservableEditableBuffer) ReadC(q int) rune { // as clean and is this File writable to a backing. They are combined in // this method. func (e *ObservableEditableBuffer) SaveableAndDirty() bool { - sad := (e.f.HasUncommitedChanges() || e.Dirty()) && !e.IsDirOrScratch() + sad := e.Dirty() && !e.IsDirOrScratch() return e.details.Name != "" && sad }