fixes #85

wumpz · wumpz · commit 8006986dd854 · 2020-06-21T02:04:14.000+02:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -39,7 +39,7 @@
 public final class UnifiedDiffReader {
 
     static final Pattern UNIFIED_DIFF_CHUNK_REGEXP = Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
-    static final Pattern TIMESTAMP_REGEXP = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})");
+    static final Pattern TIMESTAMP_REGEXP = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}\\.\\d{3,})(?: [+-]\\d+)?");
 
     private final InternalUnifiedDiffReader READER;
     private final UnifiedDiff data = new UnifiedDiff();
@@ -258,8 +258,9 @@ private String extractFileName(String _line) {
         if (matcher.find()) {
             line = line.substring(0, matcher.start());
         }
+        line = line.split("\t")[0];
         return line.substring(4).replaceFirst("^(a|b|old|new)(\\/)?", "")
-                .replace(TIMESTAMP_REGEXP.toString(), "").trim();
+                .trim();
     }
 
     private String extractTimestamp(String line) {
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -192,4 +192,9 @@ public void testParseIssue85() throws IOException {
 
         assertNull(diff.getTail());
     }
+    
+    @Test
+    public void testTimeStampRegexp() {
+        assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);
+    }
 }

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`	`+ public void testTimeStampRegexp() {`
	`198`	`+ assertThat("2019-04-18 13:49:39.516149751 +0200").matches(UnifiedDiffReader.TIMESTAMP_REGEXP);`
	`199`	`+ }`
`195`	`200`	`}`