Commit8006986

committed

fixes#85

1 parentf292c97 commit8006986Copy full SHA for 8006986

File tree

-2

lines changed

java-diff-utils/src
- main/java/com/github/difflib/unifieddiff
  - UnifiedDiffReader.java
- test/java/com/github/difflib/unifieddiff
  - UnifiedDiffReaderTest.java

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`publicfinalclassUnifiedDiffReader {`
`40`	`40`
`41`	`41`	`staticfinalPatternUNIFIED_DIFF_CHUNK_REGEXP =Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");`
`42`		`-staticfinalPatternTIMESTAMP_REGEXP =Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})");`
	`42`	`+staticfinalPatternTIMESTAMP_REGEXP =Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})(?: [+-]\\d+)?");`
`43`	`43`
`44`	`44`	`privatefinalInternalUnifiedDiffReaderREADER;`
`45`	`45`	`privatefinalUnifiedDiffdata =newUnifiedDiff();`
`@@ -258,8 +258,9 @@ private String extractFileName(String _line) {`
`258`	`258`	`if (matcher.find()) {`
`259`	`259`	`line =line.substring(0,matcher.start());`
`260`	`260`	`}`
	`261`	`+line =line.split("\t")[0];`
`261`	`262`	`returnline.substring(4).replaceFirst("^(a\|b\|old\|new)(\\/)?","")`
`262`		`- .replace(TIMESTAMP_REGEXP.toString(),"").trim();`
	`263`	`+ .trim();`
`263`	`264`	`}`
`264`	`265`
`265`	`266`	`privateStringextractTimestamp(Stringline) {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,4 +192,9 @@ public void testParseIssue85() throws IOException {`
`192`	`192`
`193`	`193`	`assertNull(diff.getTail());`
`194`	`194`	`}`
	`195`	`+`
	`196`	`+@Test`
	`197`	`+publicvoidtestTimeStampRegexp() {`
	`198`	`+assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);`
	`199`	`+ }`
`195`	`200`	`}`

Comments

(0)