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

IDEA-166827 Quick-fix to insert SAM-method call

Browse Source
This commit is contained in:
Tagir Valeev
2017-01-23 12:55:51 +07:00
parent 05a7c64272
commit 8f904a0d06
14 changed files with 197 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -283,4 +283,7 @@ public abstract class QuickFixFactory {
@NotNull
public abstract IntentionAction createCollectionToArrayFix(@NotNull PsiExpression collectionExpression, @NotNull PsiArrayType arrayType);
@NotNull
public abstract IntentionAction createInsertMethodCallFix(@NotNull PsiMethodCallExpression call, PsiMethod method);
}

8
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -449,6 +449,12 @@ public class HighlightMethodUtil {
QuickFixAction.registerQuickFixAction(highlightInfo, range, QUICK_FIX_FACTORY.createCreateMethodFromUsageFix(methodCall));
QuickFixAction.registerQuickFixAction(highlightInfo, range, QUICK_FIX_FACTORY.createCreateAbstractMethodFromUsageFix(methodCall));
QuickFixAction.registerQuickFixAction(highlightInfo, range, QUICK_FIX_FACTORY.createCreatePropertyFromUsageFix(methodCall));
if (resolved instanceof PsiVariable && languageLevel.isAtLeast(LanguageLevel.JDK_1_8)) {
PsiMethod method = LambdaUtil.getFunctionalInterfaceMethod(((PsiVariable)resolved).getType());
if (method != null) {
QuickFixAction.registerQuickFixAction(highlightInfo, range, QUICK_FIX_FACTORY.createInsertMethodCallFix(methodCall, method));
}
}
}
}
}

8
java/java-analysis-impl/src/com/intellij/codeInsight/intention/EmptyQuickFixFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -649,4 +649,10 @@ public class EmptyQuickFixFactory extends QuickFixFactory {
public IntentionAction createCollectionToArrayFix(@NotNull PsiExpression collectionExpression, @NotNull PsiArrayType arrayType) {
return QuickFixes.EMPTY_FIX;
}
@NotNull
@Override
public IntentionAction createInsertMethodCallFix(@NotNull PsiMethodCallExpression call, PsiMethod method) {
return QuickFixes.EMPTY_FIX;
}
}

68
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMethodCallFix.java Normal file
View File

@@ -0,0 +1,68 @@
/*
* Copyright 2000-2017 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.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.intention.LowPriorityAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
public class InsertMethodCallFix implements IntentionAction, LowPriorityAction {
private final PsiMethodCallExpression myCall;
private final String myMethodName;
public InsertMethodCallFix(PsiMethodCallExpression call, PsiMethod method) {
myCall = call;
myMethodName = method.getName();
}
@Nls
@NotNull
@Override
public String getText() {
return QuickFixBundle.message("insert.sam.method.call.fix.name", myMethodName);
}
@Nls
@NotNull
@Override
public String getFamilyName() {
return QuickFixBundle.message("insert.sam.method.call.fix.family.name");
}
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
return myCall.isValid() && PsiManager.getInstance(project).isInProject(myCall);
}
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiExpression methodExpression = myCall.getMethodExpression();
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
String replacement = methodExpression.getText() + "." + myMethodName;
methodExpression.replace(factory.createExpressionFromText(replacement, methodExpression));
}
@Override
public boolean startInWriteAction() {
return true;
}
}

8
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -831,4 +831,10 @@ public class QuickFixFactoryImpl extends QuickFixFactory {
public IntentionAction createCollectionToArrayFix(@NotNull PsiExpression collectionExpression, @NotNull PsiArrayType arrayType) {
return new ConvertCollectionToArrayFix(collectionExpression, arrayType);
}
@NotNull
@Override
public IntentionAction createInsertMethodCallFix(@NotNull PsiMethodCallExpression call, PsiMethod method) {
return new InsertMethodCallFix(call, method);
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall/afterCustomFunctionalInterface.java Normal file
View File

@@ -0,0 +1,10 @@
// "Insert '.doSomething' to call functional interface method" "true"
public class Test {
interface MyFn {
void doSomething(String s, int i);
}
public void test(MyFn fn) {
fn.doSomething();
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall/afterFunction.java Normal file
View File

@@ -0,0 +1,8 @@
// "Insert '.apply' to call functional interface method" "true"
import java.util.function.Function;
public class Test {
public void test(Function<String, String> fn) {
String res = fn.apply("foo");
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall/afterPredicate.java Normal file
View File

@@ -0,0 +1,11 @@
// "Insert '.test' to call functional interface method" "true"
import java.util.function.Function;
import java.util.function.Predicate;
public class Test {
public void test(Predicate<String> predicate) {
if(predicate.test("foo")) {
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall/beforeCustomFunctionalInterface.java Normal file
View File

@@ -0,0 +1,10 @@
// "Insert '.doSomething' to call functional interface method" "true"
public class Test {
interface MyFn {
void doSomething(String s, int i);
}
public void test(MyFn fn) {
fn(<caret>);
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall/beforeFunction.java Normal file
View File

@@ -0,0 +1,8 @@
// "Insert '.apply' to call functional interface method" "true"
import java.util.function.Function;
public class Test {
public void test(Function<String, String> fn) {
String res = f<caret>n("foo");
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall/beforeNonFunctionalInterface.java Normal file
View File

@@ -0,0 +1,11 @@
// "Insert '.doSomething' to call functional interface method" "false"
public class Test {
interface MyFn {
void doSomething(String s, int i);
void doSomething();
}
public void test(MyFn fn) {
fn(<caret>);
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall/beforePredicate.java Normal file
View File

@@ -0,0 +1,11 @@
// "Insert '.test' to call functional interface method" "true"
import java.util.function.Function;
import java.util.function.Predicate;
public class Test {
public void test(Predicate<String> predicate) {
if(predi<caret>cate("foo")) {
}
}
}

31
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertMethodCallFixTest.java Normal file
View File

@@ -0,0 +1,31 @@
/*
* Copyright 2000-2017 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.daemon.quickFix;
/**
* @author Pavel.Dolgov
*/
public class InsertMethodCallFixTest extends LightQuickFixParameterizedTestCase {
public void test() throws Exception {
doAllTests();
}
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/insertSamMethodCall";
}
}

5
resources-en/src/messages/QuickFixBundle.properties
View File

@@ -301,4 +301,7 @@ module.info.add.requires.family.name=Add 'requires' statement to module-info.jav
module.info.add.requires.name=Add ''requires {0}'' statement to module-info.java
collection.to.array.text=Apply conversion ''.toArray({0})''
collection.to.array.family.name=Apply conversion '.toArray()'
collection.to.array.family.name=Apply conversion '.toArray()'
insert.sam.method.call.fix.name=Insert ''.{0}'' to call functional interface method
insert.sam.method.call.fix.family.name=Insert single abstract method call