Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/stickyscroll/StickyScrollingControl.java

@@ -236,7 +236,8 @@ private void styleStickyLines() {
 
 		List<StyleRange> stickyLinesStyleRanges= new ArrayList<>();
 		int stickyLineTextOffset= 0;
-		for (int i= 0; i < getNumberStickyLines(); i++) {
+		int stickyLinesCount = getNumberStickyLines();
+		for (int i = 0; i < stickyLinesCount; i++) {
 			IStickyLine stickyLine= stickyLines.get(i);
 			StyleRange[] ranges= stickyLine.getStyleRanges();
 			if (ranges != null) {

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/stickyscroll/StickyLine.java

@@ -47,7 +47,11 @@ public int getLineNumber() {
 	public String getText() {
 		if (text == null) {
 			StyledText textWidget = sourceViewer.getTextWidget();
-			text = textWidget.getLine(getWidgetLineNumber());
+			int widgetLineNumber = getWidgetLineNumber();
+			if (widgetLineNumber < 0 || widgetLineNumber >= textWidget.getLineCount()) {
+				return ""; // return empty string if line number is invalid //$NON-NLS-1$
+			}
+			text = textWidget.getLine(widgetLineNumber);
 		}
 		return text;
 	}
@@ -57,16 +61,19 @@ public StyleRange[] getStyleRanges() {
 		StyledText textWidget = sourceViewer.getTextWidget();
 		int widgetLineNumber = getWidgetLineNumber();
 
-		if (widgetLineNumber >= textWidget.getLineCount()) {
+		if (widgetLineNumber < 0 || widgetLineNumber >= textWidget.getLineCount()) {
 			return null;
 		}
-
-		int offsetAtLine = textWidget.getOffsetAtLine(getWidgetLineNumber());
-		StyleRange[] styleRanges = textWidget.getStyleRanges(offsetAtLine, getText().length());
-		for (StyleRange styleRange : styleRanges) {
-			styleRange.start = styleRange.start - offsetAtLine;
+		try {
+			int offsetAtLine = textWidget.getOffsetAtLine(widgetLineNumber);
+			StyleRange[] styleRanges = textWidget.getStyleRanges(offsetAtLine, getText().length());
+			for (StyleRange styleRange : styleRanges) {
+				styleRange.start = styleRange.start - offsetAtLine;
+			}
+			return styleRanges;
+		} catch (IllegalArgumentException e) {
+			return null; // in case of an invalid line number, return null
 		}
-		return styleRanges;
 	}
 
 	private int getWidgetLineNumber() {

releng/org.eclipse.ui.releng/platformUiTools.p2f

@@ -129,7 +129,7 @@
     </iu>
     <iu id='org.eclipse.cdt.core.native' name='CDT native bits' version='0.0.0'>
         <repositories size='1'>
-            <repository location='https://download.eclipse.org/tools/cdt/releases/latest/'/>
+            <repository location='https://download.eclipse.org/eclipse/updates/I-builds'/>
         </repositories>
     </iu>
   </ius>

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/internal/databinding/swt/Screenshots.java

@@ -89,7 +89,7 @@ public static String takeScreenshot(Class<?> testClass, String name, PrintStream
 		GC gc = new GC(display);
 		Rectangle displayBounds= display.getBounds();
 		out.println("Display @ " + displayBounds);
-		final Image image = new Image(display, displayBounds.width, displayBounds.height);
+		final Image image = new Image(display, (iGc, width, height) -> {}, displayBounds.width, displayBounds.height);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();
 

tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.jface.tests
-Bundle-Version: 1.4.900.qualifier
+Bundle-Version: 1.4.1000.qualifier
 Automatic-Module-Name: org.eclipse.jface.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit;bundle-version="4.12.0",

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/LabelProviderTest.java

@@ -15,8 +15,8 @@ public class LabelProviderTest {
 
 	private static final Car HORCH = new Car("Horch");
 
-	private static Image horchImage = new Image(Display.getDefault(), 50, 10);
-	private static Image defaultImage = new Image(Display.getDefault(), 1, 1);
+	private static Image horchImage = new Image(Display.getDefault(), (gc, width, height) -> {}, 50, 10);
+	private static Image defaultImage = new Image(Display.getDefault(), (gc, width, height) -> {}, 1, 1);
 
 	private final Function<Object, String> textFunction = o -> o instanceof Car ? ((Car) o).getMake() : "unknown";
 	private final Function<Object, Image> imageFunction = o -> o instanceof Car ? horchImage : defaultImage;

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AbstractFactoryTest.java

@@ -14,6 +14,7 @@
 package org.eclipse.jface.tests.widgets;
 
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageGcDrawer;
 import org.eclipse.swt.widgets.Shell;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -26,7 +27,8 @@ public class AbstractFactoryTest {
 
 	@BeforeClass
 	public static void classSetup() {
-		image = new Image(null, 1, 1);
+		final ImageGcDrawer noOp = (gc, width, height) -> {};
+		image = new Image(null, noOp, 1, 1);
 	}
 
 	@Before

tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.jface.text.tests
-Bundle-Version: 3.13.900.qualifier
+Bundle-Version: 3.13.1000.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: 

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningTest.java

@@ -515,7 +515,7 @@ private static boolean hasCodeMiningPrintedBelowLine(ITextViewer viewer, int lin
 			starty= lineBounds.y;
 		}
 
-		Image image= new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image= new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		try {
 			GC gc= new GC(widget);
 			gc.copyArea(image, 0, 0);
@@ -555,7 +555,7 @@ private static boolean hasCodeMiningPrintedAfterTextOnLine(ITextViewer viewer, i
 		} else {
 			secondLineBounds= widget.getTextBounds(lineOffset, lineOffset + lineLength);
 		}
-		Image image = new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image = new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		GC gc = new GC(widget);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();

tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java

@@ -148,7 +148,7 @@ protected boolean condition() {
 	}
 
 	public int getMostRightPaintedPixel(StyledText widget) {
-		Image image = new Image(widget.getDisplay(), widget.getSize().x, widget.getSize().y);
+		Image image = new Image(widget.getDisplay(), (gc, width, height) -> {}, widget.getSize().x, widget.getSize().y);
 		GC gc = new GC(widget);
 		gc.copyArea(image, 0, 0);
 		gc.dispose();