From a4cf385a7d81647673d3f0661ad6a73887f64b66 Mon Sep 17 00:00:00 2001 From: Paulo Bu Date: Mon, 21 Dec 2015 14:34:16 +0100 Subject: [PATCH 1/2] Makes SideBySidePrinter more object oriented --- src/html-printer.js | 4 ++- src/side-by-side-printer.js | 49 ++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/html-printer.js b/src/html-printer.js index e5d6b2d..a132d29 100644 --- a/src/html-printer.js +++ b/src/html-printer.js @@ -18,7 +18,9 @@ return lineByLinePrinter.generateLineByLineJsonHtml(diffFiles); }; - HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml; + HtmlPrinter.prototype.generateSideBySideJsonHtml = function(diffFiles, config) { + return sideBySidePrinter.generateSideBySideJsonHtml(diffFiles, config); + }; module.exports.HtmlPrinter = new HtmlPrinter(); diff --git a/src/side-by-side-printer.js b/src/side-by-side-printer.js index 6983728..93a8bd8 100644 --- a/src/side-by-side-printer.js +++ b/src/side-by-side-printer.js @@ -16,14 +16,15 @@ } SideBySidePrinter.prototype.generateSideBySideJsonHtml = function(diffFiles, config) { + var that = this; return '
\n' + diffFiles.map(function(file) { var diffs; if (file.blocks.length) { - diffs = generateSideBySideFileHtml(file, config); + diffs = that.generateSideBySideFileHtml(file, config); } else { - diffs = generateEmptyDiff(); + diffs = that.generateEmptyDiff(); } return '
\n' + @@ -69,7 +70,8 @@ return Rematch.distance(amod, bmod); }); - function generateSideBySideFileHtml(file, config) { + SideBySidePrinter.prototype.generateSideBySideFileHtml = function(file, config) { + var that = this; var fileHtml = {}; fileHtml.left = ''; fileHtml.right = ''; @@ -127,10 +129,10 @@ var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config); fileHtml.left += - generateSingleLineHtml(deleteType, oldLine.oldNumber, + that.generateSingleLineHtml(deleteType, oldLine.oldNumber, diff.first.line, diff.first.prefix); fileHtml.right += - generateSingleLineHtml(insertType, newLine.newNumber, + that.generateSingleLineHtml(insertType, newLine.newNumber, diff.second.line, diff.second.prefix); } @@ -138,7 +140,7 @@ var oldSlice = oldLines.slice(common); var newSlice = newLines.slice(common); - var tmpHtml = processLines(oldSlice, newSlice); + var tmpHtml = that.processLines(oldSlice, newSlice); fileHtml.left += tmpHtml.left; fileHtml.right += tmpHtml.right; } @@ -159,11 +161,11 @@ } if (line.type === diffParser.LINE_TYPE.CONTEXT) { - fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine, prefix); - fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); + fileHtml.left += that.generateSingleLineHtml(line.type, line.oldNumber, escapedLine, prefix); + fileHtml.right += that.generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); } else if (line.type === diffParser.LINE_TYPE.INSERTS && !oldLines.length) { - fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); - fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); + fileHtml.left += that.generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); + fileHtml.right += that.generateSingleLineHtml(line.type, line.newNumber, escapedLine, prefix); } else if (line.type === diffParser.LINE_TYPE.DELETES) { oldLines.push(line); } else if (line.type === diffParser.LINE_TYPE.INSERTS && Boolean(oldLines.length)) { @@ -178,9 +180,10 @@ }); return fileHtml; - } + }; - function processLines(oldLines, newLines) { + SideBySidePrinter.prototype.processLines = function(oldLines, newLines) { + var that = this; var fileHtml = {}; fileHtml.left = ''; fileHtml.right = ''; @@ -205,23 +208,23 @@ } if (oldLine && newLine) { - fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); - fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); + fileHtml.left += that.generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); + fileHtml.right += that.generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); } else if (oldLine) { - fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); - fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); + fileHtml.left += that.generateSingleLineHtml(oldLine.type, oldLine.oldNumber, oldContent, oldPrefix); + fileHtml.right += that.generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); } else if (newLine) { - fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); - fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); + fileHtml.left += that.generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', ''); + fileHtml.right += that.generateSingleLineHtml(newLine.type, newLine.newNumber, newContent, newPrefix); } else { console.error('How did it get here?'); } } return fileHtml; - } + }; - function generateSingleLineHtml(type, number, content, prefix) { + SideBySidePrinter.prototype.generateSingleLineHtml = function(type, number, content, prefix) { var htmlPrefix = ''; if (prefix) { htmlPrefix = '' + prefix + ''; @@ -238,9 +241,9 @@ '
' + htmlPrefix + htmlContent + '
' + ' \n' + ' \n'; - } + }; - function generateEmptyDiff() { + SideBySidePrinter.prototype.generateEmptyDiff = function() { var fileHtml = {}; fileHtml.right = ''; @@ -253,7 +256,7 @@ '\n'; return fileHtml; - } + }; module.exports.SideBySidePrinter = new SideBySidePrinter(); From c5f54d29f86fb2dcda02753a0becd9c02841c088 Mon Sep 17 00:00:00 2001 From: Paulo Bu Date: Mon, 21 Dec 2015 14:42:07 +0100 Subject: [PATCH 2/2] Passes config in the SideBySide constructor and uses it from within the class --- src/html-printer.js | 5 +++-- src/side-by-side-printer.js | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/html-printer.js b/src/html-printer.js index a132d29..f954c25 100644 --- a/src/html-printer.js +++ b/src/html-printer.js @@ -8,7 +8,7 @@ (function() { var LineByLinePrinter = require('./line-by-line-printer.js').LineByLinePrinter; - var sideBySidePrinter = require('./side-by-side-printer.js').SideBySidePrinter; + var SideBySidePrinter = require('./side-by-side-printer.js').SideBySidePrinter; function HtmlPrinter() { } @@ -19,7 +19,8 @@ }; HtmlPrinter.prototype.generateSideBySideJsonHtml = function(diffFiles, config) { - return sideBySidePrinter.generateSideBySideJsonHtml(diffFiles, config); + var sideBySidePrinter = new SideBySidePrinter(config); + return sideBySidePrinter.generateSideBySideJsonHtml(diffFiles); }; module.exports.HtmlPrinter = new HtmlPrinter(); diff --git a/src/side-by-side-printer.js b/src/side-by-side-printer.js index 93a8bd8..b7d226b 100644 --- a/src/side-by-side-printer.js +++ b/src/side-by-side-printer.js @@ -12,17 +12,18 @@ var utils = require('./utils.js').Utils; var Rematch = require('./rematch.js').Rematch; - function SideBySidePrinter() { + function SideBySidePrinter(config) { + this.config = config; } - SideBySidePrinter.prototype.generateSideBySideJsonHtml = function(diffFiles, config) { + SideBySidePrinter.prototype.generateSideBySideJsonHtml = function(diffFiles) { var that = this; return '
\n' + diffFiles.map(function(file) { var diffs; if (file.blocks.length) { - diffs = that.generateSideBySideFileHtml(file, config); + diffs = that.generateSideBySideFileHtml(file); } else { diffs = that.generateEmptyDiff(); } @@ -70,7 +71,7 @@ return Rematch.distance(amod, bmod); }); - SideBySidePrinter.prototype.generateSideBySideFileHtml = function(file, config) { + SideBySidePrinter.prototype.generateSideBySideFileHtml = function(file) { var that = this; var fileHtml = {}; fileHtml.left = ''; @@ -101,7 +102,7 @@ var matches; var insertType; var deleteType; - var doMatching = config.matching === 'lines' || config.matching === 'words'; + var doMatching = that.config.matching === 'lines' || that.config.matching === 'words'; if (doMatching) { matches = matcher(oldLines, newLines); @@ -124,9 +125,9 @@ var oldLine = oldLines[j]; var newLine = newLines[j]; - config.isCombined = file.isCombined; + that.config.isCombined = file.isCombined; - var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config); + var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, that.config); fileHtml.left += that.generateSingleLineHtml(deleteType, oldLine.oldNumber, @@ -258,6 +259,6 @@ return fileHtml; }; - module.exports.SideBySidePrinter = new SideBySidePrinter(); + module.exports.SideBySidePrinter = SideBySidePrinter; })();