Skip to content

Commit

Permalink
Inform clients when Preview support enabled for an incompatible version.
Browse files Browse the repository at this point in the history
Signed-off-by: Roland Grunberg <[email protected]>
  • Loading branch information
rgrunber committed Apr 19, 2024
1 parent b090203 commit 5c6340b
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@
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.JsonObject;

import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IMarker;
Expand All @@ -34,10 +38,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;

/**
Expand Down Expand Up @@ -78,6 +91,23 @@ public BuildWorkspaceStatus buildWorkspace(boolean forceReBuild, IProgressMonito
if (errors.isEmpty()) {
return BuildWorkspaceStatus.SUCCEED;
} else {
// Preview feature support enabled on incompatible release version
Optional<IMarker> prevFeatMarkerOpt = problemMarkers.stream().filter(m -> m.getAttribute(IJavaModelMarker.ID, 0) == IProblem.PreviewFeaturesNotAllowed).findFirst();
if (prevFeatMarkerOpt.isPresent()) {
IMarker previewFeatureMarker = prevFeatMarkerOpt.get();
// error message mentions invalid release level, and the supported level
String errorMessage = String.format("Error occured while building workspace. Details: %s", ResourceUtils.getMessage(previewFeatureMarker));
String projectUri = JDTUtils.getFileURI(previewFeatureMarker.getResource().getProject());
JsonObject response = new JsonObject();
response.addProperty("uri", projectUri);
response.addProperty("message", errorMessage);
if (projectsManager.getConnection() != null) {
EventNotification prevFeatNotAllowedNotification = new EventNotification()
.withType(EventType.PreviewFeaturesNotAllowed)
.withData(response);
projectsManager.getConnection().sendEventNotification(prevFeatNotAllowedNotification);
}
}
// 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));
Expand Down

0 comments on commit 5c6340b

Please sign in to comment.