MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 15:52:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[java-highlighting] IDEA-352727 Incomplete model with lombok"

Browse Source 
This reverts commit ea0f6f9c

GitOrigin-RevId: c9f49f0bcf193ce593a6b9fbea9600d0f507fa9d
This commit is contained in:
Mikhail Pyltsin
2024-05-24 12:01:34 +02:00
committed by intellij-monorepo-bot
parent 08dd233a7c
commit f1642ef3bb
8 changed files with 1 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
View File

@@ -286,9 +286,6 @@ public final class HighlightControlFlowUtil {
if (!field.hasModifierProperty(PsiModifier.FINAL)) return null;
if (isFieldInitializedAfterObjectConstruction(field)) return null;
if (PsiUtilCore.hasErrorElementChild(field)) return null;
if (IncompleteModelUtil.isIncompleteModel(field) && IncompleteModelUtil.canBeAugmented(field.getContainingClass())) {
return IncompleteModelUtil.getPendingReferenceHighlightInfo(field);
}
String description = JavaErrorBundle.message("variable.not.initialized", field.getName());
TextRange range = HighlightNamesUtil.getFieldDeclarationTextRange(field);
HighlightInfo.Builder builder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(range).descriptionAndTooltip(description);

9
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
View File

@@ -876,12 +876,6 @@ public final class HighlightMethodUtil {
String description;
PsiElement elementToHighlight = ObjectUtils.notNull(referenceToMethod.getReferenceNameElement(), referenceToMethod);
if (element != null && !resolveResult.isAccessible()) {
PsiClass qualifierClass = RefactoringChangeUtil.getQualifierClass(referenceToMethod);
if (qualifierClass!=null &&
IncompleteModelUtil.isIncompleteModel(file) &&
IncompleteModelUtil.canBeAugmented(qualifierClass)) {
return IncompleteModelUtil.getPendingReferenceHighlightInfo(elementToHighlight);
}
description = HighlightUtil.accessProblemDescription(referenceToMethod, element, resolveResult);
}
else if (element != null && !resolveResult.isStaticsScopeCorrect()) {
@@ -908,9 +902,6 @@ public final class HighlightMethodUtil {
IncompleteModelUtil.canBePendingReference(referenceToMethod)) {
return IncompleteModelUtil.getPendingReferenceHighlightInfo(elementToHighlight);
}
if (IncompleteModelUtil.isIncompleteModel(file) && IncompleteModelUtil.canBeAugmented(qualifierClass)) {
return IncompleteModelUtil.getPendingReferenceHighlightInfo(elementToHighlight);
}
description = JavaErrorBundle.message("ambiguous.method.call.no.match", referenceToMethod.getReferenceName(), className);
}
else if (qualifierExpression != null &&

11
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncompleteModelUtil.java
View File

@@ -6,8 +6,6 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.openapi.project.IncompleteDependenciesService;
import com.intellij.psi.*;
import com.intellij.psi.augment.PsiAugmentProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiUtil;
import com.siyeh.ig.psiutils.ClassUtils;
import org.jetbrains.annotations.Contract;
@@ -247,9 +245,6 @@ final class IncompleteModelUtil {
if (qualifierTarget == null && canBePendingReference(qualifierRef)) {
return true;
}
if (qualifierTarget instanceof PsiClass psiClass && canBeAugmented(psiClass)) {
return true;
}
if (qualifierTarget instanceof PsiClass cls && isHierarchyResolved(cls)) {
return false;
}
@@ -273,10 +268,4 @@ final class IncompleteModelUtil {
return HighlightInfo.newHighlightInfo(HighlightInfoType.PENDING_REFERENCE).range(elementToHighlight)
.descriptionAndTooltip(JavaErrorBundle.message("incomplete.project.state.pending.reference"));
}
static boolean canBeAugmented(@Nullable PsiClass targetClass) {
if (targetClass == null) return false;
return CachedValuesManager.getProjectPsiDependentCache(targetClass,
psiClass -> PsiAugmentProvider.canBeAugmentedForIncompleteMode(psiClass));
}
}

30
java/java-psi-api/src/com/intellij/psi/augment/PsiAugmentProvider.java
View File

@@ -267,33 +267,5 @@ public abstract class PsiAugmentProvider implements PossiblyDumbAware {
}
}
/**
* Checks if the given PsiClass might be augmented.
* This method is usually called in incomplete mode.
*
* @param psiClass the PsiClass to be checked
* @return true if the PsiClass might be augmented for incomplete mode, false otherwise
*/
protected boolean mightBeAugmentedForIncompleteMode(@NotNull PsiClass psiClass) {
return false;
}
/**
* Checks if the given PsiClass might be augmented.
* This method is usually called in incomplete mode.
*
* @param targetClass the PsiClass to be checked
* @return true if the PsiClass might be augmented for incomplete mode, false otherwise
*/
public static boolean canBeAugmentedForIncompleteMode(@NotNull PsiClass targetClass) {
Ref<Boolean> result = Ref.create();
forEach(targetClass.getProject(), provider -> {
boolean augmentedForIncompleteMode = provider.mightBeAugmentedForIncompleteMode(targetClass);
result.set(augmentedForIncompleteMode);
return !augmentedForIncompleteMode;
});
return result.get();
}
//</editor-fold>
}

40
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/provider/LombokAugmentProvider.java
View File

@@ -8,7 +8,6 @@ import com.intellij.psi.*;
import com.intellij.psi.augment.PsiAugmentProvider;
import com.intellij.psi.augment.PsiExtensionMethod;
import com.intellij.psi.impl.source.PsiExtensibleClass;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.InitializationUtils;
import de.plushnikov.intellij.plugin.LombokClassNames;
import de.plushnikov.intellij.plugin.processor.LombokProcessorManager;
@@ -202,43 +201,4 @@ public final class LombokAugmentProvider extends PsiAugmentProvider implements P
}
return ExtensionMethodsHelper.getExtensionMethods(aClass, nameHint, context);
}
@Override
protected boolean mightBeAugmentedForIncompleteMode(@NotNull PsiClass psiClass) {
if(!(psiClass instanceof PsiExtensibleClass extensibleClass)) {
return false;
}
if(!(extensibleClass.getContainingFile() instanceof PsiJavaFile file)) {
return false;
}
return hasAnyLombokAnnotation(extensibleClass.getAnnotations()) ||
ContainerUtil.exists(extensibleClass.getOwnFields(), field -> hasAnyLombokAnnotation(field.getAnnotations())) ||
(file.getImportList() != null &&
ContainerUtil.exists(file.getImportList().getAllImportStatements(), statement -> {
PsiJavaCodeReferenceElement reference = statement.getImportReference();
return reference != null && reference.getText().startsWith("lombok");
}));
}
/**
* Checks if the given PsiModifierListOwner has any Lombok annotation.
* It is used only for incomplete mode.
*
* @param annotations The annotations to check for Lombok annotations.
* @return true if the modifierListOwner has any Lombok annotation, otherwise false.
*/
private static boolean hasAnyLombokAnnotation(PsiAnnotation @NotNull [] annotations) {
return ContainerUtil.exists(annotations, annotation -> {
if (annotation == null) {
return false;
}
String qualifiedName = annotation.getQualifiedName();
if (qualifiedName == null) {
return false;
}
return qualifiedName.startsWith("lombok.");
});
}
}

