diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index cccc854575a..51abcefecc2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -156,9 +156,6 @@ public class DescriptorRendererImpl implements Renderer { else if (KotlinBuiltIns.getInstance().isUnit(type)) { return escape(KotlinBuiltIns.UNIT_ALIAS + (type.isNullable() ? "?" : "")); } - else if (KotlinBuiltIns.getInstance().isTupleType(type)) { - return escape(renderTupleType(type, shortNamesOnly)); - } else if (KotlinBuiltIns.getInstance().isFunctionType(type)) { return escape(renderFunctionType(type, shortNamesOnly)); } @@ -212,15 +209,6 @@ public class DescriptorRendererImpl implements Renderer { } } - private void appendTypes(StringBuilder result, List types, boolean shortNamesOnly) { - for (Iterator iterator = types.iterator(); iterator.hasNext(); ) { - result.append(renderType(iterator.next(), shortNamesOnly)); - if (iterator.hasNext()) { - result.append(", "); - } - } - } - private void appendTypeProjections(StringBuilder result, List typeProjections, boolean shortNamesOnly) { for (Iterator iterator = typeProjections.iterator(); iterator.hasNext(); ) { TypeProjection typeProjection = iterator.next(); @@ -234,18 +222,6 @@ public class DescriptorRendererImpl implements Renderer { } } - protected String renderTupleType(JetType type, boolean shortNamesOnly) { - StringBuilder sb = new StringBuilder("#("); - appendTypes(sb, KotlinBuiltIns.getInstance().getTupleElementTypes(type), shortNamesOnly); - sb.append(")"); - - if (type.isNullable()) { - sb.append("?"); - } - - return sb.toString(); - } - private String renderFunctionType(JetType type, boolean shortNamesOnly) { StringBuilder sb = new StringBuilder(); diff --git a/compiler/testData/renderer/FunctionTypes.kt b/compiler/testData/renderer/FunctionTypes.kt index 9cb510a4e36..86960131640 100644 --- a/compiler/testData/renderer/FunctionTypes.kt +++ b/compiler/testData/renderer/FunctionTypes.kt @@ -1,8 +1,8 @@ var v1 : () -> Tuple0 var v2 : (Int) -> Int -var v3 : (Int, #(String, String)) -> String +var v3 : (Int, String) -> String var v4 : Function1 -var v4 : (() -> Int, (#(String, String)) -> Tuple0) -> String +var v4 : (() -> Int, (String) -> Tuple0) -> String var v5 : Int.() -> Int var v6 : Int.(String, Int) -> Unit var v7 : ExtensionFunction1 @@ -10,9 +10,9 @@ var v7 : ExtensionFunction1 //internal final var v1 : () -> Unit defined in root package //internal final var v2 : (jet.Int) -> jet.Int defined in root package -//internal final var v3 : (jet.Int, #(jet.String, jet.String)) -> jet.String defined in root package +//internal final var v3 : (jet.Int, jet.String) -> jet.String defined in root package //internal final var v4 : (jet.Int) -> jet.String defined in root package -//internal final var v4 : (() -> jet.Int, (#(jet.String, jet.String)) -> Unit) -> jet.String defined in root package +//internal final var v4 : (() -> jet.Int, (jet.String) -> Unit) -> jet.String defined in root package //internal final var v5 : jet.Int.() -> jet.Int defined in root package //internal final var v6 : jet.Int.(jet.String, jet.Int) -> Unit defined in root package //internal final var v7 : jet.Int.(jet.String) -> jet.Boolean defined in root package