Commite9e3d92

committed

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

1 parent4bea8bb commite9e3d92Copy full SHA for e9e3d92

File tree

-6

lines changed

-6

lines changed

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@`
`32`	`32`	`varoldLine2=null;// Used for combined diff`
`33`	`33`	`varnewLine=null;`
`34`	`34`
	`35`	`+/* Diff Header */`
	`36`	`+varoldFileNameHeader='--- ';`
	`37`	`+varnewFileNameHeader='+++ ';`
	`38`	`+varhunkHeaderPrefix='@@';`
	`39`	`+`
`35`	`40`	`/* Add previous block(if exists) before start a new file */`
`36`	`41`	`varsaveBlock=function(){`
`37`	`42`	`if(currentBlock){`
`@@ -91,7 +96,10 @@`
`91`	`96`	`oldLine2=values[2];`
`92`	`97`	`newLine=values[3];`
`93`	`98`	`}else{`
`94`		`-console.error('Failed to parse lines, starting in 0!');`
	`99`	`+if(utils.startsWith(line,hunkHeaderPrefix)){`
	`100`	`+console.error('Failed to parse lines, starting in 0!');`
	`101`	`+}`
	`102`	`+`
`95`	`103`	`oldLine=0;`
`96`	`104`	`newLine=0;`
`97`	`105`	`currentFile.isCombined=false;`
`@@ -144,11 +152,6 @@`
`144`	`152`	`.replace(/\r\n?/g,'\n')`
`145`	`153`	`.split('\n');`
`146`	`154`
`147`		`-/* Diff Header */`
`148`		`-varoldFileNameHeader='--- ';`
`149`		`-varnewFileNameHeader='+++ ';`
`150`		`-varhunkHeaderPrefix='@@';`
`151`		`-`
`152`	`155`	`/* Diff */`
`153`	`156`	`varoldMode=/^oldmode(\d{6})/;`
`154`	`157`	`varnewMode=/^newmode(\d{6})/;`

Comments

(0)