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

Only log failed hunk header parse if line starts with @@

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-07-12 18:44:09 +01:00
parent 4bea8bb758
commit e9e3d928ea
No known key found for this signature in database
GPG key ID: 08E3C5F38969078E
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/diff-parser.js
View file

@ -32,6 +32,11 @@
var oldLine2 = null; // Used for combined diff var oldLine2 = null; // Used for combined diff
var newLine = null; var newLine = null;
/* Diff Header */
var oldFileNameHeader = '--- ';
var newFileNameHeader = '+++ ';
var hunkHeaderPrefix = '@@';
/* Add previous block(if exists) before start a new file */ /* Add previous block(if exists) before start a new file */
var saveBlock = function() { var saveBlock = function() {
if (currentBlock) { if (currentBlock) {
@ -91,7 +96,10 @@
oldLine2 = values[2]; oldLine2 = values[2];
newLine = values[3]; newLine = values[3];
} else { } else {
console.error('Failed to parse lines, starting in 0!'); if (utils.startsWith(line, hunkHeaderPrefix)) {
console.error('Failed to parse lines, starting in 0!');
}
oldLine = 0; oldLine = 0;
newLine = 0; newLine = 0;
currentFile.isCombined = false; currentFile.isCombined = false;
@ -144,11 +152,6 @@
.replace(/\r\n?/g, '\n') .replace(/\r\n?/g, '\n')
.split('\n'); .split('\n');
/* Diff Header */
var oldFileNameHeader = '--- ';
var newFileNameHeader = '+++ ';
var hunkHeaderPrefix = '@@';
/* 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})/;