MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Intention to convert a.equals(b) to Objects.equals(a, b) (IDEA-143925)

Browse Source
This commit is contained in:
Dmitry Batkovich
2015-08-27 15:26:19 +03:00
parent e7a0d6bad3
commit cb8099de91
11 changed files with 248 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertEqualsMethodToStaticIntention.java Normal file
View File

@@ -0,0 +1,102 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.intention.impl;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.intention.BaseElementAtCaretIntentionAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
/**
* @author Dmitry Batkovich
*/
public class ConvertEqualsMethodToStaticIntention extends BaseElementAtCaretIntentionAction {
private static final Logger LOG = Logger.getInstance(ConvertEqualsMethodToStaticIntention.class);
private static final String REPLACE_TEMPLATE = "java.util.Objects.equals(%s, %s)";
public static final String TEXT = "Convert '.equals()' to 'java.util.Objects.equals()'";
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
if (!(element instanceof PsiIdentifier)) {
return false;
}
if (!PsiUtil.isLanguageLevel7OrHigher(element)) {
return false;
}
final PsiElement referenceExpression = element.getParent();
if (!(referenceExpression instanceof PsiReferenceExpression)) {
return false;
}
if (!"equals".equals(((PsiReferenceExpression)referenceExpression).getReferenceName())) {
return false;
}
final PsiElement methodCallExpression = referenceExpression.getParent();
if (!(methodCallExpression instanceof PsiMethodCallExpression)) {
return false;
}
final int argumentsCount = ((PsiMethodCallExpression)methodCallExpression).getArgumentList().getExpressions().length;
if (argumentsCount != 1) {
return false;
}
final PsiMethod method = ((PsiMethodCallExpression)methodCallExpression).resolveMethod();
if (method == null) {
return false;
}
PsiClass javaLangObject = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_OBJECT, element.getResolveScope());
if (javaLangObject == null) {
return false;
}
if (javaLangObject.isEquivalentTo(method.getContainingClass())) {
return true;
}
final PsiMethod[] superMethods = method.findSuperMethods(javaLangObject);
return superMethods.length == 1;
}
@Override
public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
if (!FileModificationService.getInstance().preparePsiElementsForWrite(element)) {
return;
}
final PsiElement parent = element.getParent().getParent();
LOG.assertTrue(parent instanceof PsiMethodCallExpression);
PsiMethodCallExpression methodCall = (PsiMethodCallExpression) parent;
final PsiExpression qualifier = methodCall.getMethodExpression().getQualifierExpression();
final String qualifierText = qualifier == null ? PsiKeyword.THIS : qualifier.getText();
final PsiExpression parameter = methodCall.getArgumentList().getExpressions()[0];
final String expressionText = String.format(REPLACE_TEMPLATE, qualifierText, parameter.getText());
methodCall.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText(expressionText, null));
}
@Nls
@NotNull
@Override
public String getFamilyName() {
return TEXT;
}
@NotNull
@Override
public String getText() {
return getFamilyName();
}
}

11
java/java-tests/testData/codeInsight/convertEqualsMethodToStatic/complexQualifierAndArgument.java Normal file
View File

@@ -0,0 +1,11 @@
import java.lang.String;
class X {
void m() {
if ("asd".intern().equa<caret>ls(String.valueOf("qwe"))) {
// do something
}
}
}

11
java/java-tests/testData/codeInsight/convertEqualsMethodToStatic/complexQualifierAndArgument_after.java Normal file
View File

@@ -0,0 +1,11 @@
import java.lang.String;
class X {
void m() {
if (java.util.Objects.equals("asd".intern(), String.valueOf("qwe"))) {
// do something
}
}
}

12
java/java-tests/testData/codeInsight/convertEqualsMethodToStatic/notAvailable.java Normal file
View File

@@ -0,0 +1,12 @@
class X {
void m(X x2) {
if (equa<caret>ls(x2, x2, x2)) {
}
}
boolean equals(X x, X x2, X x3) {
return false;
}
}

9
java/java-tests/testData/codeInsight/convertEqualsMethodToStatic/simple.java Normal file
View File

@@ -0,0 +1,9 @@
class X {
void m() {
if ("asd".equa<caret>ls("qwe")) {
// do something
}
}
}

9
java/java-tests/testData/codeInsight/convertEqualsMethodToStatic/simple_after.java Normal file
View File

@@ -0,0 +1,9 @@
class X {
void m() {
if (java.util.Objects.equals("asd", "qwe")) {
// do something
}
}
}

62
java/java-tests/testSrc/com/intellij/codeInsight/intention/ConvertEqualsMethodToStaticTest.java Normal file
View File

@@ -0,0 +1,62 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.intention;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.intention.impl.ConvertCompareToToEqualsIntention;
import com.intellij.codeInsight.intention.impl.ConvertEqualsMethodToStaticIntention;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
/**
* @author Dmitry Batkovich
*/
public class ConvertEqualsMethodToStaticTest extends JavaCodeInsightFixtureTestCase {
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath() + "/codeInsight/convertEqualsMethodToStatic/";
}
@Override
protected void setUp() throws Exception {
super.setUp();
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_7);
}
public void testSimple() {
doTest();
}
public void testComplexQualifierAndArgument() {
doTest();
}
public void testNotAvailable() {
doTestNotAvailable();
}
private void doTest() {
final String name = getTestName(true);
CodeInsightTestUtil.doIntentionTest(myFixture, ConvertEqualsMethodToStaticIntention.TEXT, name + ".java", name + "_after.java");
}
private void doTestNotAvailable() {
myFixture.configureByFile(getTestName(true) + ".java");
assertEmpty(myFixture.filterAvailableIntentions(ConvertEqualsMethodToStaticIntention.TEXT));
}
}

4
resources-en/src/intentionDescriptions/ConvertEqualsMethodToStaticIntention/after.java.template Normal file
View File

@@ -0,0 +1,4 @@
void m(String s1, String s2) {
if (java.util.Objects.equals(s1, s2)) {
}
}

4
resources-en/src/intentionDescriptions/ConvertEqualsMethodToStaticIntention/before.java.template Normal file
View File

@@ -0,0 +1,4 @@
void m(String s1, String s2) {
if (<spot>s1.equals(s2)</spot>) {
}
}

20
resources-en/src/intentionDescriptions/ConvertEqualsMethodToStaticIntention/description.html Normal file
View File

@@ -0,0 +1,20 @@
<!--
~ Copyright 2000-2014 JetBrains s.r.o.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<html>
<body>
Converts call of <b>java.lang.Object#equals</b> to static <b>java.util.Objects.equals</b>.
</body>
</html>

4
resources/src/META-INF/IdeaPlugin.xml
View File

@@ -835,6 +835,10 @@
<className>com.intellij.codeInsight.intention.impl.ConvertCompareToToEqualsIntention</className>
<category>Java/Control Flow</category>
</intentionAction>
<intentionAction>
<className>com.intellij.codeInsight.intention.impl.ConvertEqualsMethodToStaticIntention</className>
<category>Java/Control Flow</category>
</intentionAction>
<intentionAction>
<className>com.intellij.codeInsight.intention.impl.CreateFieldFromParameterAction</className>