Skip to content

Reject a chunk that ends exactly at the end of the target #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
youdie006 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

Reject a chunk that ends exactly at the end of the target #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public VerifyChunk verifyChunk(List<T> target, int fuzz, int position) throws Pa
int lastIndex = size() - fuzz;
int last = position + size() - 1;

if (position + fuzz > target.size() || last - fuzz > target.size()) {
if (position + fuzz > target.size() || last - fuzz >= target.size()) {
return VerifyChunk.POSITION_OUT_OF_TARGET;
}
for (int i = startIndex; i < lastIndex; i++) {
Expand Down
10 changes: 10 additions & 0 deletions java-diff-utils/src/test/java/com/github/difflib/patch/ChunkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ void verifyChunk() throws PatchFailedException {
VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET, chunk.verifyChunk(toCharList("prefix suffix"), 1, 7));
}

@Test
void verifyChunkAtTheEndOfTheTarget() throws PatchFailedException {
// chunk covers target indices 7..10, so it needs a target of at least 11
Chunk<Character> chunk = new Chunk<>(7, toCharList("test"));

assertEquals(VerifyChunk.OK, chunk.verifyChunk(toCharList("prefix test"), 0, 7));
assertEquals(VerifyChunk.POSITION_OUT_OF_TARGET, chunk.verifyChunk(toCharList("prefix tes"), 0, 7));
assertEquals(VerifyChunk.POSITION_OUT_OF_TARGET, chunk.verifyChunk(toCharList("prefix te"), 0, 7));
}

private List<Character> toCharList(String str) {
return str.chars().mapToObj(x -> (char) x).collect(Collectors.toList());
}
Expand Down
Loading