Inform clients when Preview support enabled for an incompatible version.

Signed-off-by: Roland Grunberg <[email protected]>
rgrunber · Aug 13, 2024 · d5dd071 · d5dd071
1 parent 0375248
commit d5dd071
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/EventType.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/EventType.java
@@ -40,7 +40,12 @@ public enum EventType {
 	/**
 	 * Source attachments have been updated for some jar libraries.
 	 */
-	SourceInvalidated(500);
+	SourceInvalidated(500),
+
+	/**
+	 * Incompatibility between release version and preview features
+	 */
+	PreviewFeaturesNotAllowed(600);
 
 	private final int value;
 

diff --git a/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BuildWorkspaceHandler.java b/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BuildWorkspaceHandler.java
@@ -16,12 +16,17 @@
 import static org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin.logException;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
 import org.eclipse.core.resources.IBuildConfiguration;
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IMarker;
@@ -34,10 +39,19 @@
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jdt.core.IJavaModelMarker;
+import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.ls.core.internal.ActionableNotification;
 import org.eclipse.jdt.ls.core.internal.BuildWorkspaceStatus;
+import org.eclipse.jdt.ls.core.internal.EventNotification;
+import org.eclipse.jdt.ls.core.internal.EventType;
+import org.eclipse.jdt.ls.core.internal.JDTUtils;
+import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
 import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 import org.eclipse.jdt.ls.core.internal.ResourceUtils;
 import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager;
+import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
+import org.eclipse.jdt.ls.core.internal.preferences.Preferences.Severity;
+import org.eclipse.lsp4j.Command;
 import org.eclipse.lsp4j.extended.ProjectBuildParams;
 
 /**
@@ -80,6 +94,7 @@ public BuildWorkspaceStatus buildWorkspace(boolean forceReBuild, IProgressMonito
 			if (errors.isEmpty()) {
 				return BuildWorkspaceStatus.SUCCEED;
 			} else {
+				WorkspaceDiagnosticsHandler.checkPreviewFeatureValidity(problemMarkers);
 				// for default project, problem markers aren't sent. Add logs here for trouble shooting.
 				String newline = System.getProperty("line.separator");
 				logError("Error occured while building workspace. Details: " + newline + String.join(newline, errors));

diff --git a/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/WorkspaceDiagnosticsHandler.java b/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/WorkspaceDiagnosticsHandler.java
@@ -22,6 +22,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
 import org.eclipse.core.internal.resources.CheckMissingNaturesListener;
 import org.eclipse.core.internal.resources.ValidateProjectEncoding;
 import org.eclipse.core.resources.IFile;
@@ -44,6 +47,8 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.ls.core.internal.EventNotification;
+import org.eclipse.jdt.ls.core.internal.EventType;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.JavaClientConnection;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
@@ -337,11 +342,35 @@ private void publishDiagnostics(List<IMarker> markers) {
 			} else if (projectsManager.isBuildFile(file)) {
 				document = JsonRpcHelpers.toDocument(file);
 			}
+
 			if (document != null) {
 				List<Diagnostic> diagnostics = WorkspaceDiagnosticsHandler.toDiagnosticsArray(document, entry.getValue().toArray(new IMarker[0]), isDiagnosticTagSupported);
 				connection.publishDiagnostics(new PublishDiagnosticsParams(ResourceUtils.toClientUri(uri), diagnostics));
 			}
 		}
+
+		checkPreviewFeatureValidity(markers);
+	}
+
+	public static void checkPreviewFeatureValidity(List<IMarker> problemMarkers) {
+		// Preview feature support enabled on incompatible release version
+		List<IMarker> previewFeatureMarkers = problemMarkers.stream().filter(m -> m.getAttribute(IJavaModelMarker.ID, 0) == IProblem.PreviewFeaturesNotAllowed).collect(Collectors.toList());
+		JsonArray errorList = new JsonArray();
+		for (IMarker marker : previewFeatureMarkers) {
+			// error message mentions invalid release level, and the supported level
+			String errorMessage = ResourceUtils.getMessage(marker);
+			String projectUri = JDTUtils.getFileURI(marker.getResource().getProject());
+			JsonObject entry = new JsonObject();
+			entry.addProperty("uri", projectUri);
+			entry.addProperty("message", errorMessage);
+			if (!errorList.contains(entry)) {
+				errorList.add(entry);
+			}
+		}
+		if (JavaLanguageServerPlugin.getProjectsManager().getConnection() != null) {
+			EventNotification prevFeatNotAllowedNotification = new EventNotification().withType(EventType.PreviewFeaturesNotAllowed).withData(errorList);
+			JavaLanguageServerPlugin.getProjectsManager().getConnection().sendEventNotification(prevFeatNotAllowedNotification);
+		}
 	}
 
 	@Deprecated