diff parser rules matching beginning of line
* diffs inside the diff where matching random line types
This commit is contained in:
parent
fca82f2576
commit
d64f8a2d79
5 changed files with 45 additions and 33 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "diff2html",
|
"name": "diff2html",
|
||||||
"version": "0.2.3",
|
"version": "0.2.4",
|
||||||
"homepage": "https://github.com/rtfpessoa/diff2html",
|
"homepage": "https://github.com/rtfpessoa/diff2html",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Rodrigo Fernandes <rtfrodrigo@gmail.com>"
|
"Rodrigo Fernandes <rtfrodrigo@gmail.com>"
|
||||||
|
|
|
||||||
30
dist/diff2html.js
vendored
30
dist/diff2html.js
vendored
|
|
@ -729,26 +729,26 @@ function require() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Diff */
|
/* Diff */
|
||||||
var oldMode = /old mode (\d{6})/;
|
var oldMode = /^old mode (\d{6})/;
|
||||||
var newMode = /new mode (\d{6})/;
|
var newMode = /^new mode (\d{6})/;
|
||||||
var deletedFileMode = /deleted file mode (\d{6})/;
|
var deletedFileMode = /^deleted file mode (\d{6})/;
|
||||||
var newFileMode = /new file mode (\d{6})/;
|
var newFileMode = /^new file mode (\d{6})/;
|
||||||
|
|
||||||
var copyFrom = /copy from (.+)/;
|
var copyFrom = /^copy from (.+)/;
|
||||||
var copyTo = /copy to (.+)/;
|
var copyTo = /^copy to (.+)/;
|
||||||
|
|
||||||
var renameFrom = /rename from (.+)/;
|
var renameFrom = /^rename from (.+)/;
|
||||||
var renameTo = /rename to (.+)/;
|
var renameTo = /^rename to (.+)/;
|
||||||
|
|
||||||
var similarityIndex = /similarity index (\d+)%/;
|
var similarityIndex = /^similarity index (\d+)%/;
|
||||||
var dissimilarityIndex = /dissimilarity index (\d+)%/;
|
var dissimilarityIndex = /^dissimilarity index (\d+)%/;
|
||||||
var index = /index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/;
|
var index = /^index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/;
|
||||||
|
|
||||||
/* Combined Diff */
|
/* Combined Diff */
|
||||||
var combinedIndex = /index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/;
|
var combinedIndex = /^index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/;
|
||||||
var combinedMode = /mode (\d{6}),(\d{6})..(\d{6})/;
|
var combinedMode = /^mode (\d{6}),(\d{6})..(\d{6})/;
|
||||||
var combinedNewFile = /new file mode (\d{6})/;
|
var combinedNewFile = /^new file mode (\d{6})/;
|
||||||
var combinedDeletedFile = /deleted file mode (\d{6}),(\d{6})/;
|
var combinedDeletedFile = /^deleted file mode (\d{6}),(\d{6})/;
|
||||||
|
|
||||||
var values = [];
|
var values = [];
|
||||||
if (utils.startsWith(line, "diff")) {
|
if (utils.startsWith(line, "diff")) {
|
||||||
|
|
|
||||||
2
dist/diff2html.min.js
vendored
2
dist/diff2html.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -203,7 +203,19 @@
|
||||||
'+ <div data-bind="template: {nodes: ko.utils.parseHtmlFragment(htmlSrc())}"></div>\n' +
|
'+ <div data-bind="template: {nodes: ko.utils.parseHtmlFragment(htmlSrc())}"></div>\n' +
|
||||||
'+ <!-- /ko -->\n' +
|
'+ <!-- /ko -->\n' +
|
||||||
' <div class="btn-load-more" data-bind="visible: loadMoreCount() > 0">\n' +
|
' <div class="btn-load-more" data-bind="visible: loadMoreCount() > 0">\n' +
|
||||||
' </div>\n';
|
' </div>\n' +
|
||||||
|
'diff --git a/test.js b/test.js\n' +
|
||||||
|
'new file mode 100644\n' +
|
||||||
|
'index 0000000..e1e22ec\n' +
|
||||||
|
'--- /dev/null\n' +
|
||||||
|
'+++ b/test.js\n' +
|
||||||
|
'@@ -0,0 +1,6 @@\n' +
|
||||||
|
"+var parser = require('./source/git-parser');\n" +
|
||||||
|
'+\n' +
|
||||||
|
"+var text = 'diff --git a/components/app/app.html b/components/app/app.html\\nindex ecb7a95..027bd9b 100644\\n--- a/components/app/app.html\\n+++ b/components/app/app.html\\n@@ -52,0 +53,3 @@\\n+\\n+\\n+\\n@@ -56,0 +60,3 @@\\n+\\n+\\n+\\n'\n" +
|
||||||
|
'+var patchLineList = [ false, false, false, false ];\n' +
|
||||||
|
'+\n' +
|
||||||
|
'+console.log(parser.parsePatchDiffResult(text, patchLineList));\n';
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
var diff2Html = Diff2Html;
|
var diff2Html = Diff2Html;
|
||||||
|
|
|
||||||
|
|
@ -126,26 +126,26 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Diff */
|
/* Diff */
|
||||||
var oldMode = /old mode (\d{6})/;
|
var oldMode = /^old mode (\d{6})/;
|
||||||
var newMode = /new mode (\d{6})/;
|
var newMode = /^new mode (\d{6})/;
|
||||||
var deletedFileMode = /deleted file mode (\d{6})/;
|
var deletedFileMode = /^deleted file mode (\d{6})/;
|
||||||
var newFileMode = /new file mode (\d{6})/;
|
var newFileMode = /^new file mode (\d{6})/;
|
||||||
|
|
||||||
var copyFrom = /copy from (.+)/;
|
var copyFrom = /^copy from (.+)/;
|
||||||
var copyTo = /copy to (.+)/;
|
var copyTo = /^copy to (.+)/;
|
||||||
|
|
||||||
var renameFrom = /rename from (.+)/;
|
var renameFrom = /^rename from (.+)/;
|
||||||
var renameTo = /rename to (.+)/;
|
var renameTo = /^rename to (.+)/;
|
||||||
|
|
||||||
var similarityIndex = /similarity index (\d+)%/;
|
var similarityIndex = /^similarity index (\d+)%/;
|
||||||
var dissimilarityIndex = /dissimilarity index (\d+)%/;
|
var dissimilarityIndex = /^dissimilarity index (\d+)%/;
|
||||||
var index = /index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/;
|
var index = /^index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/;
|
||||||
|
|
||||||
/* Combined Diff */
|
/* Combined Diff */
|
||||||
var combinedIndex = /index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/;
|
var combinedIndex = /^index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/;
|
||||||
var combinedMode = /mode (\d{6}),(\d{6})..(\d{6})/;
|
var combinedMode = /^mode (\d{6}),(\d{6})..(\d{6})/;
|
||||||
var combinedNewFile = /new file mode (\d{6})/;
|
var combinedNewFile = /^new file mode (\d{6})/;
|
||||||
var combinedDeletedFile = /deleted file mode (\d{6}),(\d{6})/;
|
var combinedDeletedFile = /^deleted file mode (\d{6}),(\d{6})/;
|
||||||
|
|
||||||
var values = [];
|
var values = [];
|
||||||
if (utils.startsWith(line, "diff")) {
|
if (utils.startsWith(line, "diff")) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue