Skip to content

Commit bc54f1f

Browse files
committed
Fixes #13355: Decrease rangeHighlight in certain cases where a match contains a trailing newline
1 parent c845287 commit bc54f1f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/vs/editor/contrib/find/common/findDecorations.ts

+5
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ export class FindDecorations implements IDisposable {
108108
}
109109
if (newCurrentDecorationId !== null) {
110110
let rng = this._editor.getModel().getDecorationRange(newCurrentDecorationId);
111+
if (rng.startLineNumber !== rng.endLineNumber && rng.endColumn === 1) {
112+
let lineBeforeEnd = rng.endLineNumber - 1;
113+
let lineBeforeEndMaxColumn = this._editor.getModel().getLineMaxColumn(lineBeforeEnd);
114+
rng = new Range(rng.startLineNumber, rng.startColumn, lineBeforeEnd, lineBeforeEndMaxColumn);
115+
}
111116
this._rangeHighlightDecorationId = changeAccessor.addDecoration(rng, FindDecorations._RANGE_HIGHLIGHT_DECORATION);
112117
}
113118
});

0 commit comments

Comments
 (0)