36
plugins/lombok/src/test/java/com/intellij/java/lomboktest/LombokIncompleteModeHighlightingTest.java
View File

@@ -1,36 +0,0 @@
package com.intellij.java.lomboktest;
import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.project.IncompleteDependenciesService;
import com.intellij.testFramework.PlatformTestUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import static com.intellij.openapi.project.IncompleteDependenciesServiceKt.asAutoCloseable;
public class LombokIncompleteModeHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testLombokBasics() { doTest(); }
public void testLombokBasicsWithExplicitImport() { doTest(); }
private void doTest() {
doTest(getTestName(false) + ".java");
}
private void doTest(String fileName) {
IncompleteDependenciesService service = getProject().getService(IncompleteDependenciesService.class);
try (var ignored = asAutoCloseable(WriteAction.compute(() -> service.enterIncompleteState()))) {
doTest("/plugins/lombok/testData/highlightingIncompleteMode/" + fileName, true, true);
}
catch (Exception e) {
throw new RuntimeException(e);
}
}
@Override
protected @NonNls @NotNull String getTestDataPath() {
return PlatformTestUtil.getCommunityPath();
}
}

32
plugins/lombok/testData/highlightingIncompleteMode/LombokBasics.java
View File

@@ -1,32 +0,0 @@
import <info descr="Not resolved until the project is fully loaded">lombok</info>.*<EOLError descr="';' expected"></EOLError>
public final class LombokBasics {
public static void main(String[] args) {
UserDao userDao = UserDao.<info descr="Not resolved until the project is fully loaded">builder</info>()
.<info descr="Not resolved until the project is fully loaded">info</info>("1")
.<info descr="Not resolved until the project is fully loaded">build</info>();
String name = userDao.<info descr="Not resolved until the project is fully loaded">name</info>();
UserChain userChain = new UserChain();
String name1 = userChain.<info descr="Not resolved until the project is fully loaded">getName</info>();
}
}
@<info descr="Not resolved until the project is fully loaded">Getter</info>
@<info descr="Not resolved until the project is fully loaded">SuperBuilder</info>
class UserDao extends UserId {
<info descr="Not resolved until the project is fully loaded">private final String name;</info>
<info descr="Not resolved until the project is fully loaded">private final String surname;</info>
<info descr="Not resolved until the project is fully loaded">private final String email;</info>
}
@<info descr="Not resolved until the project is fully loaded">SuperBuilder</info>
abstract class UserId {
<info descr="Not resolved until the project is fully loaded">private final long id;</info>
<info descr="Not resolved until the project is fully loaded">private final String info;</info>
}
class UserChain {
@<info descr="Not resolved until the project is fully loaded">Getter</info>
@<info descr="Not resolved until the project is fully loaded">Setter</info>
private String name;
}

