added threshold of 8 to sematic chaff cleanup algorithm. Fixed bug where edit was not being inserted. Changed some styling of scroll bars.

Author: jhewlett

src/LineDiff.js

@@ -48,7 +48,7 @@ SourceDiff.LineDiff = function() {
 
                 var leftAdd = findEditWithEndingPosition(_added, _common[i].rightPosition - 1);
                 var rightAdd = findEditWithPosition(_added, _common[i].rightEndPosition + 1);
-                if (editLength(leftDelete) + editLength(leftAdd) >= equalityLength
+                if (equalityLength <= 8 && editLength(leftDelete) + editLength(leftAdd) >= equalityLength
                         && editLength(rightDelete) + editLength(rightAdd) >= equalityLength) {
                     didMerge = true;
                     if (leftDelete && rightDelete) {
@@ -103,7 +103,7 @@ SourceDiff.LineDiff = function() {
         } else if (position < edits[0].position) {
             edits.unshift(newEdit);
         } else {
-            for (var i = edits.length - 1; i >= 1; i--) {
+            for (var i = edits.length - 1; i >= 0; i--) {
                 if (position > edits[i].position) {
                     edits.splice(i + 1, 0, newEdit);
                     break;

src/style.css

@@ -44,7 +44,7 @@ textarea {
 
 .scroll {
     height: 600px;
-    overflow-x: auto;
+    overflow-x: scroll;
     overflow-y: auto;
 }
 

test/DiffTests.js

@@ -314,4 +314,28 @@ test("LineDiff.addEdit", function() {
     lineDiff.cleanUp();
 
     assertEquals([{position: 0, endPosition: 7}, {position: 11, endPosition: 11}, {position: 15, endPosition: 18}], lineDiff.deleted);
-});
+});
+
+test("LineDiff correctly merges edits and removes semantic chaff", function() {
+    var diff = new SourceDiff.Diff(false);
+
+    var lineDiff = diff.lineDiff('deletedText += "<br>";', 'for(var e = 0; e < results.added.length; e++) {');
+
+    lineDiff.cleanUp();
+
+    assertEquals([{position: 0, endPosition: 21}], lineDiff.deleted);
+    assertEquals([{position: 0, endPosition: 46}], lineDiff.added);
+    assertEquals([], lineDiff.common);
+});
+
+test("LineDiff with blank lines", function() {
+    var diff = new SourceDiff.Diff(false);
+
+    var diffFormatter = new SourceDiff.DiffFormatter(diff);
+
+    var formatted = diffFormatter.formattedDiff('\n', '*\n');
+
+    assertEquals('["<span class=\"deleted\"> </span><br> <br>","<span class=\"modified\"><span class=\"modified-light\">*</span></span><br> <br>"]', formatted);
+});
+
+//I need a good way to handle blank lines that get padded with ' '.