MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

hide lambda suggestion if method of functional interface is generics (IDEA-141214)

Browse Source
This commit is contained in:
Anna Kozlova
2015-06-09 20:31:15 +03:00
parent a43e92b0f0
commit 2f9e7a7f99
3 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
+32 -29
View File
@@ -64,42 +64,45 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
final PsiType functionalInterfaceType = FunctionalInterfaceParameterizationUtil.getGroundTargetType(defaultType);
final PsiMethod functionalInterfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(functionalInterfaceType);
if (functionalInterfaceMethod != null) {
PsiParameter[] params = functionalInterfaceMethod.getParameterList().getParameters();
final Project project = functionalInterfaceMethod.getProject();
PsiParameter[] params = new PsiParameter[0];
final PsiElement originalPosition = parameters.getPosition();
final JVMElementFactory jvmElementFactory = JVMElementFactories.getFactory(originalPosition.getLanguage(), project);
final JavaCodeStyleManager javaCodeStyleManager = JavaCodeStyleManager.getInstance(project);
final PsiSubstitutor substitutor = LambdaUtil.getSubstitutor(functionalInterfaceMethod, PsiUtil.resolveGenericsClassInType(functionalInterfaceType));
if (jvmElementFactory != null) {
params = GenerateMembersUtil.overriddenParameters(params, jvmElementFactory, javaCodeStyleManager, substitutor, originalPosition);
}
String paramsString =
params.length == 1 ? getParamName(params[0], javaCodeStyleManager, originalPosition) : "(" + StringUtil.join(params, new Function<PsiParameter, String>() {
@Override
public String fun(PsiParameter parameter) {
return getParamName(parameter, javaCodeStyleManager, originalPosition);
if (!functionalInterfaceMethod.hasTypeParameters()) {
params = functionalInterfaceMethod.getParameterList().getParameters();
final Project project = functionalInterfaceMethod.getProject();
final JVMElementFactory jvmElementFactory = JVMElementFactories.getFactory(originalPosition.getLanguage(), project);
final JavaCodeStyleManager javaCodeStyleManager = JavaCodeStyleManager.getInstance(project);
if (jvmElementFactory != null) {
params = GenerateMembersUtil.overriddenParameters(params, jvmElementFactory, javaCodeStyleManager, substitutor, originalPosition);
}
}, ",") + ")";
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)JavaPsiFacade.getElementFactory(project)
.createExpressionFromText(paramsString + " -> {}", null);
lambdaExpression = (PsiLambdaExpression)codeStyleManager.reformat(lambdaExpression);
paramsString = lambdaExpression.getParameterList().getText();
final LookupElementBuilder builder =
LookupElementBuilder.create(functionalInterfaceMethod, paramsString).withPresentableText(paramsString + " -> {}").withInsertHandler(new InsertHandler<LookupElement>() {
String paramsString =
params.length == 1 ? getParamName(params[0], javaCodeStyleManager, originalPosition) : "(" + StringUtil.join(params, new Function<PsiParameter, String>() {
@Override
public void handleInsert(InsertionContext context, LookupElement item) {
final Editor editor = context.getEditor();
EditorModificationUtil.insertStringAtCaret(editor, " -> ");
public String fun(PsiParameter parameter) {
return getParamName(parameter, javaCodeStyleManager, originalPosition);
}
}).withIcon(AllIcons.Nodes.AnonymousClass);
LookupElement lambdaElement = builder.withAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE);
if (prioritize) {
lambdaElement = PrioritizedLookupElement.withPriority(lambdaElement, 1);
}, ",") + ")";
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
PsiLambdaExpression lambdaExpression = (PsiLambdaExpression)JavaPsiFacade.getElementFactory(project)
.createExpressionFromText(paramsString + " -> {}", null);
lambdaExpression = (PsiLambdaExpression)codeStyleManager.reformat(lambdaExpression);
paramsString = lambdaExpression.getParameterList().getText();
final LookupElementBuilder builder =
LookupElementBuilder.create(functionalInterfaceMethod, paramsString).withPresentableText(paramsString + " -> {}").withInsertHandler(new InsertHandler<LookupElement>() {
@Override
public void handleInsert(InsertionContext context, LookupElement item) {
final Editor editor = context.getEditor();
EditorModificationUtil.insertStringAtCaret(editor, " -> ");
}
}).withIcon(AllIcons.Nodes.AnonymousClass);
LookupElement lambdaElement = builder.withAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE);
if (prioritize) {
lambdaElement = PrioritizedLookupElement.withPriority(lambdaElement, 1);
}
result.add(lambdaElement);
}
result.add(lambdaElement);
if (params.length == 1) {
final PsiType expectedReturnType = substitutor.substitute(functionalInterfaceMethod.getReturnType());
java/java-tests/testData/codeInsight/completion/smartType/NoLambdaSuggestionForGenericsFunctionalInterfaceMethod.java
+10
View File
@@ -0,0 +1,10 @@
class Test {
@FunctionalInterface
interface GenericOperation {
<R> R get(R value);
}
public static GenericOperation build() {
return <caret>
}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java
+5
View File
@@ -127,6 +127,11 @@ public class SmartType18CompletionTest extends LightFixtureCompletionTestCase {
doTest(true);
}
public void testNoLambdaSuggestionForGenericsFunctionalInterfaceMethod() throws Exception {
configureByFile("/" + getTestName(false) + ".java");
assertEmpty(myItems);
}
private void doTest() {
doTest(true);
}