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

Add 'override' to equals/hashCode/toString Quick-Fix: Convert to Kotlin & refactor

Browse Source
This commit is contained in:
Alexey Sedunov
2016-01-06 02:09:08 +03:00
parent 96e6319ee1
commit c44d0ed619
3 changed files with 34 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties
-1
View File
@@ -135,7 +135,6 @@ migrate.class.object.to.companion.in.whole.project.family=Replace 'class' Keywor
migrate.lambda.syntax=Migrate lambda syntax migrate.lambda.syntax=Migrate lambda syntax
migrate.lambda.syntax.family=Migrate lambda syntax migrate.lambda.syntax.family=Migrate lambda syntax
remove.val.var.from.parameter=Remove ''{0}'' from parameter remove.val.var.from.parameter=Remove ''{0}'' from parameter
add.override.to.equals.hashCode.toString=Add 'override' to equals, hashCode, toString in project
move.when.else.branch.to.the.end.action=Move else branch to the end move.when.else.branch.to.the.end.action=Move else branch to the end
move.when.else.branch.to.the.end.family.name=Move else branch to the end move.when.else.branch.to.the.end.family.name=Move else branch to the end
change.to.property.name.family.name=Change to property name change.to.property.name.family.name=Change to property name
idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.kt
+32 -82
View File
@@ -14,95 +14,45 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.quickfix; package org.jetbrains.kotlin.idea.quickfix
import com.intellij.openapi.editor.Editor; import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.project.Project; import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import com.intellij.psi.PsiElement; import org.jetbrains.kotlin.diagnostics.Diagnostic
import com.intellij.psi.PsiFile; import org.jetbrains.kotlin.idea.caches.resolve.analyze
import com.intellij.util.IncorrectOperationException; import org.jetbrains.kotlin.lexer.KtTokens.OVERRIDE_KEYWORD
import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.lexer.KtTokens.PUBLIC_KEYWORD
import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.KtNamedFunction
import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.idea.KotlinBundle;
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider;
import org.jetbrains.kotlin.psi.*;
import java.util.Collection; object AddOverrideToEqualsHashCodeToStringActionFactory : KotlinSingleIntentionActionFactory() {
import java.util.List; private val NAME = "Add 'override' to equals, hashCode, toString in project"
import static org.jetbrains.kotlin.lexer.KtTokens.OVERRIDE_KEYWORD; private fun isEqualsHashCodeOrToString(element: KtNamedFunction): Boolean {
import static org.jetbrains.kotlin.lexer.KtTokens.PUBLIC_KEYWORD; return when (element.name) {
"equals" -> {
public class AddOverrideToEqualsHashCodeToStringFix extends KotlinQuickFixAction<PsiElement> { val paramTypeRef = element.valueParameters.singleOrNull()?.typeReference ?: return false
public AddOverrideToEqualsHashCodeToStringFix(@NotNull PsiElement element) { val paramType = paramTypeRef.analyze(BodyResolveMode.PARTIAL)[BindingContext.TYPE, paramTypeRef] ?: return false
super(element); KotlinBuiltIns.isNullableAny(paramType)
}
@NotNull
@Override
public String getText() {
return KotlinBundle.message("add.override.to.equals.hashCode.toString");
}
@NotNull
@Override
public String getFamilyName() {
return KotlinBundle.message("add.override.to.equals.hashCode.toString");
}
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiFile file) {
return super.isAvailable(project, editor, file) && isEqualsHashCodeOrToString(getElement());
}
private static boolean isEqualsHashCodeOrToString(@Nullable PsiElement element) {
if (!(element instanceof KtNamedFunction)) return false;
KtNamedFunction function = (KtNamedFunction) element;
String name = function.getName();
if ("equals".equals(name)) {
List<KtParameter> parameters = function.getValueParameters();
if (parameters.size() != 1) return false;
KtTypeReference parameterType = parameters.iterator().next().getTypeReference();
return parameterType != null && "Any?".equals(parameterType.getText());
}
if ("hashCode".equals(name) || "toString".equals(name)) {
return function.getValueParameters().isEmpty();
}
return false;
}
@Override
protected void invoke(@NotNull Project project, Editor editor, @NotNull KtFile file) throws IncorrectOperationException {
Collection<KtFile> files = PluginJetFilesProvider.allFilesInProject(file.getProject());
for (KtFile jetFile : files) {
for (Diagnostic diagnostic : ResolutionUtils.analyzeFully(jetFile).getDiagnostics()) {
if (diagnostic.getFactory() != Errors.VIRTUAL_MEMBER_HIDDEN) continue;
KtModifierListOwner element = (KtModifierListOwner) diagnostic.getPsiElement();
if (!isEqualsHashCodeOrToString(element)) continue;
element.addModifier(OVERRIDE_KEYWORD);
element.removeModifier(PUBLIC_KEYWORD);
} }
"hashCode", "toString" -> element.valueParameters.isEmpty()
else -> false
} }
} }
@NotNull private fun KtNamedFunction.doInvoke() {
public static KotlinSingleIntentionActionFactory createFactory() { addModifier(OVERRIDE_KEYWORD)
return new KotlinSingleIntentionActionFactory() { removeModifier(PUBLIC_KEYWORD)
@Nullable
@Override
public AddOverrideToEqualsHashCodeToStringFix createAction(@NotNull Diagnostic diagnostic) {
return new AddOverrideToEqualsHashCodeToStringFix(diagnostic.getPsiElement());
}
};
} }
override fun createAction(diagnostic: Diagnostic): IntentionAction? {
return WholeProjectForEachElementOfTypeFix.createByPredicate<KtNamedFunction>(
predicate = { isEqualsHashCodeOrToString(it) },
taskProcessor = { it.doInvoke() },
name = NAME
)
}
} }
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+1 -1
View File
@@ -172,7 +172,7 @@ class QuickFixRegistrar : QuickFixContributor {
VAL_OR_VAR_ON_CATCH_PARAMETER.registerFactory(removeValVarFromParameterFixFactory) VAL_OR_VAR_ON_CATCH_PARAMETER.registerFactory(removeValVarFromParameterFixFactory)
VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER.registerFactory(removeValVarFromParameterFixFactory) VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER.registerFactory(removeValVarFromParameterFixFactory)
VIRTUAL_MEMBER_HIDDEN.registerFactory(AddOverrideToEqualsHashCodeToStringFix.createFactory()) VIRTUAL_MEMBER_HIDDEN.registerFactory(AddOverrideToEqualsHashCodeToStringActionFactory)
UNUSED_VARIABLE.registerFactory(RemovePsiElementSimpleFix.createRemoveVariableFactory()) UNUSED_VARIABLE.registerFactory(RemovePsiElementSimpleFix.createRemoveVariableFactory())