Don't consider banners and separators "modified" if the NL is missing

smashwilson · smashwilson · commit ee9c0053d89b · 2017-05-03T16:14:02.000-04:00
diff --git a/lib/models/conflicts/banner.js b/lib/models/conflicts/banner.js
@@ -17,7 +17,10 @@ export default class Banner {
   }
 
   isModified() {
-    return this.editor.getTextInBufferRange(this.marker.getBufferRange()) !== this.originalText;
+    const chomp = line => line.replace(/\r?\n$/, '');
+
+    const text = this.editor.getTextInBufferRange(this.marker.getBufferRange());
+    return chomp(text) !== chomp(this.originalText);
   }
 
   revert() {
diff --git a/lib/models/conflicts/separator.js b/lib/models/conflicts/separator.js
@@ -16,6 +16,6 @@ export default class Separator {
 
   isModified() {
     const currentText = this.editor.getTextInBufferRange(this.getMarker().getBufferRange());
-    return !/^=======\r?\n/.test(currentText);
+    return !/^=======\r?\n?$/.test(currentText);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,10 @@ export default class Banner {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`isModified() {`
`20`		`- return this.editor.getTextInBufferRange(this.marker.getBufferRange()) !== this.originalText;`
	`20`	`+ const chomp = line => line.replace(/\r?\n$/, '');`
	`21`	`+`
	`22`	`+ const text = this.editor.getTextInBufferRange(this.marker.getBufferRange());`
	`23`	`+ return chomp(text) !== chomp(this.originalText);`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`revert() {`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ export default class Separator {`
`16`	`16`
`17`	`17`	`isModified() {`
`18`	`18`	`const currentText = this.editor.getTextInBufferRange(this.getMarker().getBufferRange());`
`19`		`- return !/^=======\r?\n/.test(currentText);`
	`19`	`+ return !/^=======\r?\n?$/.test(currentText);`
`20`	`20`	`}`
`21`	`21`	`}`