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

Replacing usages of DescriptorRenderer.renderName/renderFqName

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-05 18:02:09 +03:00
parent acdf6b2821
commit fcf613cf03
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt
+2 -2
View File
@@ -24,14 +24,14 @@ import org.jetbrains.kotlin.name.FqNameBase
import org.jetbrains.kotlin.name.Name
public fun qualifiedNameForSourceCode(descriptor: ClassifierDescriptor): String {
val nameString = DescriptorRenderer.COMPACT.renderName(descriptor.getName())
val nameString = descriptor.getName().render()
val qualifier = qualifierName(descriptor.getContainingDeclaration())
return if (qualifier != null && qualifier != "") qualifier + "." + nameString else nameString
}
private fun qualifierName(descriptor: DeclarationDescriptor): String? = when (descriptor) {
is ClassDescriptor -> qualifiedNameForSourceCode(descriptor)
is PackageFragmentDescriptor -> DescriptorRenderer.COMPACT.renderFqName(descriptor.fqName)
is PackageFragmentDescriptor -> descriptor.fqName.render()
else -> null
}
core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.java
+2 -2
View File
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.renderer.DescriptorRenderer;
import org.jetbrains.kotlin.renderer.RendererPackage;
public final class ImportPath {
private final @NotNull FqName fqName;
@@ -51,7 +51,7 @@ public final class ImportPath {
}
public String getPathStr() {
return DescriptorRenderer.FQ_NAMES_IN_TYPES.renderFqName(fqName) + (isAllUnder ? ".*" : "");
return RendererPackage.render(fqName) + (isAllUnder ? ".*" : "");
}
@Override