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

Proper checking for a qualified name

Browse Source 
When i18n plugin is enabled, it looks for classes like "java.lang.Object...)" while highlighting annotations.xml

EA-43709 - IAE: NameUtils.requireIdentifier
This commit is contained in:
Andrey Breslav
2013-03-30 17:20:42 +04:00
parent 4c3f8ff633
commit d42a9f37a3
5 changed files with 59 additions and 11 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
+3 -2
View File
@@ -35,6 +35,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaPsiFacadeKotlinHacks;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import java.util.Collection;
import java.util.List;
@@ -77,7 +78,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
@NotNull
@Override
public PsiClass[] findClasses(@NotNull String qualifiedNameString, @NotNull GlobalSearchScope scope) {
if (!FqName.isValid(qualifiedNameString)) {
if (!QualifiedNamesUtil.isValidJavaFqName(qualifiedNameString)) {
return PsiClass.EMPTY_ARRAY;
}
@@ -162,7 +163,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
@Override
public PsiPackage findPackage(@NotNull String qualifiedNameString) {
if (!FqName.isValid(qualifiedNameString)) {
if (!QualifiedNamesUtil.isValidJavaFqName(qualifiedNameString)) {
return null;
}