diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 791481fba12..5678e83fd9f 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.serialization.builtins; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; -import kotlin.collections.CollectionsKt; import kotlin.Unit; +import kotlin.collections.CollectionsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.DefaultBuiltIns; @@ -72,7 +72,6 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment { options.setWithDefinedIn(false); options.setOverrideRenderingPolicy(OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE); options.setVerbose(true); - options.setPrettyFunctionTypes(false); options.setModifiers(DescriptorRendererModifier.ALL); return Unit.INSTANCE; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt index e848330ef77..8b272fcdb42 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt @@ -171,7 +171,6 @@ interface DescriptorRendererOptions { var withoutReturnType: Boolean var normalizedVisibilities: Boolean var showInternalKeyword: Boolean - var prettyFunctionTypes: Boolean var uninferredTypeParameterAsName: Boolean var overrideRenderingPolicy: OverrideRenderingPolicy var valueParametersHandler: DescriptorRenderer.ValueParametersHandler diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index f7eaf27cd89..b033023db15 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -203,8 +203,7 @@ internal class DescriptorRendererImpl( } private fun shouldRenderAsPrettyFunctionType(type: KotlinType): Boolean { - return prettyFunctionTypes && KotlinBuiltIns.isExactFunctionOrExtensionFunctionType(type) - && type.arguments.none { it.isStarProjection } + return KotlinBuiltIns.isExactFunctionOrExtensionFunctionType(type) && type.arguments.none { it.isStarProjection } } private fun renderFlexibleType(type: KotlinType): String { diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt index b4e098aa076..f8c27757143 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt @@ -74,7 +74,6 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions { override var withoutReturnType by property(false) override var normalizedVisibilities by property(false) override var showInternalKeyword by property(true) - override var prettyFunctionTypes by property(true) override var uninferredTypeParameterAsName by property(false) override var includePropertyConstant by property(false) override var withoutTypeParameters by property(false)