MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[lombok] IDEA-329808 Fix invalid error about missing final modifier for subclass of sealed class annotated with Lombok's @Value

Browse Source 
GitOrigin-RevId: 63fba57e020ae076219a100458b9d35e07fdabbb
This commit is contained in:
Michail Plushnikov
2023-09-02 17:35:06 +00:00
committed by intellij-monorepo-bot
parent 75c76d9486
commit 0b4694bb4f
5 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/modifier/ValueModifierProcessor.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class ValueModifierProcessor implements ModifierProcessor {
@Override
public void transformModifiers(@NotNull PsiModifierList modifierList, @NotNull final Set<String> modifiers) {
if (modifiers.contains(PsiModifier.STATIC)) {
if (modifiers.contains(PsiModifier.STATIC) && modifierList.getParent() instanceof PsiField) {
return; // skip static fields
}
plugins/lombok/src/test/java/com/intellij/java/lomboktest/LombokHighlightingTest.java
+31 -27
View File
@@ -22,32 +22,6 @@ import org.jetbrains.annotations.NotNull;
public class LombokHighlightingTest extends LightDaemonAnalyzerTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
enableInspectionTool(new UnusedDeclarationInspection(true));
setWarningLevel(new ObjectEqualityInspection());
}
private void setWarningLevel(LocalInspectionTool inspection) {
final HighlightDisplayKey displayKey = HighlightDisplayKey.find(inspection.getShortName());
final InspectionProfileImpl currentProfile = ProjectInspectionProfileManager.getInstance(getProject()).getCurrentProfile();
currentProfile.setErrorLevel(displayKey, HighlightDisplayLevel.WARNING, getProject());
}
@Override
protected LocalInspectionTool @NotNull [] configureLocalInspectionTools() {
return new LocalInspectionTool[]{
new ObjectToStringInspection(),
new ObjectEqualityInspection(),
new DataFlowInspection(),
new DefUseInspection(),
new FieldMayBeFinalInspection(),
new FieldCanBeLocalInspection(),
new DefaultAnnotationParamInspection()
};
}
public void testLombokBasics() { doTest(); }
public void testLombokStaticVars() {
@@ -74,10 +48,40 @@ public class LombokHighlightingTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testValueSealedInterface() {
doTest();
}
@Override
protected void setUp() throws Exception {
super.setUp();
enableInspectionTool(new UnusedDeclarationInspection(true));
setWarningLevel(new ObjectEqualityInspection());
}
private void setWarningLevel(LocalInspectionTool inspection) {
final HighlightDisplayKey displayKey = HighlightDisplayKey.find(inspection.getShortName());
final InspectionProfileImpl currentProfile = ProjectInspectionProfileManager.getInstance(getProject()).getCurrentProfile();
currentProfile.setErrorLevel(displayKey, HighlightDisplayLevel.WARNING, getProject());
}
@Override
protected LocalInspectionTool @NotNull [] configureLocalInspectionTools() {
return new LocalInspectionTool[]{
new ObjectToStringInspection(),
new ObjectEqualityInspection(),
new DataFlowInspection(),
new DefUseInspection(),
new FieldMayBeFinalInspection(),
new FieldCanBeLocalInspection(),
new DefaultAnnotationParamInspection()
};
}
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return LombokTestUtil.LOMBOK_DESCRIPTOR;
return LombokTestUtil.LOMBOK_NEW_DESCRIPTOR;
}
private void doTest() {
plugins/lombok/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokParsingTestCase.java
+10 -9
View File
@@ -32,7 +32,7 @@ public abstract class AbstractLombokParsingTestCase extends AbstractLombokLightC
}
protected Collection<String> annotationsToIgnoreList() {
return Set.of("java.lang.SuppressWarnings", "java.lang.Override","com.fasterxml.jackson.databind.annotation.JsonDeserialize");
return Set.of("java.lang.SuppressWarnings", "java.lang.Override", "com.fasterxml.jackson.databind.annotation.JsonDeserialize");
}
protected boolean shouldCompareCodeBlocks() {
@@ -101,7 +101,9 @@ public abstract class AbstractLombokParsingTestCase extends AbstractLombokLightC
PsiModifierList afterFieldModifierList = afterClass.getModifierList();
compareContainingClasses(beforeClass, afterClass);
compareModifiers(beforeFieldModifierList, afterFieldModifierList);
if (beforeFieldModifierList != null && afterFieldModifierList != null) {
compareModifiers(beforeFieldModifierList, afterFieldModifierList);
}
compareFields(beforeClass, afterClass);
compareMethods(beforeClass, afterClass);
compareConstructors(beforeClass, afterClass);
@@ -127,7 +129,9 @@ public abstract class AbstractLombokParsingTestCase extends AbstractLombokLightC
if (Objects.equal(afterField.getName(), beforeField.getName())) {
final PsiModifierList beforeFieldModifierList = beforeField.getModifierList();
compareModifiers(beforeFieldModifierList, afterFieldModifierList);
if (beforeFieldModifierList != null && afterFieldModifierList != null) {
compareModifiers(beforeFieldModifierList, afterFieldModifierList);
}
compareType(beforeField.getType(), afterField.getType(), afterField);
compareInitializers(beforeField.getInitializer(), afterField.getInitializer());
compared = true;
@@ -155,10 +159,7 @@ public abstract class AbstractLombokParsingTestCase extends AbstractLombokLightC
return StringUtil.trimStart(canonicalText, "java.lang.");
}
private void compareModifiers(PsiModifierList beforeModifierList, PsiModifierList afterModifierList) {
assertNotNull(beforeModifierList);
assertNotNull(afterModifierList);
private void compareModifiers(@NotNull PsiModifierList beforeModifierList, @NotNull PsiModifierList afterModifierList) {
for (String modifier : PsiModifier.MODIFIERS) {
boolean haveSameModifiers = afterModifierList.hasModifierProperty(modifier) == beforeModifierList.hasModifierProperty(modifier);
if (!haveSameModifiers) {
@@ -207,9 +208,9 @@ public abstract class AbstractLombokParsingTestCase extends AbstractLombokLightC
PsiAnnotation afterAnnotation = afterModifierList.findAnnotation(qualifiedName);
if (null != afterAnnotation) {
Map<String, String> beforeParameter = Stream.of(beforeAnnotation.getParameterList().getAttributes())
.collect(Collectors.toMap(PsiNameValuePair::getAttributeName, p->p.getValue().getText()));
.collect(Collectors.toMap(PsiNameValuePair::getAttributeName, p -> p.getValue().getText()));
Map<String, String> afterParameter = Stream.of(afterAnnotation.getParameterList().getAttributes())
.collect(Collectors.toMap(PsiNameValuePair::getAttributeName, p->p.getValue().getText()));
.collect(Collectors.toMap(PsiNameValuePair::getAttributeName, p -> p.getValue().getText()));
assertEquals("Annotation parameter are not same for " + qualifiedName, afterParameter, beforeParameter);
}
}
plugins/lombok/src/test/java/de/plushnikov/intellij/plugin/LombokTestUtil.java
+1
View File
@@ -37,6 +37,7 @@ public final class LombokTestUtil {
public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) {
MavenDependencyUtil.addFromMaven(model, LOMBOK_MAVEN_COORDINATES);
MavenDependencyUtil.addFromMaven(model, JACKSON_MAVEN_COORDINATES);
MavenDependencyUtil.addFromMaven(model, "org.slf4j:slf4j-api:1.7.30");
model.getModuleExtension(LanguageLevelModuleExtension.class).setLanguageLevel(LanguageLevel.HIGHEST);
}
};
plugins/lombok/testData/highlighting/ValueSealedInterface.java
+22
View File
@@ -0,0 +1,22 @@
import lombok.Value;
sealed interface Sealed permits ValueSealedInterface, ValueSealedInterface.A, ValueSealedInterface.B, ValueSealedInterface.C {
}
@Value
public class ValueSealedInterface implements Sealed {
static final class A implements Sealed {
}
@Value
static class B implements Sealed {
// should not report: "sealed, non-sealed or final modifiers expected" even though class is final
}
@Value
static final class C implements Sealed {
}
}