azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed JetIntentionAction to KotlinQuickFixAction

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-13 22:50:15 +03:00
parent ab87471177
commit 23025b072e
60 changed files with 92 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/AddReflectionQuickFix.kt
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils
import org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator
import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator
import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
import org.jetbrains.kotlin.idea.quickfix.quickfixUtil.createIntentionForFirstParentOfType
import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtil
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.utils.PathUtil
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import java.io.File
public class AddReflectionQuickFix(element: JetElement) : JetIntentionAction<JetElement>(element) {
public class AddReflectionQuickFix(element: JetElement) : KotlinQuickFixAction<JetElement>(element) {
override fun getText() = JetBundle.message("add.reflection.to.classpath")
override fun getFamilyName() = getText()
idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
+3 -3
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
import org.jetbrains.kotlin.idea.core.targetDescriptors
import org.jetbrains.kotlin.idea.imports.importableFqName
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.idea.references.JetSimpleNameReference
import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
@@ -177,7 +177,7 @@ public class ConflictingExtensionPropertyInspection : AbstractKotlinInspection()
return fixes
}
private class DeleteRedundantExtensionAction(property: JetProperty) : JetIntentionAction<JetProperty>(property) {
private class DeleteRedundantExtensionAction(property: JetProperty) : KotlinQuickFixAction<JetProperty>(property) {
private val LOG = Logger.getInstance(DeleteRedundantExtensionAction::class.java);
override fun getFamilyName() = "Delete redundant extension property"
@@ -222,7 +222,7 @@ public class ConflictingExtensionPropertyInspection : AbstractKotlinInspection()
}
}
private class MarkHiddenAndDeprecatedAction(property: JetProperty) : JetIntentionAction<JetProperty>(property) {
private class MarkHiddenAndDeprecatedAction(property: JetProperty) : KotlinQuickFixAction<JetProperty>(property) {
override fun getFamilyName() = "Mark as @Deprecated(..., level = DeprecationLevel.HIDDEN)"
override fun getText() = familyName
idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
+2 -2
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
import org.jetbrains.kotlin.idea.highlighter.JetPsiChecker
import org.jetbrains.kotlin.idea.quickfix.CleanupFix
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.idea.quickfix.ReplaceObsoleteLabelSyntaxFix
import org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
@@ -129,7 +129,7 @@ public class KotlinCleanupInspection(): LocalInspectionTool(), CleanupLocalInspe
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)
}
private class RemoveImportFix(import: JetImportDirective) : JetIntentionAction<JetImportDirective>(import), CleanupFix {
private class RemoveImportFix(import: JetImportDirective) : KotlinQuickFixAction<JetImportDirective>(import), CleanupFix {
override fun getFamilyName() = "Remove deprecated symbol import"
override fun getText() = familyName
idea/src/org/jetbrains/kotlin/idea/intentions/IntroduceBackingPropertyIntention.kt
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.*
@@ -150,7 +150,7 @@ class IntroduceBackingPropertyIntention(): JetSelfTargetingIntention<JetProperty
}
}
class IntroduceBackingPropertyFix(prop: JetProperty): JetIntentionAction<JetProperty>(prop) {
class IntroduceBackingPropertyFix(prop: JetProperty): KotlinQuickFixAction<JetProperty>(prop) {
override fun getText(): String = "Introduce backing property"
override fun getFamilyName(): String = getText()
idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetFunction;
import org.jetbrains.kotlin.psi.JetPsiFactory;
import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
public class AddFunctionBodyFix extends JetIntentionAction<JetFunction> {
public class AddFunctionBodyFix extends KotlinQuickFixAction<JetFunction> {
public AddFunctionBodyFix(@NotNull JetFunction element) {
super(element);
}
@@ -71,7 +71,7 @@ public class AddFunctionBodyFix extends JetIntentionAction<JetFunction> {
return new JetSingleIntentionActionFactory() {
@Nullable
@Override
public JetIntentionAction createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction createAction(Diagnostic diagnostic) {
PsiElement element = diagnostic.getPsiElement();
JetFunction function = PsiTreeUtil.getParentOfType(element, JetFunction.class, false);
if (function == null) return null;
idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt
+1 -1
View File
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.utils.singletonOrEmptyList
public class AddGenericUpperBoundFix(
typeParameter: JetTypeParameter,
upperBound: JetType
) : JetIntentionAction<JetTypeParameter>(typeParameter) {
) : KotlinQuickFixAction<JetTypeParameter>(typeParameter) {
private val renderedUpperBound: String = IdeDescriptorRenderers.SOURCE_CODE.renderType(upperBound)
override fun getText() = "Add '$renderedUpperBound' as upper bound for ${element.name}"
idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.parents
public class AddLoopLabelFix(loop: JetLoopExpression, val jumpExpression: JetElement): JetIntentionAction<JetLoopExpression>(loop) {
public class AddLoopLabelFix(loop: JetLoopExpression, val jumpExpression: JetElement): KotlinQuickFixAction<JetLoopExpression>(loop) {
override fun getText() = "Add label to loop"
override fun getFamilyName() = getText()
idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.java
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.JetPropertyAccessor;
import static org.jetbrains.kotlin.lexer.JetTokens.ABSTRACT_KEYWORD;
public class AddModifierFix extends JetIntentionAction<JetModifierListOwner> {
public class AddModifierFix extends KotlinQuickFixAction<JetModifierListOwner> {
@NotNull private final JetModifierKeywordToken modifier;
public AddModifierFix(@NotNull JetModifierListOwner element, @NotNull JetModifierKeywordToken modifier) {
idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
+1 -1
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
public class AddNameToArgumentFix(argument: JetValueArgument) : JetIntentionAction<JetValueArgument>(argument) {
public class AddNameToArgumentFix(argument: JetValueArgument) : KotlinQuickFixAction<JetValueArgument>(argument) {
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
if (!super.isAvailable(project, editor, file)) return false
idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.idea.references.ReferenceUtilKt;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.psi.*;
public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<JetTypeReference> {
public class AddOpenModifierToClassDeclarationFix extends KotlinQuickFixAction<JetTypeReference> {
private JetClass classDeclaration;
public AddOpenModifierToClassDeclarationFix(@NotNull JetTypeReference typeReference) {
idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
+1 -1
View File
@@ -36,7 +36,7 @@ import java.util.List;
import static org.jetbrains.kotlin.lexer.JetTokens.OVERRIDE_KEYWORD;
import static org.jetbrains.kotlin.lexer.JetTokens.PUBLIC_KEYWORD;
public class AddOverrideToEqualsHashCodeToStringFix extends JetIntentionAction<PsiElement> {
public class AddOverrideToEqualsHashCodeToStringFix extends KotlinQuickFixAction<PsiElement> {
public AddOverrideToEqualsHashCodeToStringFix(@NotNull PsiElement element) {
super(element);
}
idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
public abstract class AddStarProjectionsFix extends JetIntentionAction<JetUserType> {
public abstract class AddStarProjectionsFix extends KotlinQuickFixAction<JetUserType> {
private final int argumentCount;
idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeToLHSOfCallableReferenceFix.kt
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class AddTypeToLHSOfCallableReferenceFix(
expression: JetCallableReferenceExpression
) : JetIntentionAction<JetCallableReferenceExpression>(expression), CleanupFix {
) : KotlinQuickFixAction<JetCallableReferenceExpression>(expression), CleanupFix {
override fun getFamilyName() = "Add type to left-hand side"
override fun getText() = familyName
idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.psi.*;
public class AddWhenElseBranchFix extends JetIntentionAction<JetWhenExpression> {
public class AddWhenElseBranchFix extends KotlinQuickFixAction<JetWhenExpression> {
private static final String ELSE_ENTRY_TEXT = "else -> {}";
public AddWhenElseBranchFix(@NotNull JetWhenExpression element) {
@@ -77,7 +77,7 @@ public class AddWhenElseBranchFix extends JetIntentionAction<JetWhenExpression>
return new JetSingleIntentionActionFactory() {
@Nullable
@Override
public JetIntentionAction createAction(@NotNull Diagnostic diagnostic) {
public KotlinQuickFixAction createAction(@NotNull Diagnostic diagnostic) {
PsiElement element = diagnostic.getPsiElement();
JetWhenExpression whenExpression = PsiTreeUtil.getParentOfType(element, JetWhenExpression.class, false);
if (whenExpression == null) return null;
idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
+1 -1
View File
@@ -100,7 +100,7 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<Jet
private fun createAction(project: Project, editor: Editor) = KotlinAddImportAction(project, editor, element, suggestions)
companion object : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): JetIntentionAction<JetSimpleNameExpression>? {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<JetSimpleNameExpression>? {
// There could be different psi elements (i.e. JetArrayAccessExpression), but we can fix only JetSimpleNameExpression case
val psiElement = diagnostic.getPsiElement()
if (psiElement is JetSimpleNameExpression) {
idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.FlexibleTypesKt;
import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker;
public class CastExpressionFix extends JetIntentionAction<JetExpression> {
public class CastExpressionFix extends KotlinQuickFixAction<JetExpression> {
private final JetType type;
public CastExpressionFix(@NotNull JetExpression element, @NotNull JetType type) {
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType;
public class ChangeAccessorTypeFix extends JetIntentionAction<JetPropertyAccessor> {
public class ChangeAccessorTypeFix extends KotlinQuickFixAction<JetPropertyAccessor> {
private JetType type;
public ChangeAccessorTypeFix(@NotNull JetPropertyAccessor element) {
@@ -87,7 +87,7 @@ public class ChangeAccessorTypeFix extends JetIntentionAction<JetPropertyAccesso
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetPropertyAccessor> createAction(@NotNull Diagnostic diagnostic) {
public KotlinQuickFixAction<JetPropertyAccessor> createAction(@NotNull Diagnostic diagnostic) {
JetPropertyAccessor accessor = QuickFixUtil.getParentElementOfType(diagnostic, JetPropertyAccessor.class);
if (accessor == null) return null;
return new ChangeAccessorTypeFix(accessor);
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java
+1 -1
View File
@@ -48,7 +48,7 @@ import java.util.List;
import static org.jetbrains.kotlin.idea.project.PlatformKt.getPlatform;
public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction<JetFunctionLiteralExpression> {
public class ChangeFunctionLiteralReturnTypeFix extends KotlinQuickFixAction<JetFunctionLiteralExpression> {
private final JetType type;
private final JetTypeReference functionLiteralReturnTypeRef;
private IntentionAction appropriateQuickFix = null;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
+1 -1
View File
@@ -54,7 +54,7 @@ import static org.jetbrains.kotlin.diagnostics.Errors.COMPONENT_FUNCTION_RETURN_
import static org.jetbrains.kotlin.idea.project.PlatformKt.getPlatform;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns;
public class ChangeFunctionReturnTypeFix extends JetIntentionAction<JetFunction> {
public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<JetFunction> {
private final JetType type;
private final ChangeFunctionLiteralReturnTypeFix changeFunctionLiteralReturnTypeFix;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java
+1 -2
View File
@@ -24,7 +24,6 @@ import com.intellij.psi.util.PsiTreeUtil;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.CallableDescriptor;
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
@@ -55,7 +54,7 @@ import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYN
import static org.jetbrains.kotlin.diagnostics.Errors.EXPECTED_PARAMETERS_NUMBER_MISMATCH;
import static org.jetbrains.kotlin.diagnostics.Errors.UNUSED_PARAMETER;
public abstract class ChangeFunctionSignatureFix extends JetIntentionAction<PsiElement> {
public abstract class ChangeFunctionSignatureFix extends KotlinQuickFixAction<PsiElement> {
protected final PsiElement context;
protected final FunctionDescriptor functionDescriptor;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType;
public class ChangeParameterTypeFix extends JetIntentionAction<JetParameter> {
public class ChangeParameterTypeFix extends KotlinQuickFixAction<JetParameter> {
private final JetType type;
private final String containingDeclarationName;
private final boolean isPrimaryConstructorParameter;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangePrivateTopLevelToInternalFix.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetModifierListOwner
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.resolve.DescriptorUtils
public class ChangePrivateTopLevelToInternalFix(element: JetModifierListOwner, private val elementName: String) : JetIntentionAction<JetModifierListOwner>(element), CleanupFix {
public class ChangePrivateTopLevelToInternalFix(element: JetModifierListOwner, private val elementName: String) : KotlinQuickFixAction<JetModifierListOwner>(element), CleanupFix {
override fun getText() = "Make $elementName internal"
override fun getFamilyName() = "Make top-level declaration internal"
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
public class ChangeToFunctionInvocationFix extends JetIntentionAction<JetExpression> {
public class ChangeToFunctionInvocationFix extends KotlinQuickFixAction<JetExpression> {
public ChangeToFunctionInvocationFix(@NotNull JetExpression element) {
super(element);
@@ -53,7 +53,7 @@ public class ChangeToFunctionInvocationFix extends JetIntentionAction<JetExpress
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetExpression> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetExpression> createAction(Diagnostic diagnostic) {
if (diagnostic.getPsiElement() instanceof JetExpression) {
return new ChangeToFunctionInvocationFix((JetExpression) diagnostic.getPsiElement());
}
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToPropertyNameFix.java
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
public class ChangeToPropertyNameFix extends JetIntentionAction<JetSimpleNameExpression> {
public class ChangeToPropertyNameFix extends KotlinQuickFixAction<JetSimpleNameExpression> {
public ChangeToPropertyNameFix(@NotNull JetSimpleNameExpression element) {
super(element);
}
@@ -61,7 +61,7 @@ public class ChangeToPropertyNameFix extends JetIntentionAction<JetSimpleNameExp
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetSimpleNameExpression> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetSimpleNameExpression> createAction(Diagnostic diagnostic) {
JetSimpleNameExpression expression = QuickFixUtil.getParentElementOfType(diagnostic, JetSimpleNameExpression.class);
if (expression == null) {
PsiElement element = diagnostic.getPsiElement();
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
public class ChangeToStarProjectionFix extends JetIntentionAction<JetTypeElement> {
public class ChangeToStarProjectionFix extends KotlinQuickFixAction<JetTypeElement> {
public ChangeToStarProjectionFix(@NotNull JetTypeElement element) {
super(element);
}
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import org.jetbrains.kotlin.psi.JetTypeReference;
import org.jetbrains.kotlin.types.JetType;
public class ChangeTypeFix extends JetIntentionAction<JetTypeReference> {
public class ChangeTypeFix extends KotlinQuickFixAction<JetTypeReference> {
private final JetType type;
private final String renderedType;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetPropertyAccessor
import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
public class ChangeVariableMutabilityFix(element: JetProperty, private val makeVar: Boolean) : JetIntentionAction<JetProperty>(element) {
public class ChangeVariableMutabilityFix(element: JetProperty, private val makeVar: Boolean) : KotlinQuickFixAction<JetProperty>(element) {
override fun getText() = if (makeVar) "Make variable mutable" else "Make variable immutable"
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java
+1 -1
View File
@@ -47,7 +47,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclaration> {
public class ChangeVariableTypeFix extends KotlinQuickFixAction<JetVariableDeclaration> {
private final static Logger LOG = Logger.getInstance(ChangeVariableTypeFix.class);
private final JetType type;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java
+2 -2
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.resolve.BindingContext;
public class ChangeVisibilityModifierFix extends JetIntentionAction<JetDeclaration> {
public class ChangeVisibilityModifierFix extends KotlinQuickFixAction<JetDeclaration> {
public ChangeVisibilityModifierFix(@NotNull JetDeclaration element) {
super(element);
}
@@ -110,7 +110,7 @@ public class ChangeVisibilityModifierFix extends JetIntentionAction<JetDeclarati
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetDeclaration> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetDeclaration> createAction(Diagnostic diagnostic) {
PsiElement element = diagnostic.getPsiElement();
if (!(element instanceof JetDeclaration)) return null;
return new ChangeVisibilityModifierFix((JetDeclaration)element);
idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.isReallySuccess
public class InsertDelegationCallQuickfix(val isThis: Boolean, element: JetSecondaryConstructor) : JetIntentionAction<JetSecondaryConstructor>(element) {
public class InsertDelegationCallQuickfix(val isThis: Boolean, element: JetSecondaryConstructor) : KotlinQuickFixAction<JetSecondaryConstructor>(element) {
override fun getText() = JetBundle.message("insert.delegation.call", keywordToUse)
override fun getFamilyName() = "Insert explicit delegation call"
idea/src/org/jetbrains/kotlin/idea/quickfix/JetHintAction.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
/**
* A fix with the user information hint.
*/
public abstract class JetHintAction<T extends PsiElement> extends JetIntentionAction<T> implements HintAction {
public abstract class JetHintAction<T extends PsiElement> extends KotlinQuickFixAction<T> implements HintAction {
public JetHintAction(@NotNull T element) {
super(element);
idea/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionAction.kt → idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinQuickFixAction.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.psi.JetCodeFragment
import org.jetbrains.kotlin.psi.JetFile
abstract class JetIntentionAction<T : PsiElement>(protected val element: T) : IntentionAction {
abstract class KotlinQuickFixAction<T : PsiElement>(protected val element: T) : IntentionAction {
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
return element.isValid && (file.manager.isInProject(file) || file is JetCodeFragment) && (file is JetFile)
idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.idea.references.ReferenceUtilKt;
import org.jetbrains.kotlin.psi.*;
public class MakeClassAnAnnotationClassFix extends JetIntentionAction<JetAnnotationEntry> {
public class MakeClassAnAnnotationClassFix extends KotlinQuickFixAction<JetAnnotationEntry> {
private final JetAnnotationEntry annotationEntry;
private JetClass annotationClass;
idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.kt
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import java.util.*
public class MakeOverriddenMemberOpenFix(declaration: JetDeclaration) : JetIntentionAction<JetDeclaration>(declaration) {
public class MakeOverriddenMemberOpenFix(declaration: JetDeclaration) : KotlinQuickFixAction<JetDeclaration>(declaration) {
private val overriddenNonOverridableMembers = ArrayList<JetCallableDeclaration>()
private val containingDeclarationsNames = ArrayList<String>()
idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java
+1 -1
View File
@@ -46,7 +46,7 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReferenceExpression> {
public class MapPlatformClassToKotlinFix extends KotlinQuickFixAction<JetReferenceExpression> {
private static final String PRIMARY_USAGE = "PrimaryUsage";
private static final String OTHER_USAGE = "OtherUsage";
idea/src/org/jetbrains/kotlin/idea/quickfix/MigrateAnnotationMethodCallFix.kt
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull
public class MigrateAnnotationMethodCallFix(
expression: JetCallExpression
) : JetIntentionAction<JetCallExpression>(expression) {
) : KotlinQuickFixAction<JetCallExpression>(expression) {
override fun getText() = "Replace method call with property access"
override fun getFamilyName() = getText()
idea/src/org/jetbrains/kotlin/idea/quickfix/MigrateBackingFieldSyntaxFix.kt
+2 -2
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetNameReferenceExpression
import org.jetbrains.kotlin.psi.JetPsiFactory
public class MigrateBackingFieldSyntaxFix(expr: JetNameReferenceExpression)
: JetIntentionAction<JetNameReferenceExpression>(expr), CleanupFix {
: KotlinQuickFixAction<JetNameReferenceExpression>(expr), CleanupFix {
override fun invoke(project: Project, editor: Editor?, file: JetFile) {
val replacement = JetPsiFactory(project).createExpression("field")
element.replace(replacement)
@@ -43,7 +43,7 @@ public class MigrateBackingFieldSyntaxFix(expr: JetNameReferenceExpression)
}
public class MigrateBackingFieldUsageFix(expr: JetNameReferenceExpression)
: JetIntentionAction<JetNameReferenceExpression>(expr) {
: KotlinQuickFixAction<JetNameReferenceExpression>(expr) {
override fun invoke(project: Project, editor: Editor?, file: JetFile) {
val replacement = JetPsiFactory(project).createExpression(element.text.substring(1))
element.replace(replacement)
idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetPrimaryConstructor
import org.jetbrains.kotlin.idea.quickfix.quickfixUtil.addConstructorKeyword
public class MissingConstructorKeywordFix(element: JetPrimaryConstructor) : JetIntentionAction<JetPrimaryConstructor>(element), CleanupFix {
public class MissingConstructorKeywordFix(element: JetPrimaryConstructor) : KotlinQuickFixAction<JetPrimaryConstructor>(element), CleanupFix {
override fun getFamilyName(): String = getText()
override fun getText(): String = "Add 'constructor' keyword"
idea/src/org/jetbrains/kotlin/idea/quickfix/MoveTypeParameterConstraintFix.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
class MoveTypeParameterConstraintFix(element: JetTypeParameter) : JetIntentionAction<JetTypeParameter>(element), CleanupFix {
class MoveTypeParameterConstraintFix(element: JetTypeParameter) : KotlinQuickFixAction<JetTypeParameter>(element), CleanupFix {
override fun getText(): String = "Move type parameter constraint to 'where' clause"
override fun getFamilyName(): String = text
idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java
+2 -2
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.psi.*;
public class MoveWhenElseBranchFix extends JetIntentionAction<JetWhenExpression> {
public class MoveWhenElseBranchFix extends KotlinQuickFixAction<JetWhenExpression> {
public MoveWhenElseBranchFix(@NotNull JetWhenExpression element) {
super(element);
}
@@ -79,7 +79,7 @@ public class MoveWhenElseBranchFix extends JetIntentionAction<JetWhenExpression>
return new JetSingleIntentionActionFactory() {
@Nullable
@Override
public JetIntentionAction createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction createAction(Diagnostic diagnostic) {
PsiElement element = diagnostic.getPsiElement();
JetWhenExpression whenExpression = PsiTreeUtil.getParentOfType(element, JetWhenExpression.class, false);
if (whenExpression == null) return null;
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java
+2 -2
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetFunction;
public class RemoveFunctionBodyFix extends JetIntentionAction<JetFunction> {
public class RemoveFunctionBodyFix extends KotlinQuickFixAction<JetFunction> {
public RemoveFunctionBodyFix(@NotNull JetFunction element) {
super(element);
@@ -91,7 +91,7 @@ public class RemoveFunctionBodyFix extends JetIntentionAction<JetFunction> {
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetFunction> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetFunction> createAction(Diagnostic diagnostic) {
JetFunction function = QuickFixUtil.getParentElementOfType(diagnostic, JetFunction.class);
if (function == null) return null;
return new RemoveFunctionBodyFix(function);
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.kt
+5 -5
View File
@@ -34,7 +34,7 @@ public class RemoveModifierFix(
element: JetModifierListOwner,
private val modifier: JetModifierKeywordToken,
private val isRedundant: Boolean
) : JetIntentionAction<JetModifierListOwner>(element) {
) : KotlinQuickFixAction<JetModifierListOwner>(element) {
private val text = run {
val modifierText = modifier.value
@@ -69,7 +69,7 @@ public class RemoveModifierFix(
companion object {
public fun createRemoveModifierFromListOwnerFactory(modifier: JetModifierKeywordToken, isRedundant: Boolean = false): JetSingleIntentionActionFactory {
return object : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): JetIntentionAction<JetModifierListOwner>? {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<JetModifierListOwner>? {
val modifierListOwner = QuickFixUtil.getParentElementOfType(diagnostic, javaClass<JetModifierListOwner>()) ?: return null
return RemoveModifierFix(modifierListOwner, modifier, isRedundant)
}
@@ -78,7 +78,7 @@ public class RemoveModifierFix(
public fun createRemoveModifierFactory(isRedundant: Boolean = false): JetSingleIntentionActionFactory {
return object : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): JetIntentionAction<JetModifierListOwner>? {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<JetModifierListOwner>? {
val psiElement = diagnostic.psiElement
val elementType = psiElement.node.elementType as? JetModifierKeywordToken ?: return null
val modifierListOwner = psiElement.getStrictParentOfType<JetModifierListOwner>() ?: return null
@@ -89,7 +89,7 @@ public class RemoveModifierFix(
public fun createRemoveProjectionFactory(isRedundant: Boolean): JetSingleIntentionActionFactory {
return object : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): JetIntentionAction<JetModifierListOwner>? {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<JetModifierListOwner>? {
val projection = diagnostic.psiElement as JetTypeProjection
val elementType = projection.projectionToken?.node?.elementType as? JetModifierKeywordToken ?: return null
return RemoveModifierFix(projection, elementType, isRedundant)
@@ -99,7 +99,7 @@ public class RemoveModifierFix(
public fun createRemoveVarianceFactory(): JetSingleIntentionActionFactory {
return object : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): JetIntentionAction<JetModifierListOwner>? {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<JetModifierListOwner>? {
val psiElement = diagnostic.psiElement as JetTypeParameter
val modifier = when (psiElement.variance) {
Variance.IN_VARIANCE -> JetTokens.IN_KEYWORD
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNameFromFunctionExpressionFix.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType
import org.jetbrains.kotlin.resolve.BindingContext
public class RemoveNameFromFunctionExpressionFix(element: JetNamedFunction) : JetIntentionAction<JetNamedFunction>(element), CleanupFix {
public class RemoveNameFromFunctionExpressionFix(element: JetNamedFunction) : KotlinQuickFixAction<JetNamedFunction>(element), CleanupFix {
override fun getText(): String = "Remove identifier from function expression"
override fun getFamilyName(): String = getText()
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetNullableType;
import org.jetbrains.kotlin.psi.JetTypeElement;
public class RemoveNullableFix extends JetIntentionAction<JetNullableType> {
public class RemoveNullableFix extends KotlinQuickFixAction<JetNullableType> {
public enum NullableKind {
REDUNDANT, SUPERTYPE, USELESS
}
@@ -67,7 +67,7 @@ public class RemoveNullableFix extends JetIntentionAction<JetNullableType> {
public static JetSingleIntentionActionFactory createFactory(final NullableKind typeOfError) {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetNullableType> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetNullableType> createAction(Diagnostic diagnostic) {
JetNullableType nullType = QuickFixUtil.getParentElementOfType(diagnostic, JetNullableType.class);
if (nullType == null || nullType.getInnerType() == null) return null;
return new RemoveNullableFix(nullType, typeOfError);
idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType;
public class RemovePartsFromPropertyFix extends JetIntentionAction<JetProperty> {
public class RemovePartsFromPropertyFix extends KotlinQuickFixAction<JetProperty> {
private final boolean removeInitializer;
private final boolean removeGetter;
private final boolean removeSetter;
@@ -123,7 +123,7 @@ public class RemovePartsFromPropertyFix extends JetIntentionAction<JetProperty>
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetProperty> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetProperty> createAction(Diagnostic diagnostic) {
PsiElement element = diagnostic.getPsiElement();
assert element instanceof JetElement;
JetProperty property = PsiTreeUtil.getParentOfType(element, JetProperty.class);
idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java
+5 -5
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.psi.*;
public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
public class RemovePsiElementSimpleFix extends KotlinQuickFixAction<PsiElement> {
private final PsiElement element;
private final String text;
@@ -60,7 +60,7 @@ public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
public static JetSingleIntentionActionFactory createRemoveImportFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<PsiElement> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
JetImportDirective directive = QuickFixUtil.getParentElementOfType(diagnostic, JetImportDirective.class);
if (directive == null) return null;
else {
@@ -79,7 +79,7 @@ public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
public static JetSingleIntentionActionFactory createRemoveSpreadFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<PsiElement> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
PsiElement element = diagnostic.getPsiElement();
if ((element instanceof LeafPsiElement) && ((LeafPsiElement) element).getElementType() == JetTokens.MUL) {
return new RemovePsiElementSimpleFix(element, JetBundle.message("remove.spread.sign"));
@@ -92,7 +92,7 @@ public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
public static JetSingleIntentionActionFactory createRemoveTypeArgumentsFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<PsiElement> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
JetTypeArgumentList element = QuickFixUtil.getParentElementOfType(diagnostic, JetTypeArgumentList.class);
if (element == null) return null;
return new RemovePsiElementSimpleFix(element,
@@ -104,7 +104,7 @@ public class RemovePsiElementSimpleFix extends JetIntentionAction<PsiElement> {
public static JetSingleIntentionActionFactory createRemoveVariableFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<PsiElement> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
final JetProperty expression = QuickFixUtil.getParentElementOfType(diagnostic, JetProperty.class);
if (expression == null) return null;
return new RemovePsiElementSimpleFix(expression,
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java
+3 -3
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> extends JetIntentionAction<T> implements CleanupFix {
public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> extends KotlinQuickFixAction<T> implements CleanupFix {
private final String message;
public RemoveRightPartOfBinaryExpressionFix(@NotNull T element, String message) {
@@ -73,7 +73,7 @@ public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> exten
public static JetSingleIntentionActionFactory createRemoveTypeFromBinaryExpressionFactory(final String message) {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetBinaryExpressionWithTypeRHS> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetBinaryExpressionWithTypeRHS> createAction(Diagnostic diagnostic) {
JetBinaryExpressionWithTypeRHS expression = QuickFixUtil.getParentElementOfType(diagnostic, JetBinaryExpressionWithTypeRHS.class);
if (expression == null) return null;
return new RemoveRightPartOfBinaryExpressionFix<JetBinaryExpressionWithTypeRHS>(expression, message);
@@ -84,7 +84,7 @@ public class RemoveRightPartOfBinaryExpressionFix<T extends JetExpression> exten
public static JetSingleIntentionActionFactory createRemoveElvisOperatorFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetBinaryExpression> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetBinaryExpression> createAction(Diagnostic diagnostic) {
JetBinaryExpression expression = (JetBinaryExpression) diagnostic.getPsiElement();
return new RemoveRightPartOfBinaryExpressionFix<JetBinaryExpression>(expression, JetBundle.message("remove.elvis.operator"));
}
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.psi.JetDelegationSpecifier;
import org.jetbrains.kotlin.psi.JetFile;
public class RemoveSupertypeFix extends JetIntentionAction<JetDelegationSpecifier> {
public class RemoveSupertypeFix extends KotlinQuickFixAction<JetDelegationSpecifier> {
private final JetDelegationSpecifier superClass;
public RemoveSupertypeFix(@NotNull JetDelegationSpecifier superClass) {
@@ -67,7 +67,7 @@ public class RemoveSupertypeFix extends JetIntentionAction<JetDelegationSpecifie
public static JetSingleIntentionActionFactory createFactory() {
return new JetSingleIntentionActionFactory() {
@Override
public JetIntentionAction<JetDelegationSpecifier> createAction(Diagnostic diagnostic) {
public KotlinQuickFixAction<JetDelegationSpecifier> createAction(Diagnostic diagnostic) {
JetDelegationSpecifier superClass = QuickFixUtil.getParentElementOfType(diagnostic, JetDelegationSpecifier.class);
if (superClass == null) return null;
return new RemoveSupertypeFix(superClass);
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
public class RemoveValVarFromParameterFix extends JetIntentionAction<JetParameter> {
public class RemoveValVarFromParameterFix extends KotlinQuickFixAction<JetParameter> {
private final String varOrVal;
public RemoveValVarFromParameterFix(@NotNull JetParameter element) {
idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java
+1 -1
View File
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetParameter;
import org.jetbrains.kotlin.resolve.BindingContext;
public class RenameParameterToMatchOverriddenMethodFix extends JetIntentionAction<JetParameter>{
public class RenameParameterToMatchOverriddenMethodFix extends KotlinQuickFixAction<JetParameter>{
private final JetParameter parameter;
private String parameterFromSuperclassName;
idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
class RenameUnderscoreFix(declaration: JetDeclaration) : JetIntentionAction<JetDeclaration>(declaration) {
class RenameUnderscoreFix(declaration: JetDeclaration) : KotlinQuickFixAction<JetDeclaration>(declaration) {
override fun invoke(project: Project, editor: Editor?, file: JetFile) {
if (editor == null) return
val dataContext = DataManager.getInstance().getDataContext(editor.component)
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.psi.createExpressionByPattern
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
public class ReplaceInfixCallFix(element: JetBinaryExpression) : JetIntentionAction<JetBinaryExpression>(element) {
public class ReplaceInfixCallFix(element: JetBinaryExpression) : KotlinQuickFixAction<JetBinaryExpression>(element) {
override fun getText() = "Replace with safe (?.) call"
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceJavaAnnotationPositionedArgumentsFix.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument
public class ReplaceJavaAnnotationPositionedArgumentsFix(element: JetAnnotationEntry)
: JetIntentionAction<JetAnnotationEntry>(element), CleanupFix {
: KotlinQuickFixAction<JetAnnotationEntry>(element), CleanupFix {
override fun getText(): String = "Replace invalid positioned arguments for annotation"
override fun getFamilyName(): String = getText()
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt
+1 -1
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.resolve.BindingContext
public class ReplaceObsoleteLabelSyntaxFix(element: JetAnnotationEntry) : JetIntentionAction<JetAnnotationEntry>(element), CleanupFix {
public class ReplaceObsoleteLabelSyntaxFix(element: JetAnnotationEntry) : KotlinQuickFixAction<JetAnnotationEntry>(element), CleanupFix {
override fun getFamilyName(): String = "Update obsolete label syntax"
override fun getText(): String = "Replace with label ${element.getCalleeExpression()?.getText() ?: ""}@"
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.psi.*;
public abstract class ReplaceOperationInBinaryExpressionFix<T extends JetExpression> extends JetIntentionAction<T> {
public abstract class ReplaceOperationInBinaryExpressionFix<T extends JetExpression> extends KotlinQuickFixAction<T> {
private final String operation;
public ReplaceOperationInBinaryExpressionFix(@NotNull T element, String operation) {
idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
+2 -2
View File
@@ -104,7 +104,7 @@ public object SuperClassNotInitialized : JetIntentionActionsFactory() {
private class AddParenthesisFix(
element: JetDelegatorToSuperClass,
val putCaretIntoParenthesis: Boolean
) : JetIntentionAction<JetDelegatorToSuperClass>(element), HighPriorityAction {
) : KotlinQuickFixAction<JetDelegatorToSuperClass>(element), HighPriorityAction {
override fun getFamilyName() = "Change to constructor invocation" //TODO?
@@ -130,7 +130,7 @@ public object SuperClassNotInitialized : JetIntentionActionsFactory() {
val classDeclaration: JetClass,
val superConstructor: ConstructorDescriptor, //TODO: do not hold descriptor!
private val text: String
) : JetIntentionAction<JetDelegatorToSuperClass>(element) {
) : KotlinQuickFixAction<JetDelegatorToSuperClass>(element) {
override fun getFamilyName() = "Add constructor parameters from superclass"
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt
+2 -2
View File
@@ -17,9 +17,9 @@
package org.jetbrains.kotlin.idea.quickfix.createFromUsage
import org.jetbrains.kotlin.idea.JetBundle
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.psi.JetElement
public abstract class CreateFromUsageFixBase<T: JetElement>(element: T) : JetIntentionAction<T>(element) {
public abstract class CreateFromUsageFixBase<T: JetElement>(element: T) : KotlinQuickFixAction<T>(element) {
override fun getFamilyName(): String = JetBundle.message("create.from.usage.family")
}
idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateTypeParameterListFix.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.quickfix.CleanupFix
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetNamedFunction
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetTypeParameterList
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
class MigrateTypeParameterListFix(typeParameterList: JetTypeParameterList)
: JetIntentionAction<JetTypeParameterList>(typeParameterList), CleanupFix {
: KotlinQuickFixAction<JetTypeParameterList>(typeParameterList), CleanupFix {
override fun getFamilyName(): String = "Migrate type parameter list syntax"
override fun getText(): String = familyName
idea/src/org/jetbrains/kotlin/idea/quickfix/quickfixUtil/quickfixUtil.kt
+2 -2
View File
@@ -19,14 +19,14 @@ package org.jetbrains.kotlin.idea.quickfix.quickfixUtil
import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
import org.jetbrains.kotlin.psi.JetPrimaryConstructor
import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
inline fun <reified T : PsiElement> Diagnostic.createIntentionForFirstParentOfType(
factory: (T) -> JetIntentionAction<T>?
factory: (T) -> KotlinQuickFixAction<T>?
) = getPsiElement().getNonStrictParentOfType<T>()?.let(factory)
idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
+2 -2
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.core.OptionalParametersHelper
import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction
import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetSimpleNameExpression
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
public abstract class DeprecatedSymbolUsageFixBase(
element: JetSimpleNameExpression,
val replaceWith: ReplaceWith
) : JetIntentionAction<JetSimpleNameExpression>(element) {
) : KotlinQuickFixAction<JetSimpleNameExpression>(element) {
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
if (!super.isAvailable(project, editor, file)) return false