File tree Expand file tree Collapse file tree 4 files changed +13
-11
lines changed Expand file tree Collapse file tree 4 files changed +13
-11
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " diff2html" ,
3
- "version" : " 2.0.0 " ,
3
+ "version" : " 2.0.1 " ,
4
4
"homepage" : " http://rtfpessoa.github.io/diff2html/" ,
5
5
"description" : " Fast Diff to colorized HTML" ,
6
6
"keywords" : [
Original file line number Diff line number Diff line change @@ -2363,6 +2363,11 @@ process.umask = function() { return 0; };
2363
2363
var oldLine2 = null ; // Used for combined diff
2364
2364
var newLine = null ;
2365
2365
2366
+ /* Diff Header */
2367
+ var oldFileNameHeader = '--- ' ;
2368
+ var newFileNameHeader = '+++ ' ;
2369
+ var hunkHeaderPrefix = '@@' ;
2370
+
2366
2371
/* Add previous block(if exists) before start a new file */
2367
2372
var saveBlock = function ( ) {
2368
2373
if ( currentBlock ) {
@@ -2422,7 +2427,10 @@ process.umask = function() { return 0; };
2422
2427
oldLine2 = values [ 2 ] ;
2423
2428
newLine = values [ 3 ] ;
2424
2429
} else {
2425
- console . error ( 'Failed to parse lines, starting in 0!' ) ;
2430
+ if ( utils . startsWith ( line , hunkHeaderPrefix ) ) {
2431
+ console . error ( 'Failed to parse lines, starting in 0!' ) ;
2432
+ }
2433
+
2426
2434
oldLine = 0 ;
2427
2435
newLine = 0 ;
2428
2436
currentFile . isCombined = false ;
@@ -2475,11 +2483,6 @@ process.umask = function() { return 0; };
2475
2483
. replace ( / \r \n ? / g, '\n' )
2476
2484
. split ( '\n' ) ;
2477
2485
2478
- /* Diff Header */
2479
- var oldFileNameHeader = '--- ' ;
2480
- var newFileNameHeader = '+++ ' ;
2481
- var hunkHeaderPrefix = '@@' ;
2482
-
2483
2486
/* Diff */
2484
2487
var oldMode = / ^ o l d m o d e ( \d { 6 } ) / ;
2485
2488
var newMode = / ^ n e w m o d e ( \d { 6 } ) / ;
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " diff2html" ,
3
- "version" : " 2.0.0 " ,
3
+ "version" : " 2.0.1 " ,
4
4
"homepage" : " http://rtfpessoa.github.io/diff2html/" ,
5
5
"description" : " Fast Diff to colorized HTML" ,
6
6
"keywords" : [
You can’t perform that action at this time.
0 commit comments