Merge pull request gitx#17 from nanotech/f/eof-newlines

Display missing newlines clearly

Author: ssp

html/css/diff.css

@@ -51,6 +51,10 @@
     display:none;
 }
 
+.diff .file .diffcontent .lines .nonewline:after {
+	content: "  \20e0\23ce";
+	font-family: -apple-system, "Helvetica Neue", sans-serif;
+}
 .diff .file .diffcontent .lines .whitespace {
 	background-color: rgba(255,0,0,0.5);
 }

html/lib/diffHighlighter.js

@@ -213,15 +213,24 @@ var highlightDiff = function(diff, element, callbacks) {
 				continue;
 		}
 
+		var isMissingEOFNewline =
+		    lineno + 1 < lines.length &&
+		    lines[lineno + 1] == "\\ No newline at end of file";
+		var missingEOFNewlineClass = isMissingEOFNewline ? " nonewline" : "";
+		var wrapLine = function(cls) {
+			return "<div " + sindex + "class='" + cls + missingEOFNewlineClass + "'>"
+			    + l + "</div>";
+		};
+
 		sindex = "index=" + lindex.toString() + " ";
 		if (firstChar == "+") {
 			line1 += "\n";
 			line2 += ++hunk_start_line_2 + "\n";
-			diffContent += "<div " + sindex + "class='addline'>" + l + "</div>";
+			diffContent += wrapLine("addline");
 		} else if (firstChar == "-") {
 			line1 += ++hunk_start_line_1 + "\n";
 			line2 += "\n";
-			diffContent += "<div " + sindex + "class='delline'>" + l + "</div>";
+			diffContent += wrapLine("delline");
 		} else if (firstChar == "@") {
 			if (header) {
 				header = false;
@@ -234,15 +243,13 @@ var highlightDiff = function(diff, element, callbacks) {
 			}
 			line1 += "...\n";
 			line2 += "...\n";
-			diffContent += "<div " + sindex + "class='hunkheader'>" + l + "</div>";
+			diffContent += wrapLine("hunkheader");
 		} else if (firstChar == " ") {
 			line1 += ++hunk_start_line_1 + "\n";
 			line2 += ++hunk_start_line_2 + "\n";
-			diffContent += "<div " + sindex + "class='noopline'>" + l + "</div>";
+			diffContent += wrapLine("noopline");
 		} else if (firstChar == "\\") {
-			line1 += ++hunk_start_line_1 + "\n";
-			line2 += ++hunk_start_line_2 + "\n";
-			diffContent += "<div " + sindex + "class='markerline'>" + l + "</div>";
+			diffContent += wrapLine("markerline");
 		}
 		lindex++;
 	}