Skip to content

fix: BadLocationException can be thrown before we check the document version #1450

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

Merged
rubenporras merged 1 commit into from
Dec 5, 2025
Merged

fix: BadLocationException can be thrown before we check the document version #1450

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
44 changes: 19 additions & 25 deletions ...clipse.lsp4e/src/org/eclipse/lsp4e/operations/highlight/HighlightReconcilingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,22 +208,21 @@ private void collectHighlights(int caretOffset, long timestamp, @Nullable IProgr
return;
}


// Normalize the cache key to the start of the word/symbol.
final int cacheKeyOffset = normalizedOffset(document, caretOffset);

// Only cancel previous requests if the target symbol actually changed.
if (cacheKeyOffset != lastCacheKeyOffset) {
cancel();
lastCacheKeyOffset = cacheKeyOffset;
}

if (DocumentUtil.getDocumentModificationStamp(document) != timestamp) {
return;
}

Position position;
final Position position;
final int cacheKeyOffset;
try {
// Normalize the cache key to the start of the word/symbol.
cacheKeyOffset = normalizedOffset(document, caretOffset);

// Only cancel previous requests if the target symbol actually changed.
if (cacheKeyOffset != lastCacheKeyOffset) {
cancel();
lastCacheKeyOffset = cacheKeyOffset;
}
// Send the original caret offset to the LS to preserve behavior
// expected by tests and servers that distinguish positions within a word.
position = LSPEclipseUtils.toPosition(caretOffset, document);
Expand Down Expand Up @@ -323,22 +322,17 @@ private Object getLockObject(IAnnotationModel annotationModel) {
* Compute a stable cache key for the symbol at the given caret offset by
* normalizing to the start of the Unicode identifier under the caret.
*/
private static int normalizedOffset(final IDocument document, final int offset) {
try {
// Walk left to the first non-identifier part, then move right one.
int pos = Math.max(0, offset - 1);
final int docLen = document.getLength();
while (pos >= 0 && pos < docLen) {
if (!Character.isUnicodeIdentifierPart(document.getChar(pos))) {
break;
}
pos--;
private static int normalizedOffset(final IDocument document, final int offset) throws BadLocationException {
// Walk left to the first non-identifier part, then move right one.
int pos = Math.max(0, offset - 1);
final int docLen = document.getLength();
while (pos >= 0 && pos < docLen) {
if (!Character.isUnicodeIdentifierPart(document.getChar(pos))) {
break;
}
return Math.min(docLen, pos + 1);
} catch (final BadLocationException ex) {
LanguageServerPlugin.logError(ex.getMessage(), ex);
return offset;
pos--;
}
return Math.min(docLen, pos + 1);
}

void removeOccurrenceAnnotations() {
Expand Down