Ignored problem marker + quick fix becomes CodeAction.

Author: BoykoAlex

headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/DiagnosticSeverityProvider.java

@@ -32,10 +32,15 @@ static DiagnosticSeverity diagnosticSeverity(ProblemSeverity severity) {
 		}
 	}
 
-	DiagnosticSeverity getDiagnosticSeverity(ReconcileProblem problem);
+	DiagnosticSeverity getDiagnosticSeverity(ProblemType problem);
 
+	default DiagnosticSeverity getDiagnosticSeverity(ReconcileProblem problem) {
+		return getDiagnosticSeverity(problem.getType());
+	}
+	
 	static final DiagnosticSeverityProvider DEFAULT = (problem) -> {
-		ProblemSeverity severity = problem.getType().getDefaultSeverity();
+		ProblemSeverity severity = problem.getDefaultSeverity();
 		return diagnosticSeverity(severity);
 	};
+	
 }

headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java

@@ -753,7 +753,7 @@ public void checkPointCollecting() {
 			@Override
 			public void accept(ReconcileProblem problem) {
 				try {
-					DiagnosticSeverity severity = getDiagnosticSeverity(problem);
+					DiagnosticSeverity severity = severityProvider.getDiagnosticSeverity(problem);
 					if (severity!=null) {
 						Diagnostic d = new Diagnostic();
 						d.setCode(problem.getCode());
@@ -788,10 +788,6 @@ public void accept(ReconcileProblem problem) {
 		};
 	}
 
-	public DiagnosticSeverity getDiagnosticSeverity(ReconcileProblem problem) {
-		return severityProvider.getDiagnosticSeverity(problem);
-	}
-
 	/**
 	 * If reconciling is in progress, waits until reconciling has caught up to
 	 * all the document changes.
@@ -824,6 +820,10 @@ public boolean canRegisterFileWatchersDynamically() {
 	public DiagnosticService getDiagnosticService() {
 		return diagnosticService;
 	}
+	
+	public DiagnosticSeverityProvider getDiagnosticSeverityProvider() {
+		return severityProvider;
+	}
 
 	@Override
 	public SimpleLanguageServer getServer() {

headless-services/commons/commons-rewrite-test/src/main/java/org/springframework/rewrite/test/HelloMethodRenameProblemDescriptor.java

@@ -27,11 +27,10 @@
 import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemTypes;
 import org.springframework.ide.vscode.commons.rewrite.config.RecipeCodeActionDescriptor;
 import org.springframework.ide.vscode.commons.rewrite.config.RecipeScope;
-import org.springframework.ide.vscode.commons.rewrite.config.RecipeSpringJavaProblemDescriptor;
 import org.springframework.ide.vscode.commons.rewrite.java.FixAssistMarker;
 import org.springframework.ide.vscode.commons.rewrite.java.FixDescriptor;
 
-public class HelloMethodRenameProblemDescriptor implements RecipeSpringJavaProblemDescriptor {
+public class HelloMethodRenameProblemDescriptor implements RecipeCodeActionDescriptor {
 
 	private static final String LABEL = "Switch hello method into bye";
 	private static final String RECIPE_ID = "org.springframework.rewrite.test.HelloMethodRenameRecipe";

headless-services/commons/commons-rewrite-test/src/main/java/org/springframework/rewrite/test/StsTestCodeActionRepo.java

@@ -10,22 +10,15 @@
  *******************************************************************************/
 package org.springframework.rewrite.test;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.springframework.ide.vscode.commons.rewrite.config.CodeActionRepository;
 import org.springframework.ide.vscode.commons.rewrite.config.RecipeCodeActionDescriptor;
-import org.springframework.ide.vscode.commons.rewrite.config.RecipeSpringJavaProblemDescriptor;
 
 public class StsTestCodeActionRepo extends CodeActionRepository {
 
 	@Override
 	public List<RecipeCodeActionDescriptor> getCodeActionDescriptors() {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public List<RecipeSpringJavaProblemDescriptor> getProblemDescriptors() {
 		return List.of(new HelloMethodRenameProblemDescriptor());
 	}
 

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/config/CodeActionRepository.java

@@ -16,6 +16,4 @@ public abstract class CodeActionRepository {
 
 	public abstract List<RecipeCodeActionDescriptor> getCodeActionDescriptors();
 
-	public abstract List<RecipeSpringJavaProblemDescriptor> getProblemDescriptors();
-
 }

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/config/RecipeCodeActionDescriptor.java

@@ -14,6 +14,7 @@
 import org.openrewrite.java.JavaVisitor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
+import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemType;
 
 public interface RecipeCodeActionDescriptor {
 
@@ -24,6 +25,10 @@ default String getId() {
 	JavaVisitor<ExecutionContext> getMarkerVisitor(ApplicationContext applicationContext);
 
 	boolean isApplicable(IJavaProject project);
+	
+	default ProblemType getProblemType() {
+		return null;
+	}
 
 	static String buildLabel(String label, RecipeScope s) {
 		switch (s) {

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/config/RecipeSpringJavaProblemDescriptor.java

@@ -77,10 +77,6 @@ public List<RecipeCodeActionDescriptor> listCodeActionDescriptors() {
 		return codeActionRepos.get().flatMap(r -> r.getCodeActionDescriptors().stream()).collect(Collectors.toList());
 	}
 
-	public List<RecipeSpringJavaProblemDescriptor> listProblemDescriptors() {
-		return codeActionRepos.get().flatMap(r -> r.getProblemDescriptors().stream()).collect(Collectors.toList());
-	}
-
     public static Builder builder() {
         return new Builder(new Properties());
     }

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/config/StsEnvironment.java

@@ -13,20 +13,18 @@
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.DiagnosticSeverityProvider;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemType;
-import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem;
 import org.springframework.ide.vscode.commons.yaml.reconcile.YamlSchemaProblems;
 import org.springframework.stereotype.Component;
 
 @Component
 public class ConcourseDiagnosticSeverities implements DiagnosticSeverityProvider {
 
 	@Override
-	public DiagnosticSeverity getDiagnosticSeverity(ReconcileProblem problem) {
-		ProblemType type = problem.getType();
+	public DiagnosticSeverity getDiagnosticSeverity(ProblemType type) {
 		if (YamlSchemaProblems.PROPERTY_CONSTRAINT.contains(type)) {
 			return DiagnosticSeverity.Warning;
 		}
-		return DEFAULT.getDiagnosticSeverity(problem);
+		return DEFAULT.getDiagnosticSeverity(type);
 	}
 
 }

headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseDiagnosticSeverities.java

@@ -17,7 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.DiagnosticSeverityProvider;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemSeverity;
-import org.springframework.ide.vscode.commons.languageserver.reconcile.ReconcileProblem;
+import org.springframework.ide.vscode.commons.languageserver.reconcile.ProblemType;
 import org.springframework.ide.vscode.commons.languageserver.util.Settings;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 import org.springframework.ide.vscode.commons.util.Assert;
@@ -51,10 +51,10 @@ private void configChanged() {
 				severityOverrides.put(code, ProblemSeverity.valueOf(severity));
 			}
 		}
-		server.setDiagnosticSeverityProvider((ReconcileProblem problem) -> {
-			ProblemSeverity severity = severityOverrides.get(problem.getType().getCode());
+		server.setDiagnosticSeverityProvider((ProblemType problem) -> {
+			ProblemSeverity severity = severityOverrides.get(problem.getCode());
 			if (severity==null) {
-				severity = problem.getType().getDefaultSeverity();
+				severity = problem.getDefaultSeverity();
 			}
 			return DiagnosticSeverityProvider.diagnosticSeverity(severity);
 		});