34
plugins/lombok/testData/highlightingIncompleteMode/LombokBasicsWithExplicitImport.java
View File

@@ -1,34 +0,0 @@
import <info descr="Not resolved until the project is fully loaded">lombok</info>.<info descr="Not resolved until the project is fully loaded">Getter</info>;
import <info descr="Not resolved until the project is fully loaded">lombok</info>.<info descr="Not resolved until the project is fully loaded">Setter</info>;
import <info descr="Not resolved until the project is fully loaded">lombok</info>.<info descr="Not resolved until the project is fully loaded">SuperBuilder</info>;
public final class LombokBasicsWithExplicitImport {
public static void main(String[] args) {
UserDao userDao = UserDao.<info descr="Not resolved until the project is fully loaded">builder</info>()
.<info descr="Not resolved until the project is fully loaded">info</info>("1")
.<info descr="Not resolved until the project is fully loaded">build</info>();
String name = userDao.<info descr="Not resolved until the project is fully loaded">name</info>();
UserChain userChain = new UserChain();
String name1 = userChain.<info descr="Not resolved until the project is fully loaded">getName</info>();
}
}
@<info descr="Not resolved until the project is fully loaded">Getter</info>
@<info descr="Not resolved until the project is fully loaded">SuperBuilder</info>
class UserDao extends UserId {
<info descr="Not resolved until the project is fully loaded">private final String name;</info>
<info descr="Not resolved until the project is fully loaded">private final String surname;</info>
<info descr="Not resolved until the project is fully loaded">private final String email;</info>
}
@<info descr="Not resolved until the project is fully loaded">SuperBuilder</info>
abstract class UserId {
<info descr="Not resolved until the project is fully loaded">private final long id;</info>
<info descr="Not resolved until the project is fully loaded">private final String info;</info>
}
class UserChain {
@<info descr="Not resolved until the project is fully loaded">Getter</info>
@<info descr="Not resolved until the project is fully loaded">Setter</info>
private String name;
}