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

java 8: anonymous class fields could be available later in next lambdas (IDEA-123731)

Browse Source
This commit is contained in:
Anna Kozlova
2014-04-09 17:41:34 +02:00
parent 258af30a8d
commit 6d7cfc99c2
3 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
View File

@@ -544,7 +544,8 @@ public class PsiImplUtil {
PsiClass aClass = member.getContainingClass();
if (aClass instanceof PsiAnonymousClass) {
//member from anonymous class can be called from outside the class
PsiElement methodCallExpr = PsiTreeUtil.getParentOfType(aClass, PsiMethodCallExpression.class);
PsiElement methodCallExpr = PsiUtil.isLanguageLevel8OrHigher(aClass) ? PsiTreeUtil.getParentOfType(aClass, PsiMember.class)
: PsiTreeUtil.getParentOfType(aClass, PsiMethodCallExpression.class);
return new LocalSearchScope(methodCallExpr != null ? methodCallExpr : aClass);
}

21
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/findUsages/FieldFromAnonymousClassScope.java Normal file
View File

@@ -0,0 +1,21 @@
import java.util.Collection;
import java.util.Map;
class Test{
public static void main(String[] args) {
Map<String, Collection<Integer>> myMap = null;
myMap.entrySet().stream()
.flatMap(entry -> entry.getValue().stream()
.map(val -> new Object() {
String key = entry.getKey();
Integer va<caret>lue = val;
}))
.forEachOrdered(o -> {
final String key = o.key;
final Integer value = o.value;
System.out.println("key: " + key + " value: " + value);
});
}
}

26
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FindFunctionalInterfaceTest.java
View File

@@ -16,12 +16,13 @@
package com.intellij.codeInsight.daemon.lambda;
import com.intellij.JavaTestUtil;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFunctionalExpression;
import com.intellij.psi.*;
import com.intellij.psi.search.searches.FunctionalExpressionSearch;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
@@ -39,8 +40,27 @@ public class FindFunctionalInterfaceTest extends LightCodeInsightFixtureTestCase
assertEquals("() -> {}", next.getText());
}
public void testFieldFromAnonymousClassScope() throws Exception {
myFixture.configureByFile(getTestName(false) + ".java");
final PsiElement elementAtCaret = myFixture.getElementAtCaret();
assertNotNull(elementAtCaret);
final PsiField field = PsiTreeUtil.getParentOfType(elementAtCaret, PsiField.class, false);
assertNotNull(field);
final PsiClass aClass = field.getContainingClass();
assertTrue(aClass instanceof PsiAnonymousClass);
final Collection<PsiReference> references = ReferencesSearch.search(field).findAll();
assertFalse(references.isEmpty());
assertEquals(1, references.size());
}
@Override
protected String getBasePath() {
return JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/daemonCodeAnalyzer/lambda/findUsages/";
}
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_8;
}
}