Merge branch 'main' into default-format-region-provider-ranking

Author: FlorianKroiss

org.eclipse.lsp4e/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true
-Bundle-Version: 0.18.29.qualifier
+Bundle-Version: 0.18.30.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.equinox.common;bundle-version="3.8.0",

org.eclipse.lsp4e/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>org.eclipse.lsp4e</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>0.18.29-SNAPSHOT</version>
+	<version>0.18.30-SNAPSHOT</version>
 
 	<build>
 		<plugins>

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/codeactions/CodeActionMarkerResolution.java

@@ -117,6 +117,10 @@ private ShowMessageRequestParams reportServerError(LanguageServerDefinition serv
 
 	@Override
 	public IMarker[] findOtherMarkers(IMarker[] markers) {
+		if (codeAction.getDiagnostics() == null) {
+			return new IMarker[0];
+		}
+
 		return Arrays.stream(markers).filter(marker -> {
 			try {
 				return codeAction.getDiagnostics()