Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commita40c396

Browse files
committed
1 parent5cc9625 commita40c396

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public final class UnifiedDiffReader {
4646
newUnifiedDiffLine(true,"^index\\s[\\da-zA-Z]+\\.\\.[\\da-zA-Z]+(\\s(\\d+))?$",this::processIndex),
4747
newUnifiedDiffLine(true,"^---\\s",this::processFromFile),
4848
newUnifiedDiffLine(true,"^\\+\\+\\+\\s",this::processToFile),
49-
newUnifiedDiffLine(false,UNIFIED_DIFF_CHUNK_REGEXP,this::processChunk),
49+
newUnifiedDiffLine(true,UNIFIED_DIFF_CHUNK_REGEXP,this::processChunk),
5050
newUnifiedDiffLine("^\\s+",this::processNormalLine),
5151
newUnifiedDiffLine("^-",this::processDelLine),
5252
newUnifiedDiffLine("^+",this::processAddLine)

‎src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,19 @@ public void testSimplePattern() {
111111
assertTrue(m.find());
112112
}
113113

114+
@Test
115+
publicvoidtestParseIssue46()throwsIOException {
116+
UnifiedDiffdiff =UnifiedDiffReader.parseUnifiedDiff(
117+
UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue46.diff"));
118+
---comment
119+
System.out.println(diff);
120+
121+
assertThat(diff.getFiles().size()).isEqualTo(1);
122+
123+
UnifiedDiffFilefile1 =diff.getFiles().get(0);
124+
assertThat(file1.getFromFile()).isEqualTo("src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt");
125+
assertThat(file1.getPatch().getDeltas().size()).isEqualTo(3);
126+
127+
assertThat(diff.getTail()).isEqualTo("2.17.1.windows.2\n\n");
128+
}
114129
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--- a.vhd2019-04-18 13:49:39.516149751 +0200
2+
+++ b.vhd2019-04-18 11:33:08.372563078 +0200
3+
@@ -2819,3 +2819,3 @@
4+
--- some comment
5+
-bla
6+
-bla
7+
+
8+
+

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp