From 0a5bbc009619cf5dec8c0a9e614efb6426ab82f7 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 29 Nov 2021 15:11:20 +0100 Subject: [PATCH] Analysis API: update rendering testdata after changing renderer --- .../renderDeclaration/F.rendered | 2 + .../NestedOfAliasedType.rendered | 7 ++- .../NestedSuperType.rendered | 10 ++-- .../annotation.descriptors.rendered | 41 ++++++++----- .../renderDeclaration/annotation.rendered | 41 ++++++++----- .../renderDeclaration/complexTypes.rendered | 6 +- .../constructorInObject.descriptors.rendered | 16 +++++ .../constructorInObject.rendered | 14 ++--- .../constructorOfAnonymousObject.rendered | 12 ++-- .../renderDeclaration/delegates.rendered | 14 +++-- .../renderDeclaration/derivedClass.rendered | 10 +++- .../emptyAnonymousObject.rendered | 5 +- .../renderDeclaration/enums.rendered | 60 +++++++++++-------- .../renderDeclaration/enums2.rendered | 17 ++++-- .../renderDeclaration/expectActual.rendered | 6 ++ .../renderDeclaration/functionTypes.rendered | 3 + .../genericFunctions.rendered | 5 +- .../genericProperty.rendered | 3 +- .../intersectionType.rendered | 1 + .../renderDeclaration/nestedClass.rendered | 16 +++-- .../noPrimaryConstructor.rendered | 9 ++- .../renderDeclaration/simpleClass.rendered | 21 ++++--- .../renderDeclaration/simpleFun.rendered | 2 + .../simpleTypeAlias.rendered | 3 + .../typeAliasWithGeneric.rendered | 4 ++ .../typeParameterVsNested.rendered | 19 ++++-- .../renderDeclaration/typeParameters.rendered | 15 +++-- .../types/annotaionOnTypes.rendered | 14 +++-- ...taionOnTypesWithComplexExpression.rendered | 10 +++- .../vararg.descriptors.rendered | 6 +- .../renderDeclaration/vararg.rendered | 6 +- .../where.descriptors.rendered | 3 + .../renderDeclaration/where.rendered | 3 + 33 files changed, 275 insertions(+), 129 deletions(-) create mode 100644 analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered index 6e85fb139fa..cee975bc330 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered @@ -1,2 +1,4 @@ open class A + class B : A + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered index 9655f77c71f..62f2e402548 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered @@ -1,7 +1,10 @@ abstract class A { - abstract class Nested + abstract class Nested } + typealias TA = A + class B : TA { - class NestedInB : A.Nested + class NestedInB : A.Nested } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.rendered index ece7a0815a7..fafb6e8cb4a 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.rendered @@ -1,8 +1,10 @@ abstract class My { - abstract class NestedOne : My { - abstract class NestedTwo : My.NestedOne - } + abstract class NestedOne : My { + abstract class NestedTwo : My.NestedOne + } } + class Your : My { - class NestedThree : My.NestedOne + class NestedThree : My.NestedOne } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.descriptors.rendered index 86c9f02d2f5..8a797569c52 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.descriptors.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.descriptors.rendered @@ -1,16 +1,29 @@ -@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS]) annotation class base -@base annotation class derived -@base class correct { - constructor(x: Int) - @base constructor() - @base val x: Int +@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS]) +annotation class base + +@base +annotation class derived + +@base +class correct { + constructor(x: Int) + + @base + constructor() + + @base + val x: Int } -@base enum class My { - FIRST, - SECOND, + +@base +enum class My { + FIRST, + SECOND } -@base fun foo(@base y: @base Int): Int { - @base fun bar(@base z: @base Int): Int - @base val local: Int -} -@base val z: Int + +@base +fun foo(@base y: @base Int): Int + +@base +val z: Int + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered index 8ce14d5482c..7436c1f6d3a 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered @@ -1,16 +1,29 @@ -@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS]) annotation class base -@base annotation class derived -@base class correct { - constructor(@base x: Int) - @base constructor() - @base val x: Int +@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS]) +annotation class base + +@base +annotation class derived + +@base +class correct { + constructor(@base x: Int) + + @base + constructor() + + @base + val x: Int } -@base enum class My { - FIRST, - SECOND, + +@base +enum class My { + FIRST, + SECOND } -@base fun foo(@base y: @base Int): Int { - @base fun bar(@base z: @base Int): Int - @base val local: Int -} -@base val z: Int + +@base +fun foo(@base y: @base Int): Int + +@base +val z: Int + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/complexTypes.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/complexTypes.rendered index 48dcf68a7ed..42a12bfe908 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/complexTypes.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/complexTypes.rendered @@ -1,6 +1,8 @@ class C { - inner class D + inner class D } + interface Test { - val x: C.D, *> + val x: C.D, *> } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered new file mode 100644 index 00000000000..082f1aab57a --- /dev/null +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered @@ -0,0 +1,16 @@ +object A { + constructor() +} + +enum class B { + X +} + +class C { + companion object { + constructor() + } +} + +val anonObject: Any + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.rendered index e352dc4b389..984cb63cce9 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.rendered @@ -1,12 +1,12 @@ -object A { - constructor() -} +object A + enum class B { - X, + X } + class C { - companion object { - constructor() - } + companion object } + val anonObject: Any + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorOfAnonymousObject.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorOfAnonymousObject.rendered index c27f11e3d49..8d414c5070e 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorOfAnonymousObject.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorOfAnonymousObject.rendered @@ -1,10 +1,8 @@ interface IFace { - fun getStatus(arg: T): Boolean + fun getStatus(arg: T): Boolean } + class Some -private fun resolve(): IFace { - object : IFace { - constructor() - override fun getStatus(arg: Some): Boolean - } -} + +private fun resolve(): IFace + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered index 4da4a1f9353..4fcb1b4a046 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered @@ -1,12 +1,14 @@ interface MyRwProperty { - operator fun getValue(thisRef: T, property: Any): V - operator fun setValue(thisRef: T, property: Any, value: V) + operator fun getValue(thisRef: T, property: Any): V + + operator fun setValue(thisRef: T, property: Any, value: V) } + val x: Int - get() + val delegate: MyRwProperty + val value: Int - get() + var variable: Int - get() - set(value: Int) + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered index 885cec1f906..9719e0403f1 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered @@ -1,8 +1,12 @@ open class Base { - constructor(x: T) - val x: T + constructor(x: T) + + val x: T } + class Derived : Base { - constructor(x: T) + constructor(x: T) } + fun create(x: T): Derived + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/emptyAnonymousObject.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/emptyAnonymousObject.rendered index 4666484bff2..1ff9494c07d 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/emptyAnonymousObject.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/emptyAnonymousObject.rendered @@ -1,3 +1,2 @@ -fun test() { - val x: Any -} +fun test() + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered index ce3355981ba..1d420b2b0a2 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered @@ -1,30 +1,42 @@ enum class Order { - FIRST, - SECOND, - THIRD, + FIRST, + SECOND, + THIRD } + enum class Planet { - MERCURY, - VENERA, - EARTH, - constructor(m: Double, r: Double) - val g: Double - val m: Double - internal val r: Double - abstract fun sayHello() - companion object { - const val G: Double - } + EARTH, + MERCURY, + VENERA; + + constructor(m: Double, r: Double) + + val g: Double + + val m: Double + + internal val r: Double + + abstract fun sayHello() + + companion object { + const val G: Double + } } + enum class PseudoInsn { - FIX_STACK_BEFORE_JUMP, - FAKE_ALWAYS_TRUE_IFEQ, - FAKE_ALWAYS_FALSE_IFEQ, - SAVE_STACK_BEFORE_TRY, - RESTORE_STACK_IN_TRY_CATCH, - STORE_NOT_NULL, - AS_NOT_NULL, - constructor(signature: String = ...) - val signature: String - fun emit() + AS_NOT_NULL, + FAKE_ALWAYS_FALSE_IFEQ, + FAKE_ALWAYS_TRUE_IFEQ, + FIX_STACK_BEFORE_JUMP, + RESTORE_STACK_IN_TRY_CATCH, + SAVE_STACK_BEFORE_TRY, + STORE_NOT_NULL; + + constructor(signature: String = ...) + + val signature: String + + fun emit() } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.rendered index 240a05f6b57..12eda5197ae 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.rendered @@ -1,10 +1,17 @@ interface Some + object O1 : Some + object O2 : Some + enum class SomeEnum { - FIRST, - SECOND, - constructor(x: Some) - val x: Some - abstract fun check(y: Some): Boolean + FIRST, + SECOND; + + constructor(x: Some) + + val x: Some + + abstract fun check(y: Some): Boolean } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/expectActual.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/expectActual.rendered index aba5be8f6b9..ccbc09ff4de 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/expectActual.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/expectActual.rendered @@ -1,6 +1,12 @@ expect class MyClass + expect fun foo(): String + expect val x: Int + actual class MyClass + actual fun foo(): String + actual val x: Int + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/functionTypes.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/functionTypes.rendered index 08eecdb5b50..14c5b2a9e01 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/functionTypes.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/functionTypes.rendered @@ -1,3 +1,6 @@ fun simpleRun(f: (T) -> Unit) + fun List.simpleMap(f: (T) -> R): R + fun simpleWith(t: T, f: T.() -> Unit) + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericFunctions.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericFunctions.rendered index f84326fff37..24927b3e02e 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericFunctions.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericFunctions.rendered @@ -1,5 +1,8 @@ interface Any + inline fun Any.safeAs(): T? + abstract class Summator { - abstract fun plus(first: T, second: T): T + abstract fun plus(first: T, second: T): T } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered index 3b6ba1e40d7..bcfc77b2b94 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered @@ -1,3 +1,4 @@ fun genericFoo(): T + val T.generic: T - get() + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/intersectionType.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/intersectionType.rendered index 856e7e055f0..be4c1ffa53d 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/intersectionType.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/intersectionType.rendered @@ -1 +1,2 @@ private fun foo(x: Any): Any? + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered index 6f553414d99..c79d7d94c13 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered @@ -1,10 +1,14 @@ abstract class Base { - constructor(s: String) - val s: String + constructor(s: String) + + val s: String } + class Outer { - class Derived : Base { - constructor(s: String) - } - object Obj : Base + class Derived : Base { + constructor(s: String) + } + + object Obj : Base } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/noPrimaryConstructor.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/noPrimaryConstructor.rendered index 94888bf3020..49a5280aefb 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/noPrimaryConstructor.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/noPrimaryConstructor.rendered @@ -1,5 +1,8 @@ class NoPrimary { - constructor() - constructor(x: String) - val x: String + constructor() + + constructor(x: String) + + val x: String } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered index 60250b90e10..2097685d986 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered @@ -1,13 +1,18 @@ interface SomeInterface { - val bar: Boolean - fun foo(x: Int, y: String): String + val bar: Boolean + + fun foo(x: Int, y: String): String } + class SomeClass : SomeInterface { - override var bar: Boolean - get() - set(value: Boolean) - private val baz: Int - lateinit var fau: Double - override fun foo(x: Int, y: String): String + override var bar: Boolean + + private val baz: Int + + lateinit var fau: Double + + override fun foo(x: Int, y: String): String } + inline class InlineClass + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleFun.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleFun.rendered index 4d00c1b7dd8..9523a441070 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleFun.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleFun.rendered @@ -1,2 +1,4 @@ fun foo() + suspend fun bar() + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.rendered index 15e4bceadb2..cd2e600dfbf 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.rendered @@ -1,3 +1,6 @@ interface B + typealias C = B + class D : C + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.rendered index 9e3abb500e7..1c414bf0050 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.rendered @@ -1,4 +1,8 @@ open class A + interface B + typealias C = B + class D : C + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered index 4f7bdaecc8e..90265d1f7ab 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered @@ -1,9 +1,16 @@ interface Some + abstract class My { - abstract val x: T - abstract val y: My.T - abstract val z: My.T - abstract fun foo(arg: T) - abstract class Some : My.T - open inner class T + abstract val x: T + + abstract val y: My.T + + abstract val z: My.T + + abstract fun foo(arg: T) + + abstract class Some : My.T + + open inner class T } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.rendered index 33eea6a7473..c981f2643be 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.rendered @@ -1,11 +1,18 @@ interface List { - infix fun concat(other: List): List - operator fun get(index: Int): T + infix fun concat(other: List): List + + operator fun get(index: Int): T } + typealias StringList = List + typealias AnyList = List<*> + abstract class AbstractList : List + class SomeList : AbstractList { - override infix fun concat(other: List): List - override operator fun get(index: Int): Int + override infix fun concat(other: List): List + + override operator fun get(index: Int): Int } + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered index f34823dd47d..3e6baa8ceae 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered @@ -1,6 +1,12 @@ -@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) annotation class A1 -@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) annotation class A2 { - constructor(value: String) - val value: String +@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) +annotation class A1 + +@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) +annotation class A2 { + constructor(value: String) + + val value: String } + fun x(): @A1 @A2(value = "LIST") List<@A2(value = "INT") Int> + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered index 7e4580fbc14..356a2367497 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered @@ -1,5 +1,9 @@ -@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) annotation class A { - constructor(value: Int) - val value: Int +@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) +annotation class A { + constructor(value: Int) + + val value: Int } + fun x(): @A(value = 3) Int + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.descriptors.rendered index 2cac76e417c..0d8bb1734b7 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.descriptors.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.descriptors.rendered @@ -1,3 +1,7 @@ -@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE]) annotation class base +@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE]) +annotation class base + fun foo1(vararg ints: Int) + fun foo2(@base vararg ints: @base Int) + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.rendered index 34c4aaf00a0..72c4b6ca387 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/vararg.rendered @@ -1,3 +1,7 @@ -@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE]) annotation class base +@Target(allowedTargets = [kotlin.annotation.AnnotationTarget.ANNOTATION_CLASS, kotlin.annotation.AnnotationTarget.VALUE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE]) +annotation class base + fun foo1(vararg ints: Int) + fun foo2(@base vararg ints: Int) + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.descriptors.rendered index 491aa136fd4..8aebf651e6e 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.descriptors.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.descriptors.rendered @@ -1,3 +1,6 @@ interface A + interface B + class C + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered index f455894ee76..747c27b323e 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered @@ -1,3 +1,6 @@ interface A + interface B + class C where T : B +