luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prepare for release 2.0.0-beta2

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-02-23 18:46:01 +00:00
parent e64ac60b98
commit 64c1e827b7
4 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -1,6 +1,6 @@
{
"name": "diff2html",
"version": "2.0.0-beta1",
"version": "2.0.0-beta2",
"homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML",
"keywords": [

42
dist/diff2html.js vendored
View file

@ -72,8 +72,9 @@
/*
* Generates json object from string diff input
*/
Diff2Html.prototype.getJsonFromDiff = function(diffInput) {
return diffParser.generateDiffJson(diffInput);
Diff2Html.prototype.getJsonFromDiff = function(diffInput, config) {
var configOrEmpty = config || {};
return diffParser.generateDiffJson(diffInput, configOrEmpty);
};
/*
@ -84,7 +85,7 @@
var diffJson = diffInput;
if (!configOrEmpty.inputFormat || configOrEmpty.inputFormat === 'diff') {
diffJson = diffParser.generateDiffJson(diffInput);
diffJson = diffParser.generateDiffJson(diffInput, configOrEmpty);
}
var fileList = '';
@ -186,7 +187,7 @@
DiffParser.prototype.LINE_TYPE = LINE_TYPE;
DiffParser.prototype.generateDiffJson = function(diffInput) {
DiffParser.prototype.generateDiffJson = function(diffInput, config) {
var files = [];
var currentFile = null;
var currentBlock = null;
@ -296,11 +297,11 @@
var deletedFileMode = /^deleted file mode (\d{6})/;
var newFileMode = /^new file mode (\d{6})/;
var copyFrom = /^copy from (.+)/;
var copyTo = /^copy to (.+)/;
var copyFrom = /^copy from "?(.+?)"?/;
var copyTo = /^copy to "?(.+?)"?/;
var renameFrom = /^rename from (.+)/;
var renameTo = /^rename to (.+)/;
var renameFrom = /^rename from "?(.+?)"?/;
var renameTo = /^rename to "?(.+?)"?/;
var similarityIndex = /^similarity index (\d+)%/;
var dissimilarityIndex = /^dissimilarity index (\d+)%/;
@ -323,10 +324,10 @@
var values = [];
if (utils.startsWith(line, 'diff')) {
startFile();
} else if (currentFile && !currentFile.oldName && (values = /^--- [aiwco]\/(.+)$/.exec(line))) {
} else if (currentFile && !currentFile.oldName && (values = getSrcFilename(line, config))) {
currentFile.oldName = values[1];
currentFile.language = getExtension(currentFile.oldName, currentFile.language);
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [biwco]?\/(.+)$/.exec(line))) {
} else if (currentFile && !currentFile.newName && (values = getDstFilename(line, config))) {
currentFile.newName = values[1];
currentFile.language = getExtension(currentFile.newName, currentFile.language);
} else if (currentFile && utils.startsWith(line, '@@')) {
@ -389,6 +390,27 @@
return language;
}
function getSrcFilename(line, cfg) {
var prefixes = ["a\\/", "i\\/", "w\\/", "c\\/", "o\\/"];
if (cfg.srcPrefix) prefixes.push(cfg.srcPrefix);
return _getFilename('---', line, prefixes);
}
function getDstFilename(line, cfg) {
var prefixes = ["b\\/", "i\\/", "w\\/", "c\\/", "o\\/"];
if (cfg.dstPrefix) prefixes.push(cfg.dstPrefix);
return _getFilename('\\+\\+\\+', line, prefixes);
}
function _getFilename(linePrefix, line, prefixes) {
var prefixesStr = prefixes.join("|");
return new RegExp('^' + linePrefix + ' "?(?:' + prefixesStr + ')(.+?)"?$').exec(line);
}
module.exports.DiffParser = new DiffParser();
})();

7
dist/diff2html.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "diff2html",
"version": "2.0.0-beta1",
"version": "2.0.0-beta2",
"homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML",
"keywords": [