Skip to content

Resolved inconsistent behaviour of @Dependency quickfix #1091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dessina-devasia merged 2 commits into from
Nov 13, 2024
Merged

Resolved inconsistent behaviour of @Dependency quickfix #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5bc75b
[#1025] Resolved inconsistent behaviour of @Dependency quickfix
dessina-devasia Nov 11, 2024
768307d
[#1025] Changed field level dependency to class level
dessina-devasia Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/cdi/ManagedBeanDiagnosticsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void collectDiagnostics(PsiJavaFile unit, List<Diagnostic> diagnostics) {
if (isManagedBean
&& field.hasModifierProperty(PsiModifier.PUBLIC)
&& !field.hasModifierProperty(PsiModifier.STATIC)
&& (fieldScopes.size() != 1 || !fieldScopes.get(0).equals(DEPENDENT_FQ_NAME))) {
&& !managedBeanAnnotations.contains(DEPENDENT_FQ_NAME)) {
diagnostics.add(createDiagnostic(field, unit,
Messages.getMessage("ManagedBeanWithNonStaticPublicField"),
DIAGNOSTIC_CODE, null,
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/io/openliberty/tools/intellij/lsp4jakarta/lsp4ij/cdi/ManagedBeanQuickFix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiModifierListOwner;
import com.intellij.psi.util.PsiTreeUtil;
import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.JDTUtils;
import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.Messages;
import io.openliberty.tools.intellij.lsp4jakarta.lsp4ij.codeAction.proposal.quickfix.InsertAnnotationMissingQuickFix;
Expand Down Expand Up @@ -69,7 +71,7 @@ public CodeAction resolveCodeAction(JavaCodeActionResolveContext context) {
final CodeAction toResolve = context.getUnresolved();
String name = toResolve.getTitle();
PsiElement node = context.getCoveringNode();
PsiModifierListOwner parentType = getBinding(node);
PsiModifierListOwner parentType = PsiTreeUtil.getParentOfType(node, PsiClass.class);
ChangeCorrectionProposal proposal = new ReplaceAnnotationProposal(name, context.getCompilationUnit(),
context.getASTRoot(), parentType, 0, ADD_ANNOTATION, context.getSource().getCompilationUnit(),
REMOVE_ANNOTATION_NAMES);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/openliberty/tools/intellij/lsp4jakarta/it/cdi/ManagedBeanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public void managedBeanAnnotations() throws Exception {
assertJavaDiagnostics(diagnosticsParams, utils, d1, d2);
String newText1 = "package io.openliberty.sample.jakarta.cdi;\n\n" +
"import jakarta.enterprise.context.*;\n\n" +
"@RequestScoped\npublic class ManagedBean<T> {\n " +
"@Dependent\n public int a;\n\n\n " +
"@Dependent\npublic class ManagedBean<T> {\n " +
"public int a;\n\n\n " +
"public ManagedBean() {\n this.a = 10;\n }\n}\n";
String newText2 = "package io.openliberty.sample.jakarta.cdi;\n\n" +
"import jakarta.enterprise.context.*;\n\n" +
Expand Down
Loading