diff --git a/spec/app/buffer-spec.coffee b/spec/app/buffer-spec.coffee index 3aa9340db..0b4de7b2e 100644 --- a/spec/app/buffer-spec.coffee +++ b/spec/app/buffer-spec.coffee @@ -168,6 +168,19 @@ describe 'Buffer', -> buffer.save() expect(buffer.isModified()).toBe false + it "returns false for an empty buffer with no path", -> + buffer.release() + buffer = new Buffer() + expect(buffer.isModified()).toBeFalsy() + + it "returns true for a non-empty buffer with no path", -> + buffer.release() + buffer = new Buffer() + buffer.setText('a') + expect(buffer.isModified()).toBeTruthy() + buffer.setText('\n') + expect(buffer.isModified()).toBeTruthy() + describe ".getLines()", -> it "returns an array of lines in the text contents", -> expect(buffer.getLines().length).toBe fileContents.split("\n").length diff --git a/src/app/buffer.coffee b/src/app/buffer.coffee index 152cba605..34ff71f76 100644 --- a/src/app/buffer.coffee +++ b/src/app/buffer.coffee @@ -241,7 +241,10 @@ class Buffer @trigger 'after-save' isModified: -> - @memoryContentSignature != @diskContentSignature + if @file + @memoryContentSignature != @diskContentSignature + else + @lines.length > 1 or @lines[0] isInConflict: -> @conflict