From f4dc516c2502bae8251770f8bd23738481714260 Mon Sep 17 00:00:00 2001 From: Rodrigo Fernandes Date: Sat, 27 Sep 2014 01:29:32 +0100 Subject: [PATCH] fix empty lines (needs refactor) --- diff2html.css | 10 +- diff2html.js | 338 ++++++++++++---------------------------------- diff2html.min.css | 2 +- diff2html.min.js | 2 +- index.html | 209 +++++++++++++++++++++------- jsdiff.js | 98 ++++++++++++++ 6 files changed, 352 insertions(+), 307 deletions(-) create mode 100644 jsdiff.js diff --git a/diff2html.css b/diff2html.css index f5823f0..8c7ba1b 100644 --- a/diff2html.css +++ b/diff2html.css @@ -3,7 +3,7 @@ * Diff to HTML (diff2html.css) * Author: rtfpessoa * Date: Friday 29 August 2014 - * Last Update: Sunday 14 September 2014 + * Last Update: Saturday 27 September 2014 * */ @@ -109,7 +109,7 @@ display: inline-block; margin-top: -1px; text-decoration: none; - background-color: #f99; + background-color: #ffb6ba; font-weight: 700; border-radius: 0.2em; } @@ -119,7 +119,7 @@ display: inline-block; margin-top: -1px; text-decoration: none; - background-color: #6f7; + background-color: #97f295; font-weight: 700; border-radius: 0.2em; } @@ -174,12 +174,12 @@ } .d2h-del { - background-color: #f7c8c8; + background-color: #fee8e9; border-color: #e9aeae; } .d2h-ins { - background-color: #ceffce; + background-color: #dfd; border-color: #b4e2b4; } diff --git a/diff2html.js b/diff2html.js index a26c22c..5983a76 100644 --- a/diff2html.js +++ b/diff2html.js @@ -3,10 +3,10 @@ * Diff to HTML (diff2html.js) * Author: rtfpessoa * Date: Friday 29 August 2014 - * Last Update: Sunday 14 September 2014 + * Last Update: Saturday 27 September 2014 * * Diff command: - * git diff --word-diff-regex=. HEAD~1 + * git diff */ (function (window) { @@ -16,14 +16,8 @@ var LINE_TYPE = { INSERTS: "d2h-ins", - ALL_NEW: "d2h-all-ins", - DELETES: "d2h-del", - ALL_DELETED: "d2h-all-del", - - INSERTS_AND_DELETES: "d2h-ins-and-del", CONTEXT: "d2h-cntx", - INFO: "d2h-info" }; @@ -127,74 +121,34 @@ }; var createLine = function (line) { - /* Line Types */ - var isLineWithInserts = /{\+.*?\+}/.exec(line); - var isNewLine = /^{\+.*?\+}$/.exec(line); - - var isLineWithDeletes = /\[-.*?-\]/.exec(line); - var isRemovedLine = /^\[-.*?-\]$/.exec(line); - - var isLineWithBoth = isLineWithInserts && isLineWithDeletes; - var isContextLine = !isLineWithInserts && !isLineWithDeletes; - var currentLine = {}; currentLine.content = line; /* fill the line data */ - if (isLineWithBoth) { - currentFile.deletedLines++; + if (startsWith(line, "+")) { currentFile.addedLines++; - currentLine.type = LINE_TYPE.INSERTS_AND_DELETES; - currentLine.oldNumber = oldLine++; - currentLine.newNumber = newLine++; - - currentBlock.lines.push(currentLine); - - } else if (isContextLine) { - - currentLine.type = LINE_TYPE.CONTEXT; - currentLine.oldNumber = oldLine++; - currentLine.newNumber = newLine++; - - currentBlock.lines.push(currentLine); - - } else if (isNewLine) { - currentFile.addedLines++; - - currentLine.type = LINE_TYPE.ALL_NEW; + currentLine.type = LINE_TYPE.INSERTS; currentLine.oldNumber = null; currentLine.newNumber = newLine++; currentBlock.lines.push(currentLine); - } else if (isRemovedLine) { + } else if (startsWith(line, "-")) { currentFile.deletedLines++; - currentLine.type = LINE_TYPE.ALL_DELETED; + currentLine.type = LINE_TYPE.DELETES; currentLine.oldNumber = oldLine++; currentLine.newNumber = null; currentBlock.lines.push(currentLine); - } else if (isLineWithInserts) { - currentFile.addedLines++; - - currentLine.type = LINE_TYPE.INSERTS; + } else { + currentLine.type = LINE_TYPE.CONTEXT; currentLine.oldNumber = oldLine++; currentLine.newNumber = newLine++; currentBlock.lines.push(currentLine); - - } else if (isLineWithDeletes) { - currentFile.deletedLines++; - - currentLine.type = LINE_TYPE.DELETES; - currentLine.oldNumber = oldLine++; - currentLine.newNumber = newLine++; - - currentBlock.lines.push(currentLine); - } }; @@ -256,75 +210,47 @@ var generateFileHtml = function (file) { return file.blocks.map(function (block) { - return "\n" + + var lines = "\n" + " \n" + " " + "
" + escape(block.header) + "
" + " \n" + - "\n" + + "\n"; - block.lines.map(function (line) { + for (var i = 0; i < block.lines.length; i++) { + var line = block.lines[i]; + var newLine = block.lines[i + 1]; - var newLine = function () { - var lineData = {}; - lineData.oldLine = valueOrEmpty(line.oldNumber); - lineData.newLine = valueOrEmpty(line.newNumber); - - return lineData; - }; + if (line.type == LINE_TYPE.DELETES && + newLine && newLine.type == LINE_TYPE.INSERTS) { + i++; var escapedLine = escape(line.content); + var nextEscapedLine = escape(newLine.content); - var lines = []; - var lineData = {}; + var diff = diffString(escapedLine, nextEscapedLine); - switch (line.type) { - case LINE_TYPE.INSERTS: - case LINE_TYPE.ALL_NEW: - lineData = newLine(); - lineData.content = generateLineInsertions(escapedLine); - lineData.type = LINE_TYPE.INSERTS; - lines.push(lineData); - break; - case LINE_TYPE.DELETES: - case LINE_TYPE.ALL_DELETED: - lineData = newLine(); - lineData.content = generateLineDeletions(escapedLine); - lineData.type = LINE_TYPE.DELETES; - lines.push(lineData); - break; - case LINE_TYPE.INSERTS_AND_DELETES: - lineData = newLine(); - lineData.content = generateLineDeletions(escapedLine); - lineData.type = LINE_TYPE.DELETES; - lines.push(lineData); + lines = lines + + generateLineHtml(line.type, line.oldNumber, line.newNumber, removeIns(diff)) + + generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, removeDel(diff)); + } else { + lines = lines + + generateLineHtml(line.type, line.oldNumber, line.newNumber, line.content); + } + } - lineData = newLine(); - lineData.content = generateLineInsertions(escapedLine); - lineData.type = LINE_TYPE.INSERTS; - lines.push(lineData); - break; - default: - lineData = newLine(); - lineData.content = escapedLine; - lineData.type = LINE_TYPE.CONTEXT; - lines.push(lineData); - break; - } - - return lines.map(generateLineHtml).join("\n"); - }).join("\n"); + return lines; }).join("\n"); }; - var generateLineHtml = function (line) { + var generateLineHtml = function (type, oldNumber, newNumber, content) { return "\n" + - " " + - "
" + line.oldLine + "
" + - "
" + line.newLine + "
" + + " " + + "
" + valueOrEmpty(oldNumber) + "
" + + "
" + valueOrEmpty(newNumber) + "
" + " \n" + - " " + - "
" + line.content + "
" + + " " + + "
" + content + "
" + " \n" + "\n"; }; @@ -336,6 +262,8 @@ var generateSideBySideJsonHtml = function (diffFiles) { return "
\n" + diffFiles.map(function (file) { + var diffs = generateSideBySideFileHtml(file); + return "
\n" + "
\n" + "
\n" + @@ -349,7 +277,7 @@ "
\n" + " \n" + " \n" + - " " + generateLeftSideFileHtml(file) + + " " + diffs.left + " \n" + "
\n" + "
\n" + @@ -358,7 +286,7 @@ "
\n" + " \n" + " \n" + - " " + generateRightSideFileHtml(file) + + " " + diffs.right + " \n" + "
\n" + "
\n" + @@ -369,154 +297,70 @@ "
\n"; }; - var generateLeftSideFileHtml = function (file) { - return file.blocks.map(function (block) { + var generateSideBySideFileHtml = function (file) { + var fileHtml = {}; + fileHtml.left = ""; + fileHtml.right = ""; - return "\n" + + file.blocks.forEach(function (block) { + + fileHtml.left += "\n" + " \n" + " " + "
" + escape(block.header) + "
" + " \n" + - "\n" + + "\n"; - block.lines.map(function (line) { - - var emptyLine = function () { - var lineData = {}; - lineData.number = ""; - lineData.content = ""; - lineData.type = LINE_TYPE.CONTEXT; - - return lineData; - }; - - var escapedLine = escape(line.content); - - var lines = []; - var lineData = {}; - - switch (line.type) { - case LINE_TYPE.INSERTS: - lineData = {}; - lineData.number = valueOrEmpty(line.oldNumber); - lineData.content = removeInserts(escapedLine); - lineData.type = LINE_TYPE.CONTEXT; - lines.push(lineData); - break; - case LINE_TYPE.ALL_NEW: - lines.push(new emptyLine()); - break; - case LINE_TYPE.DELETES: - lineData = {}; - lineData.number = valueOrEmpty(line.oldNumber); - lineData.content = generateLineDeletions(escapedLine); - lineData.type = LINE_TYPE.DELETES; - lines.push(lineData); - break; - case LINE_TYPE.ALL_DELETED: - lineData = {}; - lineData.number = valueOrEmpty(line.oldNumber); - lineData.content = generateLineDeletions(escapedLine); - lineData.type = LINE_TYPE.DELETES; - lines.push(lineData); - break; - case LINE_TYPE.INSERTS_AND_DELETES: - lineData = {}; - lineData.number = valueOrEmpty(line.oldNumber); - lineData.content = generateLineDeletions(escapedLine); - lineData.type = LINE_TYPE.DELETES; - lines.push(lineData); - break; - default: - lineData = {}; - lineData.number = valueOrEmpty(line.oldNumber); - lineData.content = escapedLine; - lineData.type = LINE_TYPE.CONTEXT; - lines.push(lineData); - break; - } - - return "\n" + lines.map(generateSingleLineHtml).join("\n") + "\n"; - }).join("\n"); - }).join("\n"); - }; - - var generateRightSideFileHtml = function (file) { - return file.blocks.map(function (block) { - - return "\n" + + fileHtml.right += "\n" + " \n" + " " + "
" + " \n" + - "\n" + + "\n"; - block.lines.map(function (line) { + for (var i = 0; i < block.lines.length; i++) { - var emptyLine = function () { - var lineData = {}; - lineData.number = ""; - lineData.content = ""; - lineData.type = LINE_TYPE.CONTEXT; + fileHtml.left += "\n"; + fileHtml.right += "\n"; - return lineData; - }; + var line = block.lines[i]; + var newLine = block.lines[i + 1]; + + if (line.type == LINE_TYPE.DELETES && + newLine && newLine.type == LINE_TYPE.INSERTS) { + i++; var escapedLine = escape(line.content); + var nextEscapedLine = escape(newLine.content); - var lines = []; - var lineData = {}; + var diff = diffString(escapedLine, nextEscapedLine); - switch (line.type) { - case LINE_TYPE.INSERTS: - lineData = {}; - lineData.number = valueOrEmpty(line.newNumber); - lineData.content = generateLineInsertions(escapedLine); - lineData.type = LINE_TYPE.INSERTS; - lines.push(lineData); - break; - case LINE_TYPE.ALL_NEW: - lineData = {}; - lineData.number = valueOrEmpty(line.newNumber); - lineData.content = generateLineInsertions(escapedLine); - lineData.type = LINE_TYPE.INSERTS; - lines.push(lineData); - break; - case LINE_TYPE.DELETES: - lineData = {}; - lineData.number = valueOrEmpty(line.newNumber); - lineData.content = removeDeletes(escapedLine); - lineData.type = LINE_TYPE.CONTEXT; - lines.push(lineData); - break; - case LINE_TYPE.ALL_DELETED: - lines.push(new emptyLine()); - break; - case LINE_TYPE.INSERTS_AND_DELETES: - lineData = {}; - lineData.number = valueOrEmpty(line.newNumber); - lineData.content = generateLineInsertions(escapedLine); - lineData.type = LINE_TYPE.INSERTS; - lines.push(lineData); - break; - default: - lineData = {}; - lineData.number = valueOrEmpty(line.newNumber); - lineData.content = escapedLine; - lineData.type = LINE_TYPE.CONTEXT; - lines.push(lineData); - break; - } + fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, removeIns(diff)); + fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, removeDel(diff)); + } else if (line.type == LINE_TYPE.DELETES) { + fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, line.content); + fileHtml.right += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", ""); + } else if (line.type == LINE_TYPE.INSERTS) { + fileHtml.left += generateSingleLineHtml(LINE_TYPE.CONTEXT, "", "", ""); + fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, line.content); + } else { + fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, line.content); + fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, line.content); + } - return "\n" + lines.map(generateSingleLineHtml).join("\n") + "\n"; - }).join("\n"); - }).join("\n"); + fileHtml.left += "\n"; + fileHtml.right += "\n"; + } + + }); + + return fileHtml; }; - var generateSingleLineHtml = function (line) { - return "" + line.number + "\n" + - " " + - "
" + line.content + "
" + + var generateSingleLineHtml = function (type, number, content) { + return "" + number + "\n" + + " " + + "
" + content + "
" + " \n"; }; @@ -528,24 +372,12 @@ return oldFilename === newFilename ? newFilename : oldFilename + " -> " + newFilename; }; - var generateLineInsertions = function (line) { - return line.slice(0).replace(/(\[-.*?-\])/g, ""). - replace(/({\+(.*?)\+})/g, "$2"); + var removeIns = function (line) { + return line.replace(/((.*?)<\/ins>)/g, ""); }; - var generateLineDeletions = function (line) { - return line.slice(0).replace(/({\+.*?\+})/g, ""). - replace(/(\[-(.*?)-\])/g, "$2"); - }; - - var removeDeletes = function (line) { - return line.slice(0).replace(/({\+.*?\+})/g, ""). - replace(/(\[-.*?-\])/g, ""); - }; - - var removeInserts = function (line) { - return line.slice(0).replace(/({\+.*?\+})/g, ""). - replace(/(\[-.*?-\])/g, ""); + var removeDel = function (line) { + return line.replace(/((.*?)<\/del>)/g, ""); }; /* diff --git a/diff2html.min.css b/diff2html.min.css index de75cb7..03edb3a 100644 --- a/diff2html.min.css +++ b/diff2html.min.css @@ -1 +1 @@ -.d2h-wrapper{display:block;margin:0 auto;text-align:left;width:100%}.d2h-file-wrapper{border:1px solid #ddd;border-radius:3px;margin-bottom:1em}.d2h-file-header{padding:5px 10px;border-bottom:1px solid #d8d8d8;background-color:#f7f7f7;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-stats{display:inline;font-size:12px;text-align:center;max-width:15%}.d2h-lines-added{background-color:#ceffce;border:1px solid #b4e2b4;color:#399839;border-radius:5px 0 0 5px;padding:2px;width:25px}.d2h-lines-deleted{background-color:#f7c8c8;border:1px solid #e9aeae;color:#c33;border-radius:0 5px 5px 0;padding:2px;width:25px}.d2h-file-name{display:inline;height:33px;line-height:33px;max-width:80%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.d2h-diff-table{border-collapse:collapse;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:12px;height:18px;line-height:18px;width:100%}.d2h-files-diff{width:100%}.d2h-file-diff{overflow-x:scroll}.d2h-file-side-diff{display:inline-block;overflow-x:scroll;width:50%;margin-right:-4px}.d2h-code-line{white-space:pre;padding-left:10px;padding-right:10px;height:18px;line-height:18px;margin-left:80px}.d2h-code-side-line{white-space:pre;padding-left:10px;padding-right:10px;height:18px;line-height:18px;margin-left:50px}.d2h-code-line del,.d2h-code-side-line del{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#f99;font-weight:700;border-radius:.2em}.d2h-code-line ins,.d2h-code-side-line ins{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#6f7;font-weight:700;border-radius:.2em}.line-num1{display:inline-block;float:left;width:30px;overflow:hidden;text-overflow:ellipsis}.line-num2{display:inline-block;float:right;width:30px;overflow:hidden;text-overflow:ellipsis}.d2h-code-linenumber{position:absolute;width:2%;min-width:65px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer}.d2h-code-side-linenumber{position:absolute;width:35px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer;overflow:hidden;text-overflow:ellipsis}.d2h-del{background-color:#f7c8c8;border-color:#e9aeae}.d2h-ins{background-color:#ceffce;border-color:#b4e2b4}.d2h-info{background-color:#f8fafd;color:rgba(0,0,0,.3);border-color:#d5e4f2} \ No newline at end of file +.d2h-wrapper{display:block;margin:0 auto;text-align:left;width:100%}.d2h-file-wrapper{border:1px solid #ddd;border-radius:3px;margin-bottom:1em}.d2h-file-header{padding:5px 10px;border-bottom:1px solid #d8d8d8;background-color:#f7f7f7;font:13px Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.d2h-file-stats{display:inline;font-size:12px;text-align:center;max-width:15%}.d2h-lines-added{background-color:#ceffce;border:1px solid #b4e2b4;color:#399839;border-radius:5px 0 0 5px;padding:2px;width:25px}.d2h-lines-deleted{background-color:#f7c8c8;border:1px solid #e9aeae;color:#c33;border-radius:0 5px 5px 0;padding:2px;width:25px}.d2h-file-name{display:inline;height:33px;line-height:33px;max-width:80%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.d2h-diff-table{border-collapse:collapse;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:12px;height:18px;line-height:18px;width:100%}.d2h-files-diff{width:100%}.d2h-file-diff{overflow-x:scroll}.d2h-file-side-diff{display:inline-block;overflow-x:scroll;width:50%;margin-right:-4px}.d2h-code-line{white-space:pre;padding-left:10px;padding-right:10px;height:18px;line-height:18px;margin-left:80px}.d2h-code-side-line{white-space:pre;padding-left:10px;padding-right:10px;height:18px;line-height:18px;margin-left:50px}.d2h-code-line del,.d2h-code-side-line del{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#ffb6ba;font-weight:700;border-radius:.2em}.d2h-code-line ins,.d2h-code-side-line ins{display:inline-block;margin-top:-1px;text-decoration:none;background-color:#97f295;font-weight:700;border-radius:.2em}.line-num1{display:inline-block;float:left;width:30px;overflow:hidden;text-overflow:ellipsis}.line-num2{display:inline-block;float:right;width:30px;overflow:hidden;text-overflow:ellipsis}.d2h-code-linenumber{position:absolute;width:2%;min-width:65px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer}.d2h-code-side-linenumber{position:absolute;width:35px;padding-left:10px;padding-right:10px;height:18px;line-height:18px;background-color:#fff;color:rgba(0,0,0,.3);text-align:right;border:solid #eee;border-width:0 1px;cursor:pointer;overflow:hidden;text-overflow:ellipsis}.d2h-del{background-color:#fee8e9;border-color:#e9aeae}.d2h-ins{background-color:#dfd;border-color:#b4e2b4}.d2h-info{background-color:#f8fafd;color:rgba(0,0,0,.3);border-color:#d5e4f2} \ No newline at end of file diff --git a/diff2html.min.js b/diff2html.min.js index 476510a..58e1f91 100644 --- a/diff2html.min.js +++ b/diff2html.min.js @@ -1 +1 @@ -!function(window){var ClassVariable;return ClassVariable=function(){function Diff2Html(){}function escape(str){return str.slice(0).replace(/&/g,"&").replace(//g,">").replace(/\t/g," ")}function startsWith(str,start){return 0===str.indexOf(start)}function valueOrEmpty(value){return value?value:""}var LINE_TYPE={INSERTS:"d2h-ins",ALL_NEW:"d2h-all-ins",DELETES:"d2h-del",ALL_DELETED:"d2h-all-del",INSERTS_AND_DELETES:"d2h-ins-and-del",CONTEXT:"d2h-cntx",INFO:"d2h-info"};Diff2Html.prototype.getPrettyHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateJsonHtml(diffJson)},Diff2Html.prototype.getJsonFromDiff=function(diffInput){return generateDiffJson(diffInput)},Diff2Html.prototype.getPrettyHtmlFromJson=function(diffJson){return generateJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateSideBySideJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromJson=function(diffJson){return generateSideBySideJsonHtml(diffJson)};var instance,generateDiffJson=function(diffInput){var files=[],currentFile=null,currentBlock=null,oldLine=null,newLine=null,saveBlock=function(){currentBlock&&(currentFile.blocks.push(currentBlock),currentBlock=null)},saveFile=function(){currentFile&&(files.push(currentFile),currentFile=null)},startFile=function(line){saveBlock(),saveFile(),currentFile={},currentFile.blocks=[],currentFile.deletedLines=0,currentFile.addedLines=0;var values=/^diff --git a\/(\S+) b\/(\S+).*$/.exec(line);currentFile.oldName=values[1],currentFile.newName=values[2]},startBlock=function(line){saveBlock();var values;(values=/^(@@ -(\d+),(\d+) \+(\d+),(\d+) @@).*/.exec(line))?(oldLine=values[2],newLine=values[4]):(oldLine=0,newLine=0),currentBlock={},currentBlock.lines=[],currentBlock.oldStartLine=oldLine,currentBlock.newStartLine=newLine,currentBlock.header=line},createLine=function(line){var isLineWithInserts=/{\+.*?\+}/.exec(line),isNewLine=/^{\+.*?\+}$/.exec(line),isLineWithDeletes=/\[-.*?-\]/.exec(line),isRemovedLine=/^\[-.*?-\]$/.exec(line),isLineWithBoth=isLineWithInserts&&isLineWithDeletes,isContextLine=!isLineWithInserts&&!isLineWithDeletes,currentLine={};currentLine.content=line,isLineWithBoth?(currentFile.deletedLines++,currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS_AND_DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isContextLine?(currentLine.type=LINE_TYPE.CONTEXT,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isNewLine?(currentFile.addedLines++,currentLine.type=LINE_TYPE.ALL_NEW,currentLine.oldNumber=null,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isRemovedLine?(currentFile.deletedLines++,currentLine.type=LINE_TYPE.ALL_DELETED,currentLine.oldNumber=oldLine++,currentLine.newNumber=null,currentBlock.lines.push(currentLine)):isLineWithInserts?(currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):isLineWithDeletes&&(currentFile.deletedLines++,currentLine.type=LINE_TYPE.DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine))},diffLines=diffInput.split("\n");return diffLines.forEach(function(line){!line||startsWith(line,"*")||startsWith(line,"new")||startsWith(line,"index")||startsWith(line,"---")||startsWith(line,"+++")||(startsWith(line,"diff")?startFile(line):currentFile&&startsWith(line,"@@")?startBlock(line):currentBlock&&createLine(line))}),saveBlock(),saveFile(),files},generateJsonHtml=function(diffFiles){return'
\n'+diffFiles.map(function(file){return'
\n
\n
\n +'+file.addedLines+'\n -'+file.deletedLines+'\n
\n
'+getDiffName(file.oldName,file.newName)+'
\n
\n
\n
\n \n \n '+generateFileHtml(file)+" \n
\n
\n
\n
\n"}).join("\n")+"
\n"},generateFileHtml=function(file){return file.blocks.map(function(block){return'\n \n
'+escape(block.header)+"
\n\n"+block.lines.map(function(line){var newLine=function(){var lineData={};return lineData.oldLine=valueOrEmpty(line.oldNumber),lineData.newLine=valueOrEmpty(line.newNumber),lineData},escapedLine=escape(line.content),lines=[],lineData={};switch(line.type){case LINE_TYPE.INSERTS:case LINE_TYPE.ALL_NEW:lineData=newLine(),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;case LINE_TYPE.DELETES:case LINE_TYPE.ALL_DELETED:lineData=newLine(),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;case LINE_TYPE.INSERTS_AND_DELETES:lineData=newLine(),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData),lineData=newLine(),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;default:lineData=newLine(),lineData.content=escapedLine,lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData)}return lines.map(generateLineHtml).join("\n")}).join("\n")}).join("\n")},generateLineHtml=function(line){return'\n
'+line.oldLine+'
'+line.newLine+'
\n
'+line.content+"
\n\n"},generateSideBySideJsonHtml=function(diffFiles){return'
\n'+diffFiles.map(function(file){return'
\n
\n
\n +'+file.addedLines+'\n -'+file.deletedLines+'\n
\n
'+getDiffName(file.oldName,file.newName)+'
\n
\n
\n
\n
\n \n \n '+generateLeftSideFileHtml(file)+' \n
\n
\n
\n
\n
\n \n \n '+generateRightSideFileHtml(file)+" \n
\n
\n
\n
\n
\n"}).join("\n")+"
\n"},generateLeftSideFileHtml=function(file){return file.blocks.map(function(block){return'\n \n
'+escape(block.header)+"
\n\n"+block.lines.map(function(line){var emptyLine=function(){var lineData={};return lineData.number="",lineData.content="",lineData.type=LINE_TYPE.CONTEXT,lineData},escapedLine=escape(line.content),lines=[],lineData={};switch(line.type){case LINE_TYPE.INSERTS:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=removeInserts(escapedLine),lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData);break;case LINE_TYPE.ALL_NEW:lines.push(new emptyLine);break;case LINE_TYPE.DELETES:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;case LINE_TYPE.ALL_DELETED:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;case LINE_TYPE.INSERTS_AND_DELETES:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=generateLineDeletions(escapedLine),lineData.type=LINE_TYPE.DELETES,lines.push(lineData);break;default:lineData={},lineData.number=valueOrEmpty(line.oldNumber),lineData.content=escapedLine,lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData)}return"\n"+lines.map(generateSingleLineHtml).join("\n")+"\n"}).join("\n")}).join("\n")},generateRightSideFileHtml=function(file){return file.blocks.map(function(block){return'\n \n
\n\n'+block.lines.map(function(line){var emptyLine=function(){var lineData={};return lineData.number="",lineData.content="",lineData.type=LINE_TYPE.CONTEXT,lineData},escapedLine=escape(line.content),lines=[],lineData={};switch(line.type){case LINE_TYPE.INSERTS:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;case LINE_TYPE.ALL_NEW:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;case LINE_TYPE.DELETES:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=removeDeletes(escapedLine),lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData);break;case LINE_TYPE.ALL_DELETED:lines.push(new emptyLine);break;case LINE_TYPE.INSERTS_AND_DELETES:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=generateLineInsertions(escapedLine),lineData.type=LINE_TYPE.INSERTS,lines.push(lineData);break;default:lineData={},lineData.number=valueOrEmpty(line.newNumber),lineData.content=escapedLine,lineData.type=LINE_TYPE.CONTEXT,lines.push(lineData)}return"\n"+lines.map(generateSingleLineHtml).join("\n")+"\n"}).join("\n")}).join("\n")},generateSingleLineHtml=function(line){return''+line.number+'\n
'+line.content+"
\n"},getDiffName=function(oldFilename,newFilename){return oldFilename===newFilename?newFilename:oldFilename+" -> "+newFilename},generateLineInsertions=function(line){return line.slice(0).replace(/(\[-.*?-\])/g,"").replace(/({\+(.*?)\+})/g,"$2")},generateLineDeletions=function(line){return line.slice(0).replace(/({\+.*?\+})/g,"").replace(/(\[-(.*?)-\])/g,"$2")},removeDeletes=function(line){return line.slice(0).replace(/({\+.*?\+})/g,"").replace(/(\[-.*?-\])/g,"")},removeInserts=function(line){return line.slice(0).replace(/({\+.*?\+})/g,"").replace(/(\[-.*?-\])/g,"")};return{getInstance:function(){return void 0===instance&&(instance=new Diff2Html,instance.constructor=null),instance}}}(),window.Diff2Html=ClassVariable.getInstance(),window.Diff2Html}(window); \ No newline at end of file +!function(window){var ClassVariable;return ClassVariable=function(){function Diff2Html(){}function escape(str){return str.slice(0).replace(/&/g,"&").replace(//g,">").replace(/\t/g," ")}function startsWith(str,start){return 0===str.indexOf(start)}function valueOrEmpty(value){return value?value:""}var LINE_TYPE={INSERTS:"d2h-ins",DELETES:"d2h-del",CONTEXT:"d2h-cntx",INFO:"d2h-info"};Diff2Html.prototype.getPrettyHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateJsonHtml(diffJson)},Diff2Html.prototype.getJsonFromDiff=function(diffInput){return generateDiffJson(diffInput)},Diff2Html.prototype.getPrettyHtmlFromJson=function(diffJson){return generateJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromDiff=function(diffInput){var diffJson=generateDiffJson(diffInput);return generateSideBySideJsonHtml(diffJson)},Diff2Html.prototype.getPrettySideBySideHtmlFromJson=function(diffJson){return generateSideBySideJsonHtml(diffJson)};var instance,generateDiffJson=function(diffInput){var files=[],currentFile=null,currentBlock=null,oldLine=null,newLine=null,saveBlock=function(){currentBlock&&(currentFile.blocks.push(currentBlock),currentBlock=null)},saveFile=function(){currentFile&&(files.push(currentFile),currentFile=null)},startFile=function(line){saveBlock(),saveFile(),currentFile={},currentFile.blocks=[],currentFile.deletedLines=0,currentFile.addedLines=0;var values=/^diff --git a\/(\S+) b\/(\S+).*$/.exec(line);currentFile.oldName=values[1],currentFile.newName=values[2]},startBlock=function(line){saveBlock();var values;(values=/^(@@ -(\d+),(\d+) \+(\d+),(\d+) @@).*/.exec(line))?(oldLine=values[2],newLine=values[4]):(oldLine=0,newLine=0),currentBlock={},currentBlock.lines=[],currentBlock.oldStartLine=oldLine,currentBlock.newStartLine=newLine,currentBlock.header=line},createLine=function(line){var currentLine={};currentLine.content=line,startsWith(line,"+")?(currentFile.addedLines++,currentLine.type=LINE_TYPE.INSERTS,currentLine.oldNumber=null,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine)):startsWith(line,"-")?(currentFile.deletedLines++,currentLine.type=LINE_TYPE.DELETES,currentLine.oldNumber=oldLine++,currentLine.newNumber=null,currentBlock.lines.push(currentLine)):(currentLine.type=LINE_TYPE.CONTEXT,currentLine.oldNumber=oldLine++,currentLine.newNumber=newLine++,currentBlock.lines.push(currentLine))},diffLines=diffInput.split("\n");return diffLines.forEach(function(line){!line||startsWith(line,"*")||startsWith(line,"new")||startsWith(line,"index")||startsWith(line,"---")||startsWith(line,"+++")||(startsWith(line,"diff")?startFile(line):currentFile&&startsWith(line,"@@")?startBlock(line):currentBlock&&createLine(line))}),saveBlock(),saveFile(),files},generateJsonHtml=function(diffFiles){return'
\n'+diffFiles.map(function(file){return'
\n
\n
\n +'+file.addedLines+'\n -'+file.deletedLines+'\n
\n
'+getDiffName(file.oldName,file.newName)+'
\n
\n
\n
\n \n \n '+generateFileHtml(file)+" \n
\n
\n
\n
\n"}).join("\n")+"
\n"},generateFileHtml=function(file){return file.blocks.map(function(block){for(var lines='\n \n
'+escape(block.header)+"
\n\n",i=0;i\n
'+valueOrEmpty(oldNumber)+'
'+valueOrEmpty(newNumber)+'
\n
'+content+"
\n\n"},generateSideBySideJsonHtml=function(diffFiles){return'
\n'+diffFiles.map(function(file){var diffs=generateSideBySideFileHtml(file);return'
\n
\n
\n +'+file.addedLines+'\n -'+file.deletedLines+'\n
\n
'+getDiffName(file.oldName,file.newName)+'
\n
\n
\n
\n
\n \n \n '+diffs.left+' \n
\n
\n
\n
\n
\n \n \n '+diffs.right+" \n
\n
\n
\n
\n
\n"}).join("\n")+"
\n"},generateSideBySideFileHtml=function(file){var fileHtml={};return fileHtml.left="",fileHtml.right="",file.blocks.forEach(function(block){fileHtml.left+='\n \n
'+escape(block.header)+"
\n\n",fileHtml.right+='\n \n
\n\n';for(var i=0;i\n",fileHtml.right+="\n";var line=block.lines[i],newLine=block.lines[i+1];if(line.type==LINE_TYPE.DELETES&&newLine&&newLine.type==LINE_TYPE.INSERTS){i++;var escapedLine=escape(line.content),nextEscapedLine=escape(newLine.content),diff=diffString(escapedLine,nextEscapedLine);fileHtml.left+=generateSingleLineHtml(line.type,line.oldNumber,removeIns(diff)),fileHtml.right+=generateSingleLineHtml(newLine.type,newLine.newNumber,removeDel(diff))}else line.type==LINE_TYPE.DELETES?(fileHtml.left+=generateSingleLineHtml(line.type,line.oldNumber,line.content),fileHtml.right+=generateSingleLineHtml(LINE_TYPE.CONTEXT,"","","")):line.type==LINE_TYPE.INSERTS?(fileHtml.left+=generateSingleLineHtml(LINE_TYPE.CONTEXT,"","",""),fileHtml.right+=generateSingleLineHtml(line.type,line.newNumber,line.content)):(fileHtml.left+=generateSingleLineHtml(line.type,line.oldNumber,line.content),fileHtml.right+=generateSingleLineHtml(line.type,line.newNumber,line.content));fileHtml.left+="\n",fileHtml.right+="\n"}}),fileHtml},generateSingleLineHtml=function(type,number,content){return''+number+'\n
'+content+"
\n"},getDiffName=function(oldFilename,newFilename){return oldFilename===newFilename?newFilename:oldFilename+" -> "+newFilename},removeIns=function(line){return line.replace(/((.*?)<\/ins>)/g,"")},removeDel=function(line){return line.replace(/((.*?)<\/del>)/g,"")};return{getInstance:function(){return void 0===instance&&(instance=new Diff2Html,instance.constructor=null),instance}}}(),window.Diff2Html=ClassVariable.getInstance(),window.Diff2Html}(window); \ No newline at end of file diff --git a/index.html b/index.html index 65f430d..4f9a382 100644 --- a/index.html +++ b/index.html @@ -8,59 +8,174 @@ Diff to HTML (template.html) Author: rtfpessoa Date: Friday 29 August 2014 - Last Update: Sunday 14 September 2014 + Last Update: Saturday 27 September 2014 --> - - + - - + +