azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Class object members supported in PsiCodegenPredictor

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-10 19:00:38 +04:00
parent 9d9580d4af
commit b039c69952
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java
+20 -4
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiCompiledElement;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.impl.java.stubs.PsiClassStub;
import com.intellij.psi.search.GlobalSearchScope;
@@ -129,11 +130,26 @@ public class LightClassUtil {
}
Project project = function.getProject();
JvmClassName jvmClassName = PsiCodegenPredictor.getPredefinedJvmClassNameForFun(function);
if (jvmClassName == null) return null;
String fqName = jvmClassName.getFqName().getFqName();
PsiClass psiClass = JavaElementFinder.getInstance(project).findClass(fqName, GlobalSearchScope.allScope(project));
PsiElement parent = function.getParent();
PsiClass psiClass;
if (parent == function.getContainingFile()) {
// top-level function
JvmClassName jvmClassName = PsiCodegenPredictor.getPredefinedJvmClassName((JetFile) parent, true);
if (jvmClassName == null) return null;
String fqName = jvmClassName.getFqName().getFqName();
psiClass = JavaElementFinder.getInstance(project).findClass(fqName, GlobalSearchScope.allScope(project));
}
else {
if (!(parent instanceof JetClassBody)) return null;
assert parent.getParent() instanceof JetClassOrObject;
// function in a class
JetClassOrObject classOrObject = (JetClassOrObject) parent.getParent();
psiClass = createLightClass(classOrObject);
}
if (psiClass == null) return null;
for (PsiMethod method : psiClass.getMethods()) {