java-diff-utils
diff --git a/‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java‎
Lines changed: 9 additions & 0 deletions b/‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java‎
Lines changed: 6 additions & 1 deletion b/‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java‎
Lines changed: 31 additions & 0 deletions b/‎java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java‎
Lines changed: 31 additions & 0 deletions
@@ -32,6 +32,7 @@ public final class UnifiedDiffFile {
     private String newFileMode;
     private String deletedFileMode;
     private Patch<String> patch = new Patch<>();
+    private boolean noNewLineAtTheEndOfTheFile = false;
 
     public String getDiffCommand() {
         return diffCommand;
@@ -110,4 +111,12 @@ public String getDeletedFileMode() {
     public void setDeletedFileMode(String deletedFileMode) {
         this.deletedFileMode = deletedFileMode;
     }
+
+    public boolean isNoNewLineAtTheEndOfTheFile() {
+        return noNewLineAtTheEndOfTheFile;
+    }
+
+    public void setNoNewLineAtTheEndOfTheFile(boolean noNewLineAtTheEndOfTheFile) {
+        this.noNewLineAtTheEndOfTheFile = noNewLineAtTheEndOfTheFile;
+    }
 }
@@ -111,8 +111,13 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                     }
                 }
                 line = READER.readLine();
+                
+                if ("\\ No newline at end of file".equals(line)) {                   
+                    actualFile.setNoNewLineAtTheEndOfTheFile(true);
+                    line = READER.readLine();
+                }
             }
-            if (line == null || line.startsWith("--")) {
+            if (line == null || (line.startsWith("--") && !line.startsWith("---"))) {
                 break;
             }
         }
 
@@ -252,4 +252,35 @@ public void testParseIssue104() throws IOException {
 
         assertThat(diff.getTail()).isEqualTo("2.14.4");
     }
+    
+    @Test
+    public void testParseIssue107BazelDiff() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("01-bazel-strip-unused.patch.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(450);
+
+        final UnifiedDiffFile file = diff.getFiles().get(0);
+        assertThat(file.getFromFile()).isEqualTo("./src/main/java/com/amazonaws/AbortedException.java");
+        assertThat(file.getToFile()).isEqualTo("/home/greg/projects/bazel/third_party/aws-sdk-auth-lite/src/main/java/com/amazonaws/AbortedException.java");
+                
+        assertThat(diff.getFiles().stream()
+                .filter(f -> f.isNoNewLineAtTheEndOfTheFile())
+                .count())
+                    .isEqualTo(48);
+    }
+    
+    @Test
+    public void testParseIssue107_2() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue107.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(2);
+
+        final UnifiedDiffFile file = diff.getFiles().get(0);
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("Main.java");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+        
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,13 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`line = READER.readLine();`
	`114`	`+`
	`115`	`+ if ("\\ No newline at end of file".equals(line)) {`
	`116`	`+ actualFile.setNoNewLineAtTheEndOfTheFile(true);`
	`117`	`+ line = READER.readLine();`
	`118`	`+ }`
`114`	`119`	`}`
`115`		`- if (line == null \|\| line.startsWith("--")) {`
	`120`	`+ if (line == null \|\| (line.startsWith("--") && !line.startsWith("---"))) {`
`116`	`121`	`break;`
`117`	`122`	`}`
`118`	`123`	`}`