compatibility with node code
This commit is contained in:
Rodrigo Fernandes
parent
a48fac6f1b
commit
0662960fae
11 changed files with 541 additions and 569 deletions
51
diff2html.js
51
diff2html.js
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
*
|
||||
* Diff to HTML (diff2html.js)
|
||||
* Author: rtfpessoa
|
||||
*
|
||||
* Diff commands:
|
||||
* git diff
|
||||
*/
|
||||
|
||||
var diffParser = new DiffParser();
|
||||
var htmlPrinter = new HtmlPrinter();
|
||||
|
||||
function Diff2Html() {
|
||||
}
|
||||
|
||||
/*
|
||||
* Generates pretty html from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
|
||||
var diffJson = diffParser.generateDiffJson(diffInput);
|
||||
return htmlPrinter.generateLineByLineJsonHtml(diffJson);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates json object from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
|
||||
return diffParser.generateDiffJson(diffInput);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates pretty html from a json object
|
||||
*/
|
||||
Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
|
||||
return htmlPrinter.generateLineByLineJsonHtml(diffJson);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates pretty side by side html from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
|
||||
var diffJson = diffParser.generateDiffJson(diffInput);
|
||||
return htmlPrinter.generateSideBySideJsonHtml(diffJson);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates pretty side by side html from a json object
|
||||
*/
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
|
||||
return htmlPrinter.generateSideBySideJsonHtml(diffJson);
|
||||
};
|
||||
|
|
@ -7,8 +7,6 @@
|
|||
<!--
|
||||
Diff to HTML (template.html)
|
||||
Author: rtfpessoa
|
||||
Date: Friday 29 August 2014
|
||||
Last Update: Sunday 2 February 2015
|
||||
-->
|
||||
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
|
||||
|
|
@ -16,8 +14,8 @@
|
|||
|
||||
<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
|
||||
|
||||
<!--<script type="text/javascript" src="lib/jsdiff.js"></script>-->
|
||||
<script type="text/javascript" src="lib/diff.js"></script>
|
||||
<script type="text/javascript" src="lib/fakeRequire.js"></script>
|
||||
|
||||
<script type="text/javascript" src="src/utils.js"></script>
|
||||
<script type="text/javascript" src="src/diff-parser.js"></script>
|
||||
|
|
@ -25,7 +23,7 @@
|
|||
<script type="text/javascript" src="src/side-by-side-printer.js"></script>
|
||||
<script type="text/javascript" src="src/line-by-line-printer.js"></script>
|
||||
<script type="text/javascript" src="src/html-printer.js"></script>
|
||||
<script type="text/javascript" src="diff2html.js"></script>
|
||||
<script type="text/javascript" src="src/diff2html.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script>
|
||||
<script>
|
||||
|
|
@ -188,7 +186,7 @@
|
|||
'-});\n';
|
||||
|
||||
$(document).ready(function () {
|
||||
var diff2Html = new Diff2Html();
|
||||
var diff2Html = Diff2Html;
|
||||
var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
|
||||
|
||||
var languages = diffJson.map(function (line) {
|
||||
|
|
|
|||
4
lib/fakeRequire.js
Normal file
4
lib/fakeRequire.js
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
var global = this;
|
||||
function require() {
|
||||
return global;
|
||||
}
|
||||
101
lib/jsdiff.js
101
lib/jsdiff.js
|
|
@ -1,101 +0,0 @@
|
|||
/*
|
||||
* Javascript Diff Algorithm
|
||||
* By John Resig (http://ejohn.org/)
|
||||
* Modified by Chu Alan "sprite"
|
||||
* Modified by Rodrigo Fernandes "rtfpessoa"
|
||||
*
|
||||
* Released under the MIT license.
|
||||
*
|
||||
* More Info:
|
||||
* http://ejohn.org/projects/javascript-diff-algorithm/
|
||||
*/
|
||||
|
||||
function JsDiff(o, n) {
|
||||
o = o.replace(/\s+$/, '');
|
||||
n = n.replace(/\s+$/, '');
|
||||
|
||||
var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
|
||||
var str = "";
|
||||
|
||||
var oSpace = o.match(/\s+/g);
|
||||
if (oSpace == null) {
|
||||
oSpace = ["\n"];
|
||||
} else {
|
||||
oSpace.push("\n");
|
||||
}
|
||||
var nSpace = n.match(/\s+/g);
|
||||
if (nSpace == null) {
|
||||
nSpace = ["\n"];
|
||||
} else {
|
||||
nSpace.push("\n");
|
||||
}
|
||||
|
||||
if (out.n.length == 0) {
|
||||
for (var i = 0; i < out.o.length; i++) {
|
||||
str += '<del>' + out.o[i] + oSpace[i] + "</del>";
|
||||
}
|
||||
} else {
|
||||
if (out.n[0].text == null) {
|
||||
for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
|
||||
str += '<del>' + out.o[n] + oSpace[n] + "</del>";
|
||||
}
|
||||
}
|
||||
|
||||
for (var i = 0; i < out.n.length; i++) {
|
||||
if (out.n[i].text == null) {
|
||||
str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
|
||||
} else {
|
||||
var pre = "";
|
||||
|
||||
for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
|
||||
pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
|
||||
}
|
||||
str += " " + out.n[i].text + nSpace[i] + pre;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
function diff(o, n) {
|
||||
var ns = new Object();
|
||||
var os = new Object();
|
||||
|
||||
for (var i = 0; i < n.length; i++) {
|
||||
if (ns[n[i]] == null)
|
||||
ns[n[i]] = {rows: new Array(), o: null};
|
||||
ns[n[i]].rows.push(i);
|
||||
}
|
||||
|
||||
for (var i = 0; i < o.length; i++) {
|
||||
if (os[o[i]] == null)
|
||||
os[o[i]] = {rows: new Array(), n: null};
|
||||
os[o[i]].rows.push(i);
|
||||
}
|
||||
|
||||
for (var i in ns) {
|
||||
if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
|
||||
n[ns[i].rows[0]] = {text: n[ns[i].rows[0]], row: os[i].rows[0]};
|
||||
o[os[i].rows[0]] = {text: o[os[i].rows[0]], row: ns[i].rows[0]};
|
||||
}
|
||||
}
|
||||
|
||||
for (var i = 0; i < n.length - 1; i++) {
|
||||
if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
|
||||
n[i + 1] == o[n[i].row + 1]) {
|
||||
n[i + 1] = {text: n[i + 1], row: n[i].row + 1};
|
||||
o[n[i].row + 1] = {text: o[n[i].row + 1], row: i + 1};
|
||||
}
|
||||
}
|
||||
|
||||
for (var i = n.length - 1; i > 0; i--) {
|
||||
if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
|
||||
n[i - 1] == o[n[i].row - 1]) {
|
||||
n[i - 1] = {text: n[i - 1], row: n[i].row - 1};
|
||||
o[n[i].row - 1] = {text: o[n[i].row - 1], row: i - 1};
|
||||
}
|
||||
}
|
||||
|
||||
return {o: o, n: n};
|
||||
}
|
||||
|
|
@ -5,143 +5,153 @@
|
|||
*
|
||||
*/
|
||||
|
||||
var utils = new Utils();
|
||||
(function (global, undefined) {
|
||||
|
||||
var LINE_TYPE = {
|
||||
INSERTS: "d2h-ins",
|
||||
DELETES: "d2h-del",
|
||||
CONTEXT: "d2h-cntx",
|
||||
INFO: "d2h-info"
|
||||
};
|
||||
var utils = require("./utils.js").Utils;
|
||||
|
||||
function DiffParser() {
|
||||
}
|
||||
|
||||
DiffParser.prototype.LINE_TYPE = LINE_TYPE;
|
||||
|
||||
DiffParser.prototype.generateDiffJson = function (diffInput) {
|
||||
var files = [],
|
||||
currentFile = null,
|
||||
currentBlock = null,
|
||||
oldLine = null,
|
||||
newLine = null;
|
||||
|
||||
var saveBlock = function () {
|
||||
/* add previous block(if exists) before start a new file */
|
||||
if (currentBlock) {
|
||||
currentFile.blocks.push(currentBlock);
|
||||
currentBlock = null;
|
||||
}
|
||||
var LINE_TYPE = {
|
||||
INSERTS: "d2h-ins",
|
||||
DELETES: "d2h-del",
|
||||
CONTEXT: "d2h-cntx",
|
||||
INFO: "d2h-info"
|
||||
};
|
||||
|
||||
var saveFile = function () {
|
||||
/*
|
||||
* add previous file(if exists) before start a new one
|
||||
* if it has name (to avoid binary files errors)
|
||||
*/
|
||||
if (currentFile && currentFile.newName) {
|
||||
files.push(currentFile);
|
||||
currentFile = null;
|
||||
}
|
||||
};
|
||||
function DiffParser() {
|
||||
}
|
||||
|
||||
DiffParser.prototype.LINE_TYPE = LINE_TYPE;
|
||||
|
||||
DiffParser.prototype.generateDiffJson = function (diffInput) {
|
||||
var files = [],
|
||||
currentFile = null,
|
||||
currentBlock = null,
|
||||
oldLine = null,
|
||||
newLine = null;
|
||||
|
||||
var saveBlock = function () {
|
||||
/* add previous block(if exists) before start a new file */
|
||||
if (currentBlock) {
|
||||
currentFile.blocks.push(currentBlock);
|
||||
currentBlock = null;
|
||||
}
|
||||
};
|
||||
|
||||
var saveFile = function () {
|
||||
/*
|
||||
* add previous file(if exists) before start a new one
|
||||
* if it has name (to avoid binary files errors)
|
||||
*/
|
||||
if (currentFile && currentFile.newName) {
|
||||
files.push(currentFile);
|
||||
currentFile = null;
|
||||
}
|
||||
};
|
||||
|
||||
var startFile = function () {
|
||||
saveBlock();
|
||||
saveFile();
|
||||
|
||||
/* create file structure */
|
||||
currentFile = {};
|
||||
currentFile.blocks = [];
|
||||
currentFile.deletedLines = 0;
|
||||
currentFile.addedLines = 0;
|
||||
};
|
||||
|
||||
var startBlock = function (line) {
|
||||
saveBlock();
|
||||
|
||||
var values;
|
||||
|
||||
if (values = /^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line)) {
|
||||
currentFile.isTripleDiff = false;
|
||||
} else if (values = /^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line)) {
|
||||
currentFile.isTripleDiff = true;
|
||||
} else {
|
||||
values = [0, 0];
|
||||
currentFile.isTripleDiff = false;
|
||||
}
|
||||
|
||||
oldLine = values[1];
|
||||
newLine = values[2];
|
||||
|
||||
/* create block metadata */
|
||||
currentBlock = {};
|
||||
currentBlock.lines = [];
|
||||
currentBlock.oldStartLine = oldLine;
|
||||
currentBlock.newStartLine = newLine;
|
||||
currentBlock.header = line;
|
||||
};
|
||||
|
||||
var createLine = function (line) {
|
||||
var currentLine = {};
|
||||
currentLine.content = line;
|
||||
|
||||
/* fill the line data */
|
||||
if (utils.startsWith(line, "+") || utils.startsWith(line, " +")) {
|
||||
currentFile.addedLines++;
|
||||
|
||||
currentLine.type = LINE_TYPE.INSERTS;
|
||||
currentLine.oldNumber = null;
|
||||
currentLine.newNumber = newLine++;
|
||||
|
||||
currentBlock.lines.push(currentLine);
|
||||
|
||||
} else if (utils.startsWith(line, "-") || utils.startsWith(line, " -")) {
|
||||
currentFile.deletedLines++;
|
||||
|
||||
currentLine.type = LINE_TYPE.DELETES;
|
||||
currentLine.oldNumber = oldLine++;
|
||||
currentLine.newNumber = null;
|
||||
|
||||
currentBlock.lines.push(currentLine);
|
||||
|
||||
} else {
|
||||
currentLine.type = LINE_TYPE.CONTEXT;
|
||||
currentLine.oldNumber = oldLine++;
|
||||
currentLine.newNumber = newLine++;
|
||||
|
||||
currentBlock.lines.push(currentLine);
|
||||
}
|
||||
};
|
||||
|
||||
var diffLines = diffInput.split("\n");
|
||||
diffLines.forEach(function (line) {
|
||||
// Unmerged paths, and possibly other non-diffable files
|
||||
// https://github.com/scottgonzalez/pretty-diff/issues/11
|
||||
// Also, remove some useless lines
|
||||
if (!line || utils.startsWith(line, "*") ||
|
||||
utils.startsWith(line, "new") || utils.startsWith(line, "index")) {
|
||||
return;
|
||||
}
|
||||
|
||||
var values = [];
|
||||
if (utils.startsWith(line, "diff")) {
|
||||
startFile();
|
||||
} else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
|
||||
currentFile.oldName = values[1];
|
||||
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [b]?\/(\S+).*$/.exec(line))) {
|
||||
currentFile.newName = values[1];
|
||||
|
||||
var fileSplit = currentFile.newName.split(".");
|
||||
currentFile.language = fileSplit[fileSplit.length - 1];
|
||||
} else if (currentFile && utils.startsWith(line, "@@")) {
|
||||
startBlock(line);
|
||||
} else if (currentBlock) {
|
||||
createLine(line);
|
||||
}
|
||||
});
|
||||
|
||||
var startFile = function () {
|
||||
saveBlock();
|
||||
saveFile();
|
||||
|
||||
/* create file structure */
|
||||
currentFile = {};
|
||||
currentFile.blocks = [];
|
||||
currentFile.deletedLines = 0;
|
||||
currentFile.addedLines = 0;
|
||||
return files;
|
||||
};
|
||||
|
||||
var startBlock = function (line) {
|
||||
saveBlock();
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.DiffParser = new DiffParser();
|
||||
} else if (typeof global.DiffParser === 'undefined') {
|
||||
global.DiffParser = new DiffParser();
|
||||
}
|
||||
|
||||
var values;
|
||||
|
||||
if (values = /^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line)) {
|
||||
currentFile.isTripleDiff = false;
|
||||
} else if (values = /^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line)) {
|
||||
currentFile.isTripleDiff = true;
|
||||
} else {
|
||||
values = [0, 0];
|
||||
currentFile.isTripleDiff = false;
|
||||
}
|
||||
|
||||
oldLine = values[1];
|
||||
newLine = values[2];
|
||||
|
||||
/* create block metadata */
|
||||
currentBlock = {};
|
||||
currentBlock.lines = [];
|
||||
currentBlock.oldStartLine = oldLine;
|
||||
currentBlock.newStartLine = newLine;
|
||||
currentBlock.header = line;
|
||||
};
|
||||
|
||||
var createLine = function (line) {
|
||||
var currentLine = {};
|
||||
currentLine.content = line;
|
||||
|
||||
/* fill the line data */
|
||||
if (utils.startsWith(line, "+") || utils.startsWith(line, " +")) {
|
||||
currentFile.addedLines++;
|
||||
|
||||
currentLine.type = LINE_TYPE.INSERTS;
|
||||
currentLine.oldNumber = null;
|
||||
currentLine.newNumber = newLine++;
|
||||
|
||||
currentBlock.lines.push(currentLine);
|
||||
|
||||
} else if (utils.startsWith(line, "-") || utils.startsWith(line, " -")) {
|
||||
currentFile.deletedLines++;
|
||||
|
||||
currentLine.type = LINE_TYPE.DELETES;
|
||||
currentLine.oldNumber = oldLine++;
|
||||
currentLine.newNumber = null;
|
||||
|
||||
currentBlock.lines.push(currentLine);
|
||||
|
||||
} else {
|
||||
currentLine.type = LINE_TYPE.CONTEXT;
|
||||
currentLine.oldNumber = oldLine++;
|
||||
currentLine.newNumber = newLine++;
|
||||
|
||||
currentBlock.lines.push(currentLine);
|
||||
}
|
||||
};
|
||||
|
||||
var diffLines = diffInput.split("\n");
|
||||
diffLines.forEach(function (line) {
|
||||
// Unmerged paths, and possibly other non-diffable files
|
||||
// https://github.com/scottgonzalez/pretty-diff/issues/11
|
||||
// Also, remove some useless lines
|
||||
if (!line || utils.startsWith(line, "*") ||
|
||||
utils.startsWith(line, "new") || utils.startsWith(line, "index")) {
|
||||
return;
|
||||
}
|
||||
|
||||
var values = [];
|
||||
if (utils.startsWith(line, "diff")) {
|
||||
startFile();
|
||||
} else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
|
||||
currentFile.oldName = values[1];
|
||||
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [b]?\/(\S+).*$/.exec(line))) {
|
||||
currentFile.newName = values[1];
|
||||
|
||||
var fileSplit = currentFile.newName.split(".");
|
||||
currentFile.language = fileSplit[fileSplit.length - 1];
|
||||
} else if (currentFile && utils.startsWith(line, "@@")) {
|
||||
startBlock(line);
|
||||
} else if (currentBlock) {
|
||||
createLine(line);
|
||||
}
|
||||
});
|
||||
|
||||
saveBlock();
|
||||
saveFile();
|
||||
|
||||
return files;
|
||||
};
|
||||
})(this);
|
||||
|
|
|
|||
61
src/diff2html.js
Normal file
61
src/diff2html.js
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
/*
|
||||
*
|
||||
* Diff to HTML (diff2html.js)
|
||||
* Author: rtfpessoa
|
||||
*
|
||||
* Diff commands:
|
||||
* git diff
|
||||
*/
|
||||
|
||||
(function (global, undefined) {
|
||||
|
||||
var diffParser = require("./diff-parser.js").DiffParser;
|
||||
var htmlPrinter = require("./html-printer.js").HtmlPrinter;
|
||||
|
||||
function Diff2Html() {
|
||||
}
|
||||
|
||||
/*
|
||||
* Generates pretty html from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput) {
|
||||
var diffJson = diffParser.generateDiffJson(diffInput);
|
||||
return htmlPrinter.generateLineByLineJsonHtml(diffJson);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates json object from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
|
||||
return diffParser.generateDiffJson(diffInput);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates pretty html from a json object
|
||||
*/
|
||||
Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson) {
|
||||
return htmlPrinter.generateLineByLineJsonHtml(diffJson);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates pretty side by side html from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput) {
|
||||
var diffJson = diffParser.generateDiffJson(diffInput);
|
||||
return htmlPrinter.generateSideBySideJsonHtml(diffJson);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates pretty side by side html from a json object
|
||||
*/
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson) {
|
||||
return htmlPrinter.generateSideBySideJsonHtml(diffJson);
|
||||
};
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.Diff2Html = new Diff2Html();
|
||||
} else if (typeof global.Diff2Html === 'undefined') {
|
||||
global.Diff2Html = new Diff2Html();
|
||||
}
|
||||
|
||||
})(this);
|
||||
|
|
@ -5,12 +5,22 @@
|
|||
*
|
||||
*/
|
||||
|
||||
var lineByLinePrinter = new LineByLinePrinter();
|
||||
var sideBySidePrinter = new SideBySidePrinter();
|
||||
(function (global, undefined) {
|
||||
|
||||
function HtmlPrinter() {
|
||||
}
|
||||
var lineByLinePrinter = require("./line-by-line-printer.js").LineByLinePrinter;
|
||||
var sideBySidePrinter = require("./side-by-side-printer.js").SideBySidePrinter;
|
||||
|
||||
HtmlPrinter.prototype.generateLineByLineJsonHtml = lineByLinePrinter.generateLineByLineJsonHtml;
|
||||
function HtmlPrinter() {
|
||||
}
|
||||
|
||||
HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml;
|
||||
HtmlPrinter.prototype.generateLineByLineJsonHtml = lineByLinePrinter.generateLineByLineJsonHtml;
|
||||
|
||||
HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml;
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.HtmlPrinter = new HtmlPrinter();
|
||||
} else if (typeof global.HtmlPrinter === 'undefined') {
|
||||
global.HtmlPrinter = new HtmlPrinter();
|
||||
}
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,116 +5,126 @@
|
|||
*
|
||||
*/
|
||||
|
||||
var diffParser = new DiffParser();
|
||||
var printerUtils = new PrinterUtils();
|
||||
var utils = new Utils();
|
||||
(function (global, undefined) {
|
||||
|
||||
function LineByLinePrinter() {
|
||||
}
|
||||
var diffParser = require("./diff-parser.js").DiffParser;
|
||||
var printerUtils = require("./printer-utils.js").PrinterUtils;
|
||||
var utils = require("./utils.js").Utils;
|
||||
|
||||
LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
" <div class=\"d2h-file-stats\">\n" +
|
||||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + generateFileHtml(file) +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n";
|
||||
}).join("\n") +
|
||||
"</div>\n";
|
||||
};
|
||||
function LineByLinePrinter() {
|
||||
}
|
||||
|
||||
function generateFileHtml(file) {
|
||||
return file.blocks.map(function (block) {
|
||||
LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
" <div class=\"d2h-file-stats\">\n" +
|
||||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + generateFileHtml(file) +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n";
|
||||
}).join("\n") +
|
||||
"</div>\n";
|
||||
};
|
||||
|
||||
var lines = "<tr>\n" +
|
||||
" <td class=\"d2h-code-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
|
||||
function generateFileHtml(file) {
|
||||
return file.blocks.map(function (block) {
|
||||
|
||||
var lines = "<tr>\n" +
|
||||
" <td class=\"d2h-code-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
|
||||
var oldLines = [], newLines = [];
|
||||
var processedOldLines = [], processedNewLines = [];
|
||||
|
||||
for (var i = 0; i < block.lines.length; i++) {
|
||||
var line = block.lines[i];
|
||||
var escapedLine = utils.escape(line.content);
|
||||
|
||||
if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
|
||||
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
|
||||
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
|
||||
oldLines.push(line);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
|
||||
newLines.push(line);
|
||||
} else {
|
||||
var j = 0;
|
||||
var oldLine, newLine;
|
||||
var oldEscapedLine, newEscapedLine;
|
||||
|
||||
if (oldLines.length === newLines.length) {
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
oldLine = oldLines[j];
|
||||
newLine = newLines[j];
|
||||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
|
||||
var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, file.isTripleDiff);
|
||||
|
||||
processedOldLines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, diff.o);
|
||||
processedNewLines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.n);
|
||||
}
|
||||
|
||||
lines += processedOldLines + processedNewLines;
|
||||
} else {
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
oldLine = oldLines[j];
|
||||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
lines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine);
|
||||
}
|
||||
|
||||
for (j = 0; j < newLines.length; j++) {
|
||||
newLine = newLines[j];
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
lines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine);
|
||||
}
|
||||
}
|
||||
|
||||
oldLines = [];
|
||||
newLines = [];
|
||||
processedOldLines = [];
|
||||
processedNewLines = [];
|
||||
i--;
|
||||
}
|
||||
}
|
||||
|
||||
return lines;
|
||||
}).join("\n");
|
||||
}
|
||||
|
||||
function generateLineHtml(type, oldNumber, newNumber, content) {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-linenumber " + type + "\">" +
|
||||
" <div class=\"line-num1\">" + utils.valueOrEmpty(oldNumber) + "</div>" +
|
||||
" <div class=\"line-num2\">" + utils.valueOrEmpty(newNumber) + "</div>" +
|
||||
" </td>\n" +
|
||||
" <td class=\"" + type + "\">" +
|
||||
" <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
}
|
||||
|
||||
var oldLines = [], newLines = [];
|
||||
var processedOldLines = [], processedNewLines = [];
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.LineByLinePrinter = new LineByLinePrinter();
|
||||
} else if (typeof global.LineByLinePrinter === 'undefined') {
|
||||
global.LineByLinePrinter = new LineByLinePrinter();
|
||||
}
|
||||
|
||||
for (var i = 0; i < block.lines.length; i++) {
|
||||
var line = block.lines[i];
|
||||
var escapedLine = utils.escape(line.content);
|
||||
|
||||
if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
|
||||
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
|
||||
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
|
||||
oldLines.push(line);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
|
||||
newLines.push(line);
|
||||
} else {
|
||||
var j = 0;
|
||||
var oldLine, newLine;
|
||||
var oldEscapedLine, newEscapedLine;
|
||||
|
||||
if (oldLines.length === newLines.length) {
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
oldLine = oldLines[j];
|
||||
newLine = newLines[j];
|
||||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
|
||||
var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, file.isTripleDiff);
|
||||
|
||||
processedOldLines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, diff.o);
|
||||
processedNewLines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.n);
|
||||
}
|
||||
|
||||
lines += processedOldLines + processedNewLines;
|
||||
} else {
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
oldLine = oldLines[j];
|
||||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
lines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine);
|
||||
}
|
||||
|
||||
for (j = 0; j < newLines.length; j++) {
|
||||
newLine = newLines[j];
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
lines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine);
|
||||
}
|
||||
}
|
||||
|
||||
oldLines = [];
|
||||
newLines = [];
|
||||
processedOldLines = [];
|
||||
processedNewLines = [];
|
||||
i--;
|
||||
}
|
||||
}
|
||||
|
||||
return lines;
|
||||
}).join("\n");
|
||||
}
|
||||
|
||||
function generateLineHtml(type, oldNumber, newNumber, content) {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-linenumber " + type + "\">" +
|
||||
" <div class=\"line-num1\">" + utils.valueOrEmpty(oldNumber) + "</div>" +
|
||||
" <div class=\"line-num2\">" + utils.valueOrEmpty(newNumber) + "</div>" +
|
||||
" </td>\n" +
|
||||
" <td class=\"" + type + "\">" +
|
||||
" <div class=\"d2h-code-line " + type + "\">" + content + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
}
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,57 +5,68 @@
|
|||
*
|
||||
*/
|
||||
|
||||
var jsDiff = JsDiff;
|
||||
(function (global, undefined) {
|
||||
|
||||
function PrinterUtils() {
|
||||
}
|
||||
// dirty hack for browser compatibility
|
||||
var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("../lib/diff.js");
|
||||
|
||||
PrinterUtils.prototype.getDiffName = function (oldFilename, newFilename) {
|
||||
if (oldFilename && newFilename && oldFilename !== newFilename) {
|
||||
return oldFilename + " -> " + newFilename;
|
||||
} else if (newFilename) {
|
||||
return newFilename;
|
||||
} else if (oldFilename) {
|
||||
return oldFilename;
|
||||
} else {
|
||||
return "Unknown filename";
|
||||
function PrinterUtils() {
|
||||
}
|
||||
};
|
||||
|
||||
PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, isTripleDiff) {
|
||||
var lineStart1, lineStart2;
|
||||
PrinterUtils.prototype.getDiffName = function (oldFilename, newFilename) {
|
||||
if (oldFilename && newFilename && oldFilename !== newFilename) {
|
||||
return oldFilename + " -> " + newFilename;
|
||||
} else if (newFilename) {
|
||||
return newFilename;
|
||||
} else if (oldFilename) {
|
||||
return oldFilename;
|
||||
} else {
|
||||
return "Unknown filename";
|
||||
}
|
||||
};
|
||||
|
||||
var prefixSize = 1;
|
||||
PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, isTripleDiff) {
|
||||
var lineStart1, lineStart2;
|
||||
|
||||
if (isTripleDiff) prefixSize = 2;
|
||||
var prefixSize = 1;
|
||||
|
||||
lineStart1 = diffLine1.substr(0, prefixSize);
|
||||
lineStart2 = diffLine2.substr(0, prefixSize);
|
||||
if (isTripleDiff) prefixSize = 2;
|
||||
|
||||
diffLine1 = diffLine1.substr(prefixSize);
|
||||
diffLine2 = diffLine2.substr(prefixSize);
|
||||
lineStart1 = diffLine1.substr(0, prefixSize);
|
||||
lineStart2 = diffLine2.substr(0, prefixSize);
|
||||
|
||||
var diff = jsDiff.diffChars(diffLine1, diffLine2);
|
||||
diffLine1 = diffLine1.substr(prefixSize);
|
||||
diffLine2 = diffLine2.substr(prefixSize);
|
||||
|
||||
var highlightedLine = "";
|
||||
var diff = jsDiff.diffChars(diffLine1, diffLine2);
|
||||
|
||||
diff.forEach(function (part) {
|
||||
var elemType = part.added ? 'ins' : part.removed ? 'del' : null;
|
||||
var highlightedLine = "";
|
||||
|
||||
if (elemType !== null) highlightedLine += "<" + elemType + ">" + part.value + "</" + elemType + ">";
|
||||
else highlightedLine += part.value;
|
||||
});
|
||||
diff.forEach(function (part) {
|
||||
var elemType = part.added ? 'ins' : part.removed ? 'del' : null;
|
||||
|
||||
return {
|
||||
o: lineStart1 + removeIns(highlightedLine),
|
||||
n: lineStart2 + removeDel(highlightedLine)
|
||||
if (elemType !== null) highlightedLine += "<" + elemType + ">" + part.value + "</" + elemType + ">";
|
||||
else highlightedLine += part.value;
|
||||
});
|
||||
|
||||
return {
|
||||
o: lineStart1 + removeIns(highlightedLine),
|
||||
n: lineStart2 + removeDel(highlightedLine)
|
||||
}
|
||||
};
|
||||
|
||||
function removeIns(line) {
|
||||
return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
|
||||
}
|
||||
};
|
||||
|
||||
function removeIns(line) {
|
||||
return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
|
||||
}
|
||||
function removeDel(line) {
|
||||
return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
|
||||
}
|
||||
|
||||
function removeDel(line) {
|
||||
return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
|
||||
}
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.PrinterUtils = new PrinterUtils();
|
||||
} else if (typeof global.PrinterUtils === 'undefined') {
|
||||
global.PrinterUtils = new PrinterUtils();
|
||||
}
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,141 +5,151 @@
|
|||
*
|
||||
*/
|
||||
|
||||
var diffParser = new DiffParser();
|
||||
var printerUtils = new PrinterUtils();
|
||||
var utils = new Utils();
|
||||
(function (global, undefined) {
|
||||
|
||||
function SideBySidePrinter() {
|
||||
}
|
||||
var diffParser = require("./diff-parser.js").DiffParser;
|
||||
var printerUtils = require("./printer-utils.js").PrinterUtils;
|
||||
var utils = require("./utils.js").Utils;
|
||||
|
||||
SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
var diffs = generateSideBySideFileHtml(file);
|
||||
function SideBySidePrinter() {
|
||||
}
|
||||
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
" <div class=\"d2h-file-stats\">\n" +
|
||||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-files-diff\">\n" +
|
||||
" <div class=\"d2h-file-side-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + diffs.left +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-side-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + diffs.right +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n";
|
||||
}).join("\n") +
|
||||
"</div>\n";
|
||||
};
|
||||
SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
var diffs = generateSideBySideFileHtml(file);
|
||||
|
||||
function generateSideBySideFileHtml(file) {
|
||||
var fileHtml = {};
|
||||
fileHtml.left = "";
|
||||
fileHtml.right = "";
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
" <div class=\"d2h-file-stats\">\n" +
|
||||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file.oldName, file.newName) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-files-diff\">\n" +
|
||||
" <div class=\"d2h-file-side-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + diffs.left +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-side-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + diffs.right +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n";
|
||||
}).join("\n") +
|
||||
"</div>\n";
|
||||
};
|
||||
|
||||
file.blocks.forEach(function (block) {
|
||||
function generateSideBySideFileHtml(file) {
|
||||
var fileHtml = {};
|
||||
fileHtml.left = "";
|
||||
fileHtml.right = "";
|
||||
|
||||
fileHtml.left += "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
file.blocks.forEach(function (block) {
|
||||
|
||||
fileHtml.right += "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\"></div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
fileHtml.left += "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
|
||||
var oldLines = [], newLines = [];
|
||||
fileHtml.right += "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\"></div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
|
||||
for (var i = 0; i < block.lines.length; i++) {
|
||||
var line = block.lines[i];
|
||||
var escapedLine = utils.escape(line.content);
|
||||
var oldLines = [], newLines = [];
|
||||
|
||||
if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
|
||||
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
|
||||
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
|
||||
oldLines.push(line);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
|
||||
newLines.push(line);
|
||||
} else {
|
||||
var j = 0;
|
||||
var oldLine, newLine;
|
||||
var oldEscapedLine, newEscapedLine;
|
||||
for (var i = 0; i < block.lines.length; i++) {
|
||||
var line = block.lines[i];
|
||||
var escapedLine = utils.escape(line.content);
|
||||
|
||||
if (oldLines.length === newLines.length) {
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
oldLine = oldLines[j];
|
||||
newLine = newLines[j];
|
||||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
|
||||
var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, file.isTripleDiff);
|
||||
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, diff.o);
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.n);
|
||||
}
|
||||
if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
|
||||
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
|
||||
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
|
||||
oldLines.push(line);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
|
||||
newLines.push(line);
|
||||
} else {
|
||||
var maxLinesNumber = Math.max(oldLines.length, newLines.length);
|
||||
for (j = 0; j < maxLinesNumber; j++) {
|
||||
oldLine = oldLines[j];
|
||||
newLine = newLines[j];
|
||||
var j = 0;
|
||||
var oldLine, newLine;
|
||||
var oldEscapedLine, newEscapedLine;
|
||||
|
||||
if (oldLine && newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else if (oldLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
} else if (newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else {
|
||||
console.error("How did it get here?");
|
||||
if (oldLines.length === newLines.length) {
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
oldLine = oldLines[j];
|
||||
newLine = newLines[j];
|
||||
oldEscapedLine = utils.escape(oldLine.content);
|
||||
newEscapedLine = utils.escape(newLine.content);
|
||||
|
||||
var diff = printerUtils.diffHighlight(oldEscapedLine, newEscapedLine, file.isTripleDiff);
|
||||
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, diff.o);
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.n);
|
||||
}
|
||||
} else {
|
||||
var maxLinesNumber = Math.max(oldLines.length, newLines.length);
|
||||
for (j = 0; j < maxLinesNumber; j++) {
|
||||
oldLine = oldLines[j];
|
||||
newLine = newLines[j];
|
||||
|
||||
if (oldLine && newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else if (oldLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
} else if (newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else {
|
||||
console.error("How did it get here?");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
oldLines = [];
|
||||
newLines = [];
|
||||
i--;
|
||||
}
|
||||
|
||||
oldLines = [];
|
||||
newLines = [];
|
||||
i--;
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
return fileHtml;
|
||||
}
|
||||
return fileHtml;
|
||||
}
|
||||
|
||||
function generateSingleLineHtml(type, number, content) {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
|
||||
" <td class=\"" + type + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + type + "\">" + content + "</div>" +
|
||||
" </td>\n" +
|
||||
" </tr>\n";
|
||||
}
|
||||
function generateSingleLineHtml(type, number, content) {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
|
||||
" <td class=\"" + type + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + type + "\">" + content + "</div>" +
|
||||
" </td>\n" +
|
||||
" </tr>\n";
|
||||
}
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.SideBySidePrinter = new SideBySidePrinter();
|
||||
} else if (typeof global.SideBySidePrinter === 'undefined') {
|
||||
global.SideBySidePrinter = new SideBySidePrinter();
|
||||
}
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
40
src/utils.js
40
src/utils.js
|
|
@ -5,21 +5,31 @@
|
|||
*
|
||||
*/
|
||||
|
||||
function Utils() {
|
||||
}
|
||||
(function (global, undefined) {
|
||||
|
||||
Utils.prototype.escape = function (str) {
|
||||
return str.slice(0)
|
||||
.replace(/&/g, "&")
|
||||
.replace(/</g, "<")
|
||||
.replace(/>/g, ">")
|
||||
.replace(/\t/g, " ");
|
||||
};
|
||||
function Utils() {
|
||||
}
|
||||
|
||||
Utils.prototype.startsWith = function (str, start) {
|
||||
return str.indexOf(start) === 0;
|
||||
};
|
||||
Utils.prototype.escape = function (str) {
|
||||
return str.slice(0)
|
||||
.replace(/&/g, "&")
|
||||
.replace(/</g, "<")
|
||||
.replace(/>/g, ">")
|
||||
.replace(/\t/g, " ");
|
||||
};
|
||||
|
||||
Utils.prototype.valueOrEmpty = function (value) {
|
||||
return value ? value : "";
|
||||
};
|
||||
Utils.prototype.startsWith = function (str, start) {
|
||||
return str.indexOf(start) === 0;
|
||||
};
|
||||
|
||||
Utils.prototype.valueOrEmpty = function (value) {
|
||||
return value ? value : "";
|
||||
};
|
||||
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports.Utils = new Utils();
|
||||
} else if (typeof global.Utils === 'undefined') {
|
||||
global.Utils = new Utils();
|
||||
}
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
Loading…
Reference in a new issue