From f41505091360a2f523dc6ac0f2526e9d6c744ab4 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 23 Nov 2016 19:39:55 +0300 Subject: [PATCH] Suppress TOPLEVEL_TYPEALIASES_ONLY in decompiler and stubBuilder tests. --- .../decompiledText/TypeAliases.expected.kt | 7 ++++--- .../decompiledText/TypeAliases/TypeAliases.kt | 3 +++ .../stubBuilder/TypeAliases/TypeAliases.kt | 3 +++ .../stubBuilder/TypeAliases/TypeAliases.txt | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/idea/testData/decompiler/decompiledText/TypeAliases.expected.kt b/idea/testData/decompiler/decompiledText/TypeAliases.expected.kt index 24f2021a23e..439b1adbdf2 100644 --- a/idea/testData/decompiler/decompiledText/TypeAliases.expected.kt +++ b/idea/testData/decompiler/decompiledText/TypeAliases.expected.kt @@ -4,9 +4,10 @@ package test public final class TypeAliases public constructor() { - public final fun foo(a: dependency.A /* = () -> kotlin.Unit */, b: test.TypeAliases.B /* = (dependency.A /* = () -> kotlin.Unit */) -> kotlin.Unit */, ta: test.Outer.Inner.TA /* = kotlin.collections.Map, kotlin.collections.Map> */): kotlin.Unit { /* compiled code */ } + public final fun foo(a: dependency.A /* = () -> kotlin.Unit */, b: test.TypeAliases.B /* = (dependency.A /* = () -> kotlin.Unit */) -> kotlin.Unit */, ta: test.Outer.Inner.TA /* = kotlin.collections.Map, kotlin.collections.Map> */): kotlin.Unit { /* compiled code */ } - public typealias B = (dependency.A) -> kotlin.Unit + @kotlin.Suppress public typealias B = (dependency.A) -> kotlin.Unit - @test.Ann private typealias Parametrized = kotlin.collections.Map + @test.Ann @kotlin.Suppress private typealias Parametrized = kotlin.collections.Map } + diff --git a/idea/testData/decompiler/decompiledText/TypeAliases/TypeAliases.kt b/idea/testData/decompiler/decompiledText/TypeAliases/TypeAliases.kt index 2546636433b..6f0e7ce918d 100644 --- a/idea/testData/decompiler/decompiledText/TypeAliases/TypeAliases.kt +++ b/idea/testData/decompiler/decompiledText/TypeAliases/TypeAliases.kt @@ -5,6 +5,7 @@ import kotlin.annotation.AnnotationTarget class Outer { inner class Inner { + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias TA = Map, Map> } } @@ -14,6 +15,7 @@ annotation class Ann(val value: String) class TypeAliases { + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias B = (A) -> Unit fun foo(a: A, b: B, ta: Outer.Inner.TA) { @@ -21,5 +23,6 @@ class TypeAliases { } @Ann("OK") + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") private typealias Parametrized = Map } diff --git a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.kt b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.kt index 3ea291bd022..75a7612b19e 100644 --- a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.kt +++ b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.kt @@ -5,6 +5,7 @@ import kotlin.annotation.AnnotationTarget class Outer { inner class Inner { + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias TA = Map, Map> } } @@ -14,6 +15,7 @@ annotation class Ann class TypeAliases { + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias B = (A) -> Unit fun foo(a: A, b: B, ta: Outer.Inner.TA) { @@ -21,5 +23,6 @@ class TypeAliases { } @Ann + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") private typealias Parametrized = Map } diff --git a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt index 35ee748d557..00007483989 100644 --- a/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt +++ b/idea/testData/decompiler/stubBuilder/TypeAliases/TypeAliases.txt @@ -69,6 +69,13 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Unit] TYPEALIAS[fqName=test.TypeAliases.B, isTopLevel=false, name=B] MODIFIER_LIST[public] + ANNOTATION_ENTRY[hasValueArguments=false, shortName=Suppress] + CONSTRUCTOR_CALLEE + TYPE_REFERENCE + USER_TYPE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=kotlin] + REFERENCE_EXPRESSION[referencedName=Suppress] TYPE_REFERENCE FUNCTION_TYPE VALUE_PARAMETER_LIST @@ -92,6 +99,13 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Ann] + ANNOTATION_ENTRY[hasValueArguments=false, shortName=Suppress] + CONSTRUCTOR_CALLEE + TYPE_REFERENCE + USER_TYPE + USER_TYPE + REFERENCE_EXPRESSION[referencedName=kotlin] + REFERENCE_EXPRESSION[referencedName=Suppress] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=E] TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=F]