phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix inclusive offsets in cpp test

Browse Source
This commit is contained in:
Clément Fournier
2022-07-17 17:55:38 +02:00
parent 63c01f0f5b
commit 227e27c369
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
View File

@ -76,14 +76,13 @@ final class FragmentedTextDocument extends BaseMappedDocument implements TextDoc
lastAccessedFragment = f; lastAccessedFragment = f;
} }
if (!inclusive && f.outEnd() == outOffset) { if (inclusive && f.outEnd() == outOffset && f.next != null) {
if (f.next != null) { // Inclusive means, the offset must correspond to a character in the source document.
// Here we have to skip forward to the fragment that contains the character, because
// it's not this one.
do {
f = f.next; f = f.next;
lastAccessedFragment = f; } while (f.next != null && f.outLen() == 0);
// fallthrough
} else {
return f.outToIn(outOffset) + 1;
}
} }
return f.outToIn(outOffset); return f.outToIn(outOffset);
} }

18
pmd-cpp/src/test/resources/net/sourceforge/pmd/lang/cpp/cpd/testdata/continuation_intra_token.txt vendored
View File

@ -1,14 +1,14 @@
[Image] or [Truncated image[ Bcol Ecol [Image] or [Truncated image[ Bcol Ecol
L1 L1
[void] 1 2 [void] 1 2
L5 L6
[main] 2 2 [main] 1 2
L9
[(] 2 2
L10 L10
[)] 2 2 [(] 1 2
L12 L11
[{] 2 2 [)] 1 2
L14 L13
[}] 2 2 [{] 1 2
L15
[}] 1 2
EOF EOF