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

NamespaceCodegen.getNamespacePartInternalName()

Browse Source 
Should be used instead of getMultiFileNamespaceInternalName()
This commit is contained in:
Alexander Udalov
2012-10-22 16:33:32 +04:00
parent e7a7afa0be
commit a8798de8d0
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+9 -1
View File
@@ -286,7 +286,7 @@ public class NamespaceCodegen extends MemberCodegen {
} }
@NotNull @NotNull
public static String getMultiFileNamespaceInternalName(String namespaceInternalName, PsiFile file) { private static String getMultiFileNamespaceInternalName(@NotNull String namespaceInternalName, @NotNull PsiFile file) {
String name = FileUtil.toSystemDependentName(file.getName()); String name = FileUtil.toSystemDependentName(file.getName());
int substringFrom = name.lastIndexOf(File.separator) + 1; int substringFrom = name.lastIndexOf(File.separator) + 1;
@@ -302,4 +302,12 @@ public class NamespaceCodegen extends MemberCodegen {
// 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) + "$" + pathHashCode; return namespaceInternalName + "$src$" + name.substring(substringFrom, substringTo) + "$" + pathHashCode;
} }
@NotNull
public static String getNamespacePartInternalName(@NotNull JetFile file) {
FqName fqName = JetPsiUtil.getFQName(file);
JvmClassName namespaceJvmClassName = NamespaceCodegen.getJVMClassNameForKotlinNs(fqName);
String namespaceInternalName = namespaceJvmClassName.getInternalName();
return NamespaceCodegen.getMultiFileNamespaceInternalName(namespaceInternalName, file);
}
} }
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
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())) {
String packageInternalName = NamespaceCodegen.getJVMClassNameForKotlinNs(packageName).getInternalName(); String packageInternalName = NamespaceCodegen.getJVMClassNameForKotlinNs(packageName).getInternalName();
String multiFileNamespaceInternalName = NamespaceCodegen.getMultiFileNamespaceInternalName(packageInternalName, file); String multiFileNamespaceInternalName = NamespaceCodegen.getNamespacePartInternalName(file);
if (multiFileNamespaceInternalName.equals(internalNameUnsafe) || if (multiFileNamespaceInternalName.equals(internalNameUnsafe) ||
(packageInternalName.equals(internalNameUnsafe) && NamespaceCodegen.shouldGenerateNSClass(Arrays.asList(file)))) { (packageInternalName.equals(internalNameUnsafe) && NamespaceCodegen.shouldGenerateNSClass(Arrays.asList(file)))) {
JetLightClass lightClass = JetLightClass.create(psiManager, file, qualifiedName); JetLightClass lightClass = JetLightClass.create(psiManager, file, qualifiedName);
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+2 -3
View File
@@ -163,12 +163,11 @@ public class JetPositionManager implements PositionManager {
if (result.isNull()) { if (result.isNull()) {
FqName fqName = JetPsiUtil.getFQName(namespace); FqName fqName = JetPsiUtil.getFQName(namespace);
boolean multiFileNamespace = isMultiFileNamespace(typeMapper.getBindingContext(), fqName); boolean multiFileNamespace = isMultiFileNamespace(typeMapper.getBindingContext(), fqName);
String namespaceInternalName = NamespaceCodegen.getJVMClassNameForKotlinNs(fqName).getInternalName();
if (multiFileNamespace) { if (multiFileNamespace) {
result.set(NamespaceCodegen.getMultiFileNamespaceInternalName(namespaceInternalName, namespace)); result.set(NamespaceCodegen.getNamespacePartInternalName(namespace));
} }
else { else {
result.set(namespaceInternalName); result.set(NamespaceCodegen.getJVMClassNameForKotlinNs(fqName).getInternalName());
} }
} }
} }