From 6bfaac9c340219d655de9fd4d28f260061855ea3 Mon Sep 17 00:00:00 2001 From: svtk Date: Fri, 30 Sep 2011 16:01:45 +0400 Subject: [PATCH] Little fix: 'redundant modifier in trait' instead of 'redundant abstract' error --- .../jet/lang/diagnostics/Errors.java | 3 +- .../PsiElementOnlyDiagnosticFactory2.java | 8 +++ .../jet/lang/resolve/DeclarationsChecker.java | 5 +- .../jet/plugin/quickfix/AddModifierFix.java | 5 -- .../jet/plugin/quickfix/QuickFixUtil.java | 51 +++++++++++++++++-- .../jet/plugin/quickfix/QuickFixes.java | 9 ++-- .../plugin/quickfix/RemoveModifierFix.java | 5 -- .../quickfix/RemovePartsFromPropertyFix.java | 5 -- .../checkerWithErrorTypes/full/Abstract.jet | 20 ++++---- .../abstract/afterRedundantAbstract.kt | 2 +- .../abstract/beforeRedundantAbstract.kt | 2 +- 11 files changed, 76 insertions(+), 39 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index cabc78f70a6..7cff43d00f5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -100,7 +100,6 @@ public interface Errors { DiagnosticWithParameterFactory PROPERTY_INITIALIZER_IN_TRAIT = DiagnosticWithParameterFactory.create(ERROR, "Property initializers are not allowed in traits", DiagnosticParameters.TYPE); SimpleDiagnosticFactory PROPERTY_INITIALIZER_NO_BACKING_FIELD = SimpleDiagnosticFactory.create(ERROR, "Initializer is not allowed here because this property has no backing field"); DiagnosticWithParameterFactory PROPERTY_INITIALIZER_NO_PRIMARY_CONSTRUCTOR = DiagnosticWithParameterFactory.create(ERROR, "Property initializers are not allowed when no primary constructor is present", DiagnosticParameters.CLASS); - SimplePsiElementOnlyDiagnosticFactory REDUNDANT_ABSTRACT = SimplePsiElementOnlyDiagnosticFactory.create(WARNING, "Abstract modifier is redundant in traits"); PsiElementOnlyDiagnosticFactory3 ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS = new PsiElementOnlyDiagnosticFactory3(ERROR, "Abstract property {0} in non-abstract class {1}") { @NotNull protected DiagnosticWithPsiElement on(@NotNull JetModifierListOwner elementToBlame, @NotNull TextRange textRangeToMark, @NotNull String s, @NotNull ClassDescriptor classDescriptor, @NotNull JetClass aClass) { @@ -122,7 +121,7 @@ public interface Errors { DiagnosticWithParameterFactory NON_FINAL_MEMBER_IN_FINAL_CLASS = DiagnosticWithParameterFactory.create(ERROR, "Non final member in a final class", DiagnosticParameters.CLASS); DiagnosticWithParameterFactory NON_FINAL_ACCESSOR_OF_FINAL_PROPERTY = DiagnosticWithParameterFactory.create(ERROR, "Non final accessor of a final property", DiagnosticParameters.PROPERTY); - DiagnosticWithParameterFactory ABSTRACT_ACCESSOR_OF_NON_ABSTRACT_PROPERTY = DiagnosticWithParameterFactory.create(ERROR, "Abstract accessor of a non abstract property", DiagnosticParameters.PROPERTY); + DiagnosticWithParameterFactory ABSTRACT_ACCESSOR_OF_NON_ABSTRACT_PROPERTY = DiagnosticWithParameterFactory.create(ERROR, "Abstract accessor of a final property", DiagnosticParameters.PROPERTY); SimpleDiagnosticFactory PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT = SimpleDiagnosticFactory.create(ERROR, "Projections are not allowed on type arguments of functions and properties"); // TODO : better positioning SimpleDiagnosticFactory SUPERTYPE_NOT_INITIALIZED = SimpleDiagnosticFactory.create(ERROR, "This type has a constructor, and thus must be initialized here"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PsiElementOnlyDiagnosticFactory2.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PsiElementOnlyDiagnosticFactory2.java index 49e27db67f7..5e34f33c0fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PsiElementOnlyDiagnosticFactory2.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PsiElementOnlyDiagnosticFactory2.java @@ -6,10 +6,18 @@ import com.intellij.psi.PsiElement; * @author svtk */ public class PsiElementOnlyDiagnosticFactory2 extends DiagnosticFactoryWithPsiElement2 implements PsiElementOnlyDiagnosticFactory { + public static PsiElementOnlyDiagnosticFactory2 create(Severity severity, String messageStub, Renderer renderer) { + return new PsiElementOnlyDiagnosticFactory2(severity, messageStub, renderer); + } + public static PsiElementOnlyDiagnosticFactory2 create(Severity severity, String messageStub) { return new PsiElementOnlyDiagnosticFactory2(severity, messageStub); } + public PsiElementOnlyDiagnosticFactory2(Severity severity, String message, Renderer renderer) { + super(severity, message, renderer); + } + protected PsiElementOnlyDiagnosticFactory2(Severity severity, String message) { super(severity, message); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java index 5e6a291fe84..97efea7d0d9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java @@ -156,7 +156,7 @@ public class DeclarationsChecker { return; } if (classDescriptor.getKind() == ClassKind.TRAIT) { - context.getTrace().report(REDUNDANT_ABSTRACT.on(property, abstractNode)); + context.getTrace().report(REDUNDANT_MODIFIER_IN_TRAIT.on(modifierList, abstractNode, JetTokens.ABSTRACT_KEYWORD)); } } @@ -254,7 +254,7 @@ public class DeclarationsChecker { context.getTrace().report(ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS.on(functionOrPropertyAccessor, abstractNode, functionDescriptor.getName(), classDescriptor, (JetClass) classElement)); } if (hasAbstractModifier && inTrait && !isPropertyAccessor) { - context.getTrace().report(REDUNDANT_ABSTRACT.on(functionOrPropertyAccessor, abstractNode)); + context.getTrace().report(REDUNDANT_MODIFIER_IN_TRAIT.on(modifierList, abstractNode, JetTokens.ABSTRACT_KEYWORD)); } if (function.getBodyExpression() != null && hasAbstractModifier) { context.getTrace().report(ABSTRACT_FUNCTION_WITH_BODY.on(functionOrPropertyAccessor, abstractNode, functionDescriptor)); @@ -283,6 +283,7 @@ public class DeclarationsChecker { ? propertyDescriptor.getGetter() : propertyDescriptor.getSetter(); checkFunction(accessor, accessorDescriptor); + checkModifiers(accessor.getModifierList()); if (propertyDescriptor.getModality() == Modality.FINAL && accessor.hasModifier(JetTokens.OPEN_KEYWORD)) { ASTNode openModifierNode = accessor.getModifierList().getModifierNode(JetTokens.OPEN_KEYWORD); context.getTrace().report(NON_FINAL_ACCESSOR_OF_FINAL_PROPERTY.on(accessor, openModifierNode, property)); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java index 3a647100c87..de64087a558 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java @@ -40,11 +40,6 @@ public class AddModifierFix extends ModifierFix { return "Add modifier"; } - @Override - public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { - return element.isValid(); - } - @Override public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { element.replace(addModifier(element, modifier, modifiersThanCanBeReplaced, project)); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index 40bb408a736..02ffaa2b339 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -1,6 +1,11 @@ package org.jetbrains.jet.plugin.quickfix; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.DiagnosticParameter; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithPsiElement; @@ -10,7 +15,8 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticWithPsiElementImpl; * @author svtk */ public class QuickFixUtil { - private QuickFixUtil() {} + private QuickFixUtil() { + } public static JetIntentionActionFactory createFactoryRedirectingAdditionalInfoToAnotherFactory(final JetIntentionActionFactory factory, final DiagnosticParameter

parameter) { return new JetIntentionActionFactory() { @@ -18,10 +24,49 @@ public class QuickFixUtil { public JetIntentionAction createAction(DiagnosticWithPsiElement diagnostic) { DiagnosticWithParameters diagnosticWithParameters = JetIntentionAction.assertAndCastToDiagnosticWithParameters(diagnostic, parameter); - T element = diagnosticWithParameters.getParameter(parameter); + P element = diagnosticWithParameters.getParameter(parameter); return (JetIntentionAction) factory.createAction(new DiagnosticWithPsiElementImpl(diagnostic.getFactory(), diagnostic.getSeverity(), diagnostic.getMessage(), element)); } }; } - + + public static JetIntentionActionFactory createFactoryRedirectingAdditionalInfoIfAnyToAnotherFactory(final JetIntentionActionFactory factory, final DiagnosticParameter

parameter) { + return new JetIntentionActionFactory() { + @Override + public JetIntentionAction createAction(DiagnosticWithPsiElement diagnostic) { + + if (diagnostic instanceof DiagnosticWithParameters && ((DiagnosticWithParameters) diagnostic).hasParameter(parameter)) { + P element = ((DiagnosticWithParameters) diagnostic).getParameter(parameter); + return (JetIntentionAction) factory.createAction(new DiagnosticWithPsiElementImpl(diagnostic.getFactory(), diagnostic.getSeverity(), diagnostic.getMessage(), element)); + } + return createDoNothingAction(diagnostic); + } + }; + } + + public static JetIntentionAction createDoNothingAction(DiagnosticWithPsiElement diagnostic) { + return new JetIntentionAction(diagnostic.getPsiElement()) { + @Override + public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { + return false; + } + + @NotNull + @Override + public String getText() { + throw new UnsupportedOperationException(); + } + + @NotNull + @Override + public String getFamilyName() { + throw new UnsupportedOperationException(); + } + + @Override + public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { + throw new UnsupportedOperationException(); + } + }; + } } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java index c67c49bd977..a2f4fb48753 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java @@ -48,7 +48,6 @@ public class QuickFixes { add(Errors.PROPERTY_INITIALIZER_IN_TRAIT, removePartsFromPropertyFactory); add(Errors.MUST_BE_INITIALIZED_OR_BE_ABSTRACT, addAbstractModifierFactory); - add(Errors.REDUNDANT_ABSTRACT, removeAbstractModifierFactory); JetIntentionActionFactory addAbstractToClassFactory = QuickFixUtil.createFactoryRedirectingAdditionalInfoToAnotherFactory(addAbstractModifierFactory, DiagnosticParameters.CLASS); add(Errors.ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS, removeAbstractModifierFactory); @@ -70,7 +69,7 @@ public class QuickFixes { add(Errors.NON_MEMBER_FUNCTION_NO_BODY, addFunctionBodyFactory); add(Errors.NOTHING_TO_OVERRIDE, RemoveModifierFix.createFactory(JetTokens.OVERRIDE_KEYWORD)); - add(Errors.VIRTUAL_MEMBER_HIDDEN, AddModifierFix.createFactory(JetTokens.OVERRIDE_KEYWORD)); + add(Errors.VIRTUAL_MEMBER_HIDDEN, AddModifierFix.createFactory(JetTokens.OVERRIDE_KEYWORD, new JetToken[] {JetTokens.OPEN_KEYWORD})); add(Errors.VAL_WITH_SETTER, ChangeVariableMutabilityFix.createFactory()); @@ -80,16 +79,16 @@ public class QuickFixes { JetIntentionActionFactory changeAccessorTypeFactory = ChangeAccessorTypeFix.createFactory(); add(Errors.WRONG_SETTER_PARAMETER_TYPE, changeAccessorTypeFactory); add(Errors.WRONG_GETTER_RETURN_TYPE, changeAccessorTypeFactory); - + add(Errors.USELESS_ELVIS, RemoveRightPartOfBinaryExpressionFix.createRemoveElvisOperatorFactory()); - + add(Errors.UNNECESSARY_SAFE_CALL, ReplaceSafeCallToDotCall.createFactory()); JetIntentionActionFactory removeRedundantModifierFactory = RemoveRedundantModifierFix.createFactory(); add(Errors.REDUNDANT_MODIFIER, removeRedundantModifierFactory); add(Errors.REDUNDANT_MODIFIER_IN_TRAIT, removeRedundantModifierFactory); add(Errors.TRAIT_CAN_NOT_BE_FINAL, RemoveModifierFix.createFactory(JetTokens.FINAL_KEYWORD)); - + add(Errors.PROPERTY_INITIALIZER_NO_PRIMARY_CONSTRUCTOR, RemovePartsFromPropertyFix.createRemoveInitializerFactory()); JetIntentionActionFactory addPrimaryConstructorFactory = AddPrimaryConstructorFix.createFactory(); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java index b4e7afe9ce8..ac68ec8c38c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java @@ -41,11 +41,6 @@ public class RemoveModifierFix extends ModifierFix { return "Remove modifier"; } - @Override - public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { - return element.isValid(); - } - @Override public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { JetModifierListOwner newElement = (JetModifierListOwner) element.copy(); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java index faa272f521d..34c99ff3155 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java @@ -76,11 +76,6 @@ public class RemovePartsFromPropertyFix extends JetIntentionAction return "Remove parts from property to make it abstract"; } - @Override - public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { - return element.isValid(); - } - @Override public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { JetProperty newElement = (JetProperty) element.copy(); diff --git a/idea/testData/checkerWithErrorTypes/full/Abstract.jet b/idea/testData/checkerWithErrorTypes/full/Abstract.jet index 1d3420ce16d..a1c73c553d7 100644 --- a/idea/testData/checkerWithErrorTypes/full/Abstract.jet +++ b/idea/testData/checkerWithErrorTypes/full/Abstract.jet @@ -92,29 +92,29 @@ trait MyTrait { //properties val a: Int val a1: Int = 1 - abstract val a2: Int - abstract val a3: Int = 1 + abstract val a2: Int + abstract val a3: Int = 1 var b: Int private set var b1: Int = 0; private set - abstract var b2: Int private set - abstract var b3: Int = 0; private set + abstract var b2: Int private set + abstract var b3: Int = 0; private set var c: Int set(v: Int) { $c = v } var c1: Int = 0; set(v: Int) { $c1 = v } - abstract var c2: Int set(v: Int) { $c2 = v } - abstract var c3: Int = 0; set(v: Int) { $c3 = v } + abstract var c2: Int set(v: Int) { $c2 = v } + abstract var c3: Int = 0; set(v: Int) { $c3 = v } val e: Int get() = a val e1: Int = 0; get() = a - abstract val e2: Int get() = a - abstract val e3: Int = 0; get() = a + abstract val e2: Int get() = a + abstract val e3: Int = 0; get() = a //methods fun f() fun g() {} - abstract fun h() - abstract fun j() {} + abstract fun h() + abstract fun j() {} //property accessors var i: Int abstract get abstract set diff --git a/idea/testData/quickfix/abstract/afterRedundantAbstract.kt b/idea/testData/quickfix/abstract/afterRedundantAbstract.kt index a6244c18332..6fc13b24bc1 100644 --- a/idea/testData/quickfix/abstract/afterRedundantAbstract.kt +++ b/idea/testData/quickfix/abstract/afterRedundantAbstract.kt @@ -1,4 +1,4 @@ -// "Make 'foo' not abstract" "true" +// "Remove redundant 'abstract' modifier" "true" trait A { fun foo() } \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/beforeRedundantAbstract.kt b/idea/testData/quickfix/abstract/beforeRedundantAbstract.kt index 81599e7cefa..4cf5dd59500 100644 --- a/idea/testData/quickfix/abstract/beforeRedundantAbstract.kt +++ b/idea/testData/quickfix/abstract/beforeRedundantAbstract.kt @@ -1,4 +1,4 @@ -// "Make 'foo' not abstract" "true" +// "Remove redundant 'abstract' modifier" "true" trait A { abstract fun foo() } \ No newline at end of file