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

EA-34998 Check qualified name from external before creating instance of FqName

Browse Source
This commit is contained in:
Nikolay Krasko
2012-03-22 17:46:18 +04:00
parent b46bb17377
commit 0cd839f044
3 changed files with 28 additions and 2 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
+8
View File
@@ -83,6 +83,10 @@ public class JavaElementFinder extends PsiElementFinder {
@NotNull
@Override
public PsiClass[] findClasses(@NotNull String qualifiedNameString, @NotNull GlobalSearchScope scope) {
if (!FqName.isValid(qualifiedNameString)) {
return PsiClass.EMPTY_ARRAY;
}
FqName qualifiedName = new FqName(qualifiedNameString);
// Backend searches for java.lang.String. Will fail with SOE if continue
@@ -159,6 +163,10 @@ public class JavaElementFinder extends PsiElementFinder {
@Override
public PsiPackage findPackage(@NotNull String qualifiedNameString) {
if (!FqName.isValid(qualifiedNameString)) {
return null;
}
FqName fqName = new FqName(qualifiedNameString);
final List<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project));