Skip to content

StyledText#setLineVerticalIndent: fix overlapping code minings in editor #2513

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
merged 1 commit into from
Sep 19, 2025
Merged

StyledText#setLineVerticalIndent: fix overlapping code minings in editor #2513

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
21 changes: 15 additions & 6 deletions .../org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4265,12 +4265,20 @@ public int getOrientation () {
*/
int getPartialBottomIndex() {
if (isFixedLineHeight()) {
int lineHeight = renderer.getLineHeight();
int partialLineCount = Compatibility.ceil(clientAreaHeight, lineHeight);
return Math.max(0, Math.min(content.getLineCount(), topIndex + partialLineCount) - 1);
return getPartialBottomIndexFixedLineHeight();
}
return getLineIndex(clientAreaHeight - bottomMargin);
}
/**
* Returns the index of the last partially visible line assuming a fixed line height.
*
* @return index of the last partially visible line.
*/
private int getPartialBottomIndexFixedLineHeight() {
int lineHeight = renderer.getLineHeight();
int partialLineCount = Compatibility.ceil(clientAreaHeight, lineHeight);
return Math.max(0, Math.min(content.getLineCount(), topIndex + partialLineCount) - 1);
}
/**
* Returns the index of the first partially visible line.
*
Expand Down Expand Up @@ -9315,7 +9323,8 @@ public void setLineVerticalIndent(int lineIndex, int verticalLineIndent) {
}
int initialTopPixel = getTopPixel();
int initialTopIndex = getPartialTopIndex();
int initialBottomIndex = getPartialBottomIndex();
// use getPartialBottomIndexFixedLineHeight to include more additional lines to fix scrolling issue eclipse-platform/eclipse.platform.swt#2512
int initialBottomIndex = getPartialBottomIndexFixedLineHeight();
int verticalIndentDiff = verticalLineIndent - previousVerticalIndent;
renderer.setLineVerticalIndent(lineIndex, verticalLineIndent);
this.hasVerticalIndent = verticalLineIndent != 0 || renderer.hasVerticalIndent();
Expand All @@ -9332,8 +9341,8 @@ public void setLineVerticalIndent(int lineIndex, int verticalLineIndent) {
}
} else {
resetCache(lineIndex, 1);
if((initialTopIndex == 0) && (initialBottomIndex == (content.getLineCount() - 1))) { // not scrollable editor
setCaretLocations();
if ((initialTopIndex == 0) && (initialBottomIndex == (content.getLineCount() - 1))) { // not scrollable editor
setCaretLocations();
redrawLines(lineIndex, getBottomIndex() - lineIndex + 1, true);
} else if (getFirstCaretLine() >= initialTopIndex && getFirstCaretLine() <= initialBottomIndex) { // caret line with caret mustn't move
if (getFirstCaretLine() < lineIndex) {
Expand Down
Loading