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

Copy to interface just companion object public const properties

Browse Source
This commit is contained in:
Michael Bogdanov
2015-10-07 18:02:02 +03:00
parent a9aa2bc147
commit 12afbffb09
33 changed files with 111 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt
+12 -12
View File
@@ -26,36 +26,36 @@ import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.TypeConstructor
import org.jetbrains.kotlin.types.TypeProjection
public interface DescriptorRenderer : Renderer<DeclarationDescriptor> {
public abstract class DescriptorRenderer : Renderer<DeclarationDescriptor> {
public fun withOptions(changeOptions: DescriptorRendererOptions.() -> Unit): DescriptorRenderer {
val options = (this as DescriptorRendererImpl).options.copy()
options.changeOptions()
options.lock()
return DescriptorRendererImpl(options)
}
public fun renderType(type: JetType): String
public fun renderTypeArguments(typeArguments: List<TypeProjection>): String
public abstract fun renderType(type: JetType): String
public fun renderTypeProjection(typeProjection: TypeProjection): String
public abstract fun renderTypeArguments(typeArguments: List<TypeProjection>): String
public fun renderTypeConstructor(typeConstructor: TypeConstructor): String
public abstract fun renderTypeProjection(typeProjection: TypeProjection): String
public fun renderClassifierName(klass: ClassifierDescriptor): String
public abstract fun renderTypeConstructor(typeConstructor: TypeConstructor): String
public fun renderAnnotation(annotation: AnnotationDescriptor, target: AnnotationUseSiteTarget? = null): String
public abstract fun renderClassifierName(klass: ClassifierDescriptor): String
override fun render(declarationDescriptor: DeclarationDescriptor): String
public abstract fun renderAnnotation(annotation: AnnotationDescriptor, target: AnnotationUseSiteTarget? = null): String
public fun renderValueParameters(parameters: Collection<ValueParameterDescriptor>, synthesizedParameterNames: Boolean): String
override abstract fun render(declarationDescriptor: DeclarationDescriptor): String
public abstract fun renderValueParameters(parameters: Collection<ValueParameterDescriptor>, synthesizedParameterNames: Boolean): String
public fun renderFunctionParameters(functionDescriptor: FunctionDescriptor): String
= renderValueParameters(functionDescriptor.valueParameters, functionDescriptor.hasSynthesizedParameterNames())
public fun renderName(name: Name): String
public abstract fun renderName(name: Name): String
public fun renderFqName(fqName: FqNameBase): String
public abstract fun renderFqName(fqName: FqNameBase): String
public interface ValueParametersHandler {
public fun appendBeforeValueParameters(parameterCount: Int, builder: StringBuilder)
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+1 -1
View File
@@ -40,7 +40,7 @@ import java.util.*
internal class DescriptorRendererImpl(
val options: DescriptorRendererOptionsImpl
) : DescriptorRenderer, DescriptorRendererOptions by options/* this gives access to options without qualifier */ {
) : DescriptorRenderer(), DescriptorRendererOptions by options/* this gives access to options without qualifier */ {
init {
assert(options.isLocked)
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+1 -1
View File
@@ -306,7 +306,7 @@ public class DescriptorUtils {
}
public static boolean isInterfaceCompanionObject(@NotNull DeclarationDescriptor descriptor) {
return isCompanionObject(descriptor) && isKindOf(descriptor.getContainingDeclaration(), ClassKind.INTERFACE);
return isCompanionObject(descriptor) && isInterface(descriptor.getContainingDeclaration());
}
public static boolean isObject(@NotNull DeclarationDescriptor descriptor) {