WIP fix some tests

Signed-off-by: David Thompson <davthomp@redhat.com>
eclipse · Oct 13, 2022 · e9a9243 · e9a9243
1 parent ef551b8
commit e9a9243
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/microprofile.jdt/.gitignore b/microprofile.jdt/.gitignore
@@ -0,0 +1,4 @@
+/org.eclipse.lsp4mp.jdt.core/
+/org.eclipse.lsp4mp.jdt.site/
+/org.eclipse.lsp4mp.jdt.test/
+/org.eclipse.lsp4mp.jdt.tp/
diff --git a/...n/java/org/eclipse/lsp4mp/jdt/core/java/codeaction/InsertAnnotationAttributeQuickFix.java b/...n/java/org/eclipse/lsp4mp/jdt/core/java/codeaction/InsertAnnotationAttributeQuickFix.java
@@ -62,7 +62,7 @@ public List<? extends CodeAction> getCodeActions(JavaCodeActionContext context,
         codeAction.setKind(CodeActionKind.QuickFix);
         codeAction.setDiagnostics(Arrays.asList(diagnostic));
         codeAction.setData(new CodeActionResolveData(context.getUri(), getParticipantId(), null,
-                context.getParams().isResolveSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
+                context.getParams().isResourceOperationSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
         return Collections.singletonList(codeAction);
     }
 

diff --git a/...ain/java/org/eclipse/lsp4mp/jdt/core/java/codeaction/InsertAnnotationMissingQuickFix.java b/...ain/java/org/eclipse/lsp4mp/jdt/core/java/codeaction/InsertAnnotationMissingQuickFix.java
@@ -140,7 +140,7 @@ protected void insertAnnotation(Diagnostic diagnostic, JavaCodeActionContext con
         Map<String, Object> extendedData = new HashMap<>();
         extendedData.put(ANNOTATION_KEY, annotations);
         codeAction.setData(new CodeActionResolveData(context.getUri(), getParticipantId(), extendedData,
-                context.getParams().isResolveSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
+                context.getParams().isResourceOperationSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
 
         codeActions.add(codeAction);
     }

diff --git a/...c/main/java/org/eclipse/lsp4mp/jdt/internal/health/java/ImplementHealthCheckQuickFix.java b/...c/main/java/org/eclipse/lsp4mp/jdt/internal/health/java/ImplementHealthCheckQuickFix.java
@@ -21,7 +21,9 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.internal.corext.dom.Bindings;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionKind;
@@ -56,12 +58,12 @@ public String getParticipantId() {
     @Override
     public List<? extends CodeAction> getCodeActions(JavaCodeActionContext context, Diagnostic diagnostic,
             IProgressMonitor monitor) throws CoreException {
-
-        ExtendedCodeAction codeAction = new ExtendedCodeAction("Let " + context.getASTRoot().getTypeRoot().getElementName() + " implement @" + MicroProfileHealthConstants.HEALTH_CHECK_INTERFACE_NAME);
+        IBinding binding = getBinding(context.getCoveringNode());
+        ExtendedCodeAction codeAction = new ExtendedCodeAction("Let '" + binding.getName() + "' implement '@" + MicroProfileHealthConstants.HEALTH_CHECK_INTERFACE_NAME + "'");
         codeAction.setRelevance(0);
         codeAction.setDiagnostics(Collections.singletonList(diagnostic));
         codeAction.setKind(CodeActionKind.QuickFix);
-        codeAction.setData(new CodeActionResolveData(context.getUri(), getParticipantId(), null, context.getParams().isResolveSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
+        codeAction.setData(new CodeActionResolveData(context.getUri(), getParticipantId(), null, context.getParams().isResourceOperationSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
 
         return Collections.singletonList(codeAction);
     }
@@ -90,5 +92,12 @@ public CodeAction resolveCodeAction(JavaCodeActionResolveContext context) {
 
         return context.getUnresolved();
     }
+
+    private static IBinding getBinding(ASTNode node) {
+        if (node.getParent() instanceof VariableDeclarationFragment) {
+            return ((VariableDeclarationFragment) node.getParent()).resolveBinding();
+        }
+        return Bindings.getBindingOfParentType(node);
+    }
 
 }
diff --git a/.../eclipse/lsp4mp/jdt/internal/metrics/java/ApplicationScopedAnnotationMissingQuickFix.java b/.../eclipse/lsp4mp/jdt/internal/metrics/java/ApplicationScopedAnnotationMissingQuickFix.java
@@ -74,7 +74,7 @@ public List<? extends CodeAction> getCodeActions(JavaCodeActionContext context,
         codeAction.setDiagnostics(Collections.singletonList(diagnostic));
         codeAction.setKind(CodeActionKind.QuickFix);
         codeAction.setData(new CodeActionResolveData(context.getUri(), getParticipantId(), null,
-                context.getParams().isResolveSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
+                context.getParams().isResourceOperationSupported(), context.getParams().isCommandConfigurationUpdateSupported()));
 
         return Collections.singletonList(codeAction);
     }

diff --git a/....lsp4mp.jdt.test/src/main/java/org/eclipse/lsp4mp/jdt/core/MicroProfileForJavaAssert.java b/....lsp4mp.jdt.test/src/main/java/org/eclipse/lsp4mp/jdt/core/MicroProfileForJavaAssert.java
@@ -50,7 +50,6 @@
 import org.eclipse.lsp4mp.commons.MicroProfileJavaDefinitionParams;
 import org.eclipse.lsp4mp.commons.MicroProfileJavaDiagnosticsParams;
 import org.eclipse.lsp4mp.commons.MicroProfileJavaHoverParams;
-import org.eclipse.lsp4mp.jdt.core.PropertiesManagerForJava;
 import org.eclipse.lsp4mp.jdt.core.java.diagnostics.IJavaErrorCode;
 import org.eclipse.lsp4mp.jdt.core.utils.IJDTUtils;
 import org.junit.Assert;
@@ -73,6 +72,8 @@ public static MicroProfileJavaCodeActionParams createCodeActionParams(String uri
 		MicroProfileJavaCodeActionParams codeActionParams = new MicroProfileJavaCodeActionParams(textDocument, range,
 				context);
 		codeActionParams.setResourceOperationSupported(true);
+		codeActionParams.setCommandConfigurationUpdateSupported(true);
+		codeActionParams.setResolveSupported(false);
 		return codeActionParams;
 	}
 

diff --git a/...n/java/org/eclipse/lsp4mp/jdt/core/health/java/MicroProfileHealthJavaDiagnosticsTest.java b/...n/java/org/eclipse/lsp4mp/jdt/core/health/java/MicroProfileHealthJavaDiagnosticsTest.java
@@ -64,8 +64,10 @@ public void ImplementHealthCheck() throws Exception {
 
 		String uri = javaFile.getLocation().toFile().toURI().toString();
 		MicroProfileJavaCodeActionParams codeActionParams = createCodeActionParams(uri, d);
+		codeActionParams.setResourceOperationSupported(true);
+		codeActionParams.setCommandConfigurationUpdateSupported(true);
 		assertJavaCodeAction(codeActionParams, utils, //
-				ca(uri, "Let 'DontImplementHealthCheck' implement 'org.eclipse.microprofile.health.HealthCheck'", d, //
+				ca(uri, "Let 'DontImplementHealthCheck' implement '@HealthCheck'", d, //
 						te(2, 50, 9, 37, "\r\n\r\n" + //
 								"import org.eclipse.microprofile.health.HealthCheck;\r\n" + //
 								"import org.eclipse.microprofile.health.HealthCheckResponse;\r\n" + //