fixes java-diff-utils#51

wumpz · wumpz · commit ededee059603 · 2019-11-13T23:16:38.000+01:00
diff --git a/java-diff-utils/nb-configuration.xml b/java-diff-utils/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+        <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
+    </properties>
+</project-shared-configuration>
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
@@ -49,7 +49,7 @@
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         <manifestEntries>
                             <!-- identical to OSGI name -->
-                            <Automatic-Module-Name>io.github.java-diff-utils</Automatic-Module-Name>
+                            <Automatic-Module-Name>io.github.javadiffutils</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>
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
@@ -97,7 +97,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 if (processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL) == false) {
                     throw new UnifiedDiffParserException("expected data line not found");
                 }
-                if (originalTxt.size() == old_size && revisedTxt.size() == new_size) {
+                if ((originalTxt.size() == old_size && revisedTxt.size() == new_size) 
+                        || (old_size==0 && new_size==0 && originalTxt.size() == this.old_ln 
+                            && revisedTxt.size() == this.new_ln)) {
                     finalizeChunk();
                     break;
                 }
@@ -241,9 +243,9 @@ private String extractFileName(String _line) {
         Matcher matcher = TIMESTAMP_REGEXP.matcher(_line);
         String line = _line;
         if (matcher.find()) {
-            line = line.substring(1, matcher.start());
+            line = line.substring(0, matcher.start());
         }
-        return line.substring(4).replaceFirst("^(a|b)\\/", "")
+        return line.substring(4).replaceFirst("^(a|b|old|new)(\\/)?", "")
                 .replace(TIMESTAMP_REGEXP.toString(), "").trim();
     }
 
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
@@ -141,4 +141,20 @@ public void testParseIssue33() throws IOException {
         assertThat(diff.getTail()).isNull();
         assertThat(diff.getHeader()).isNull();
     }
+    
+    @Test
+    public void testParseIssue51() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue51.diff"));
+
+        System.out.println(diff);
+
+        assertThat(diff.getFiles().size()).isEqualTo(2);
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("f1");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+        assertThat(diff.getTail()).isNull();
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue51.diff
@@ -0,0 +1,11 @@
+diff -U0 old/f1 new/f1
+--- old/f1	2019-09-25 14:38:06.000000000 +0200
++++ new/f1	2019-09-25 14:38:27.000000000 +0200
+@@ -1 +1 @@
+-a\nb
++a\nb\nd
+diff -U0 old/f2 new/f2
+--- old/f2	2019-09-25 14:38:14.000000000 +0200
++++ new/f2	2019-09-25 14:38:32.000000000 +0200
+@@ -1 +1 @@
+-a\nc

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {`
`97`	`97`	`if (processLine(line, LINE_NORMAL, LINE_ADD, LINE_DEL) == false) {`
`98`	`98`	`throw new UnifiedDiffParserException("expected data line not found");`
`99`	`99`	`}`
`100`		`- if (originalTxt.size() == old_size && revisedTxt.size() == new_size) {`
	`100`	`+ if ((originalTxt.size() == old_size && revisedTxt.size() == new_size)`
	`101`	`+ \|\| (old_size==0 && new_size==0 && originalTxt.size() == this.old_ln`
	`102`	`+ && revisedTxt.size() == this.new_ln)) {`
`101`	`103`	`finalizeChunk();`
`102`	`104`	`break;`
`103`	`105`	`}`
`@@ -241,9 +243,9 @@ private String extractFileName(String _line) {`
`241`	`243`	`Matcher matcher = TIMESTAMP_REGEXP.matcher(_line);`
`242`	`244`	`String line = _line;`
`243`	`245`	`if (matcher.find()) {`
`244`		`- line = line.substring(1, matcher.start());`
	`246`	`+ line = line.substring(0, matcher.start());`
`245`	`247`	`}`
`246`		`- return line.substring(4).replaceFirst("^(a\|b)\\/", "")`
	`248`	`+ return line.substring(4).replaceFirst("^(a\|b\|old\|new)(\\/)?", "")`
`247`	`249`	`.replace(TIMESTAMP_REGEXP.toString(), "").trim();`
`248`	`250`	`}`
`249`	`251`