MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

diamonds: fix parent hunting inside anonymous class (IDEA-259666)

Browse Source 
GitOrigin-RevId: 51f47646dbe68e9182b75e3058b0d1216ada92e6
This commit is contained in:
Anna Kozlova
2021-01-18 10:13:11 +01:00
committed by intellij-monorepo-bot
parent 328c05d165
commit 0a73a79b70
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -741,9 +741,9 @@ public final class LambdaUtil {
break;
}
final PsiCall psiCall = PsiTreeUtil.getParentOfType(parent, PsiCall.class, false, PsiMember.class, PsiVariable.class,
final PsiCall psiCall = PsiTreeUtil.getParentOfType(parent, PsiCall.class, false, PsiVariable.class, PsiMethod.class,
PsiAssignmentExpression.class, PsiTypeCastExpression.class);
if (psiCall == null) {
if (psiCall == null || !PsiTreeUtil.isAncestor(psiCall.getArgumentList(), parent, false)) {
break;
}
if (MethodCandidateInfo.isOverloadCheck(psiCall.getArgumentList()) ||

7
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/diamond/NestedDiamondsAnonymousCase.java Normal file
View File

@@ -0,0 +1,7 @@
import java.util.*;
class MyTest {
private static <K, V> HashMap<K, V> createMultiMap(boolean identityKeys) {
return new HashMap<>(identityKeys ? new HashMap<>() : Collections.emptyMap()) {};
}
}

2
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/Diamond8HighlightingTest.java
View File

@@ -111,6 +111,8 @@ public class Diamond8HighlightingTest extends LightDaemonAnalyzerTestCase {
public void testNestedDiamondsInsideAssignmentInMethodsCall() { doTest();}
public void testNestedDiamondsAnonymousCase() { doTest();}
private void doTest() {
doTest(BASE_PATH + "/" + getTestName(false) + ".java", false, false);
}