Fix: Correctly align line numbers in sticky lines control

The line number in the sticky lines control and in the editor control are correctly aligned with this change. Fixes eclipse-platform#1965
Christopher-Hermann · Jul 10, 2024 · 7ab381c · 7ab381c
1 parent 43df788
commit 7ab381c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/...i.editors/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControl.java b/...i.editors/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControl.java
@@ -184,6 +184,8 @@ private void createControls() {
 		GridDataFactory.fillDefaults().grab(true, false).indent(0, BOTTOM_SEPARATOR_SPACING).span(2, 1).applyTo(bottomSeparator);
 		bottomSeparator.setEnabled(false);
 
+		layoutLineNumbers();
+
 		stickyLinesCanvas.pack();
 		stickyLinesCanvas.moveAbove(null);
 	}
@@ -210,7 +212,7 @@ private void updateStickyScrollingControls() {
 	}
 
 	private String fillLineNumberWithLeadingSpaces(int lineNumber) {
-		int lineCount= sourceViewer.getTextWidget().getLineCount();
+		int lineCount= sourceViewer.getDocument().getNumberOfLines();
 		int lineNumberLength= String.valueOf(lineCount).length();
 		String formatString= "%" + lineNumberLength + "d"; //$NON-NLS-1$ //$NON-NLS-2$
 		return String.format(formatString, lineNumber);

diff --git a/...tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControlTest.java b/...tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControlTest.java
@@ -61,6 +61,7 @@ public void setup() {
 		shell.setLayout(new FillLayout());
 		ruler = new CompositeRuler();
 		sourceViewer = new SourceViewer(shell, ruler, SWT.V_SCROLL | SWT.H_SCROLL);
+		sourceViewer.setDocument(new Document());
 
 		lineNumberColor = new Color(0, 0, 0);
 		hoverColor = new Color(1, 1, 1);
@@ -126,7 +127,7 @@ public void testLimitStickyLinesCount() {
 
 	@Test
 	public void testCopyStyleRanges() {
-		sourceViewer.getTextWidget().setText("line 1");
+		sourceViewer.setInput(new Document("line 1"));
 		sourceViewer.getTextWidget().setStyleRange(new StyleRange(0, 6, lineNumberColor, backgroundColor));
 
 		List<StickyLine> stickyLines = List.of(new StickyLine("line 1", 0));
@@ -198,9 +199,8 @@ public void testNavigateToStickyLine() {
 		String text = """
 				line 1
 				line 2""";
-		sourceViewer.getTextWidget().setText(text);
+		sourceViewer.setInput(new Document(text));
 		sourceViewer.getTextWidget().setBounds(0, 0, 200, 200);
-		sourceViewer.setDocument(new Document(text));
 
 		List<StickyLine> stickyLines = List.of(new StickyLine("line 2", 1));
 		stickyScrollingControl.setStickyLines(stickyLines);
@@ -219,7 +219,7 @@ public void testVerticalScrollingIsDispatched() {
 		String text = """
 				line 1
 				line 2""";
-		sourceViewer.getTextWidget().setText(text);
+		sourceViewer.setInput(new Document(text));
 		sourceViewer.getTextWidget().getVerticalBar().setIncrement(10);
 		assertEquals(0, sourceViewer.getTextWidget().getTopPixel());
 
@@ -236,7 +236,7 @@ public void testHorizontalScrollingIsDispatched() {
 		String text = """
 				line 1
 				line 2""";
-		sourceViewer.getTextWidget().setText(text);
+		sourceViewer.setInput(new Document(text));
 		sourceViewer.getTextWidget().getHorizontalBar().setIncrement(10);
 		assertEquals(0, sourceViewer.getTextWidget().getHorizontalPixel());
 

diff --git a/...tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingHandlerTest.java b/...tests/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingHandlerTest.java
@@ -43,6 +43,7 @@
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceStore;
 
+import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.source.CompositeRuler;
 import org.eclipse.jface.text.source.SourceViewer;
 
@@ -62,6 +63,7 @@ public void setup() {
 		shell = new Shell(Display.getDefault());
 		ruler = new CompositeRuler();
 		sourceViewer = new SourceViewer(shell, ruler, SWT.None);
+		sourceViewer.setDocument(new Document());
 
 		lineNumberColor = new Color(0, 0, 0);
 		hoverColor = new Color(1, 1, 1);