hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Add test for document fix

Browse Source
This commit is contained in:
Clément Fournier
2024-04-29 12:05:57 +02:00
parent fb17f7ff9a
commit 4c96e678af
2 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
View File

@ -69,7 +69,7 @@ abstract class BaseMappedDocument implements TextDocument {
*/
protected @NonNull TextRegion inputRegion(TextRegion outputRegion) {
if (outputRegion.isEmpty()) {
return TextRegion.caretAt(inputOffset(outputRegion.getStartOffset(), false));
return TextRegion.caretAt(inputOffset(outputRegion.getStartOffset(), true));
}
return TextRegion.fromBothOffsets(inputOffset(outputRegion.getStartOffset(), true),
inputOffset(outputRegion.getEndOffset(), false));

77
pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FragmentedTextDocumentTest.java Normal file
View File

@ -0,0 +1,77 @@
/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.document;
import static net.sourceforge.pmd.lang.document.TextPos2d.pos2d;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.DummyLanguageModule;
import net.sourceforge.pmd.lang.LanguageVersion;
class FragmentedTextDocumentTest {
LanguageVersion dummyVersion = DummyLanguageModule.getInstance().getDefaultVersion();
@Test
void testSimple() throws IOException {
try (TextDocument base = TextDocument.readOnlyString("abc", dummyVersion)) {
FragmentedDocBuilder builder = new FragmentedDocBuilder(base);
builder.recordDelta(1, 2, Chars.wrap("abx"));
try (TextDocument doc = builder.build()) {
assertEquals("aabxc", doc.getText().toString());
assertEquals(pos2d(1, 1), doc.lineColumnAtOffset(0));
assertEquals(pos2d(1, 2), doc.lineColumnAtOffset(1, true));
assertEquals(pos2d(1, 3), doc.lineColumnAtOffset(2, true));
assertEquals(pos2d(1, 3), doc.lineColumnAtOffset(2, false));
assertEquals(pos2d(1, 4), doc.lineColumnAtOffset(3, true));
assertEquals(pos2d(1, 4), doc.lineColumnAtOffset(3, false));
assertEquals(pos2d(1, 4), doc.lineColumnAtOffset(5));
}
}
}
@Test
void testToLocationWithCaret() throws IOException {
try (TextDocument base = TextDocument.readOnlyString("abc", dummyVersion)) {
FragmentedDocBuilder builder = new FragmentedDocBuilder(base);
builder.recordDelta(1, 2, Chars.wrap("abx"));
try (TextDocument doc = builder.build()) {
assertEquals("aabxc", doc.getText().toString());
TextRegion region = TextRegion.caretAt(4);
assertEquals(pos2d(1, 3), doc.toLocation(region).getStartPos());
}
}
}
@Test
void testToLocationWithCaretBetweenEscapes() throws IOException {
try (TextDocument base = TextDocument.readOnlyString("aBBCCd", dummyVersion)) {
FragmentedDocBuilder builder = new FragmentedDocBuilder(base);
builder.recordDelta(1, 3, Chars.wrap("X"));
builder.recordDelta(3, 5, Chars.wrap("Y"));
try (TextDocument doc = builder.build()) {
assertEquals("aXYd", doc.getText().toString());
TextRegion region = TextRegion.caretAt(2);
assertEquals(pos2d(1, 4), doc.toLocation(region).getStartPos());
}
}
}
}