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

JavaElementFinder now correctly finds namespace$src$ classes

Browse Source 
No new tests added

 #KT-2839 Fixed
This commit is contained in:
Alexander Udalov
2012-10-10 15:45:15 +04:00
parent ef99474379
commit a31b748092
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+3 -1
View File
@@ -296,8 +296,10 @@ public class NamespaceCodegen extends MemberCodegen {
substringTo = name.length(); substringTo = name.length();
} }
int pathHashCode = FileUtil.toSystemDependentName(file.getVirtualFile().getCanonicalPath()).hashCode();
// dollar sign in the end is to prevent synthetic class from having "Test" or other parseable suffix // dollar sign in the end is to prevent synthetic class from having "Test" or other parseable suffix
// path hashCode to prevent same name / different path collision // path hashCode to prevent same name / different path collision
return namespaceInternalName + "$src$" + name.substring(substringFrom, substringTo) + "$" + file.getVirtualFile().getCanonicalPath().hashCode(); return namespaceInternalName + "$src$" + name.substring(substringFrom, substringTo) + "$" + pathHashCode;
} }
} }
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+9 -2
View File
@@ -109,6 +109,11 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
FqName qualifiedName = new FqName(qualifiedNameString); FqName qualifiedName = new FqName(qualifiedNameString);
// qualifiedNameString's format can be "pkg.subpkg.Class$Inner$Inner" (e.g. from com.intellij.execution.filters.ExceptionWorker),
// which is neither a fully qualified name, nor an internal name. If we can, we should construct an internal name from it to handle
// 'namespace$src$...' queries more accurately. It's not a real internal name though, so it's not supposed to be used anywhere else
String internalNameUnsafe = qualifiedNameString.replace('.', '/');
// Backend searches for java.lang.String. Will fail with SOE if continue // Backend searches for java.lang.String. Will fail with SOE if continue
if (qualifiedName.getFqName().startsWith("java.")) return PsiClass.EMPTY_ARRAY; if (qualifiedName.getFqName().startsWith("java.")) return PsiClass.EMPTY_ARRAY;
@@ -117,8 +122,10 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
for (JetFile file : filesInScope) { for (JetFile file : filesInScope) {
final FqName packageName = JetPsiUtil.getFQName(file); final FqName packageName = JetPsiUtil.getFQName(file);
if (packageName != null && qualifiedName.getFqName().startsWith(packageName.getFqName())) { if (packageName != null && qualifiedName.getFqName().startsWith(packageName.getFqName())) {
if (qualifiedName.equals(QualifiedNamesUtil.combine(packageName, Name.identifier(JvmAbi.PACKAGE_CLASS))) && String packageInternalName = NamespaceCodegen.getJVMClassNameForKotlinNs(packageName).getInternalName();
NamespaceCodegen.shouldGenerateNSClass(Arrays.asList(file))) { String multiFileNamespaceInternalName = NamespaceCodegen.getMultiFileNamespaceInternalName(packageInternalName, file);
if (multiFileNamespaceInternalName.equals(internalNameUnsafe) ||
(packageInternalName.equals(internalNameUnsafe) && NamespaceCodegen.shouldGenerateNSClass(Arrays.asList(file)))) {
JetLightClass lightClass = JetLightClass.create(psiManager, file, qualifiedName); JetLightClass lightClass = JetLightClass.create(psiManager, file, qualifiedName);
if (lightClass != null) { if (lightClass != null) {
answer.add(lightClass); answer.add(lightClass);