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

method refs: do not insert ; in calls/exprs (IDEA-92713)

Browse Source
This commit is contained in:
anna
2012-10-11 20:56:02 +02:00
parent 53e2791720
commit b8fb9f7f36
5 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
View File

@@ -792,7 +792,9 @@ public class JavaCompletionUtil {
boolean insertAdditionalSemicolon = true;
final PsiReferenceExpression referenceExpression = PsiTreeUtil.getTopmostParentOfType(context.getFile().findElementAt(context.getStartOffset()), PsiReferenceExpression.class);
if (referenceExpression != null) {
if (referenceExpression instanceof PsiMethodReferenceExpression && LambdaUtil.insertSemicolon(referenceExpression.getParent())) {
insertAdditionalSemicolon = false;
} else if (referenceExpression != null) {
PsiElement parent = referenceExpression.getParent();
if (parent instanceof PsiMethodCallExpression) {
parent = parent.getParent();

7
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
View File

@@ -566,13 +566,16 @@ public class LambdaUtil {
if (lambdaExpression.getBody() instanceof PsiCodeBlock) {
return true;
}
final PsiElement parent = lambdaExpression.getParent();
if (parent instanceof PsiExpressionList || parent instanceof PsiExpression) {
if (insertSemicolon(lambdaExpression.getParent())) {
return false;
}
return true;
}
public static boolean insertSemicolon(PsiElement parent) {
return parent instanceof PsiExpressionList || parent instanceof PsiExpression;
}
public static boolean isValidQualifier(PsiMethodReferenceExpression expression) {
final PsiElement referenceNameElement = expression.getReferenceNameElement();
if (referenceNameElement instanceof PsiKeyword) {

9
java/java-tests/testData/codeInsight/completion/normal/MethodReferenceCallContext.java Normal file
View File

@@ -0,0 +1,9 @@
import java.util.*;
class Test {
void aaa(Test p) { return 1; }
void test() {
c(Test::<caret>);
}
void c(Comparator<Test> c){}
}

9
java/java-tests/testData/codeInsight/completion/normal/MethodReferenceCallContext_after.java Normal file
View File

@@ -0,0 +1,9 @@
import java.util.*;
class Test {
void aaa(Test p) { return 1; }
void test() {
c(Test::c);
}
void c(Comparator<Test> c){}
}

1
java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal17CompletionTest.groovy
View File

@@ -40,6 +40,7 @@ public class Normal17CompletionTest extends LightFixtureCompletionTestCase {
public void testOnlyResourcesInResourceList4() { doTest() }
public void testMethodReferenceNoStatic() { doTest() }
public void testMethodReferenceCallContext() { doTest() }
public void testResourceParentInResourceList() {
configureByFile(getTestName(false) + ".java")