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

Move utilities using annotations to determine whether PsiClass is kotlin class or package class to DescriptorResolverUtils

Browse Source 
Fix some of the usages
PackageClassUtils uses more precise method name
This commit is contained in:
Pavel V. Talanov
2013-07-16 17:55:56 +04:00
parent 7c49374dab
commit 4fe78e4e7b
11 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+4 -2
View File
@@ -30,7 +30,9 @@ import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.NamespaceCodegen;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetEnumEntry;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.JavaPsiFacadeKotlinHacks;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -85,7 +87,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
findClassesAndObjects(qualifiedName, scope, answer);
if (PackageClassUtils.isPackageClass(qualifiedName)) {
if (PackageClassUtils.isPackageClassFqName(qualifiedName)) {
findPackageClass(qualifiedName.parent(), scope, answer);
}