Minor, drop DescriptorRendererOptions#prettyFunctionTypes

This commit is contained in:
Alexander Udalov
2016-01-21 22:14:25 +03:00
parent 9e8b6571f4
commit 18238bd6f3
4 changed files with 2 additions and 6 deletions
@@ -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;
}
@@ -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
@@ -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 {
@@ -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)