diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/assignment/arrayAssignmentTargetUnresovledSet.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/assignment/arrayAssignmentTargetUnresovledSet.txt index d4ab42a78b4..e3c809cad3a 100644 --- a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/assignment/arrayAssignmentTargetUnresovledSet.txt +++ b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/assignment/arrayAssignmentTargetUnresovledSet.txt @@ -1,2 +1,2 @@ expression: arr[0] -type: ERROR_TYPE +type: ERROR_TYPE(Unresolved name: set) diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/smartcast_multi.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/smartcast_multi.txt index e3a20081819..8f503aed855 100644 --- a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/smartcast_multi.txt +++ b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/smartcast_multi.txt @@ -1,2 +1,2 @@ expression: a -type: (A&B) +type: A & B diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_multipleSuperTypes.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_multipleSuperTypes.txt index af0255678cd..b105156ce81 100644 --- a/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_multipleSuperTypes.txt +++ b/analysis/analysis-api/testData/components/expressionTypeProvider/expressionType/unresolvedSuper_multipleSuperTypes.txt @@ -1,2 +1,2 @@ expression: super -type: (A&B) +type: A & B diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.descriptors.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.descriptors.txt index d91a9e4f7e2..bbd9d279f91 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.descriptors.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_jvmInline_typealias.descriptors.txt @@ -1,2 +1,2 @@ -KtType: ERROR_TYPE +KtType: ERROR PsiType: null diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt new file mode 100644 index 00000000000..d2d0b0655d1 --- /dev/null +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forDeclaration/actual_typealias.descriptors.txt @@ -0,0 +1,2 @@ +KtType: kotlin.Int +PsiType: PsiType:int diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt index 87bfa573ae0..1fbc0959d83 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/class_object_constructor.txt @@ -1,2 +1,2 @@ -KtType: Outer..Inner +KtType: Outer.``.Inner PsiType: null diff --git a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/typeParamFlexibleUpperBound.txt b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/typeParamFlexibleUpperBound.txt index 9dfbb57b725..5692e434f25 100644 --- a/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/typeParamFlexibleUpperBound.txt +++ b/analysis/analysis-api/testData/components/psiTypeProvider/psiType/forExpression/typeParamFlexibleUpperBound.txt @@ -1,2 +1,2 @@ -KtType: T!! +KtType: T & kotlin.Any PsiType: PsiType:T diff --git a/analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyWithAccessors.txt b/analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyWithAccessors.txt index da0ece705d9..2c07a190402 100644 --- a/analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyWithAccessors.txt +++ b/analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyWithAccessors.txt @@ -1,6 +1,8 @@ KtDeclaration: KtProperty Symbol: var foo: kotlin.Int + get() + set(value: kotlin.Int) Signature: KtVariableLikeSignature: diff --git a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_stable.txt b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_stable.txt index b8dad70637f..5ffb9d34fac 100644 --- a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_stable.txt +++ b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_stable.txt @@ -1,3 +1,3 @@ expression: a isStable: true -smartCastType: (A&B) +smartCastType: A & B diff --git a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.descriptors.txt b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.descriptors.txt deleted file mode 100644 index 7a9d527ae14..00000000000 --- a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.descriptors.txt +++ /dev/null @@ -1,3 +0,0 @@ -expression: a -isStable: false -smartCastType: (A & B) diff --git a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.txt b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.txt index f22c2fd9521..7f088b7907d 100644 --- a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.txt +++ b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcastAsReceiver_unstable.txt @@ -1,3 +1,3 @@ expression: a isStable: false -smartCastType: (A&B) +smartCastType: A & B diff --git a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_stable.txt b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_stable.txt index b8dad70637f..5ffb9d34fac 100644 --- a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_stable.txt +++ b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_stable.txt @@ -1,3 +1,3 @@ expression: a isStable: true -smartCastType: (A&B) +smartCastType: A & B diff --git a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_unstable.txt b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_unstable.txt index f22c2fd9521..7f088b7907d 100644 --- a/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_unstable.txt +++ b/analysis/analysis-api/testData/components/smartCastProvider/smartCastInfo/multiSmartcast_unstable.txt @@ -1,3 +1,3 @@ expression: a isStable: false -smartCastType: (A&B) +smartCastType: A & B diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered index cee975bc330..522f2b3bf3d 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/F.rendered @@ -1,4 +1,4 @@ open class A -class B : A +class B : A() diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.descriptors.rendered new file mode 100644 index 00000000000..90b51d3c9d6 --- /dev/null +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.descriptors.rendered @@ -0,0 +1,10 @@ +abstract class A { + abstract class Nested +} + +typealias TA = A + +class B : A() { + class NestedInB : A.Nested() +} + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered index 62f2e402548..d1c54cd556f 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedOfAliasedType.rendered @@ -4,7 +4,7 @@ abstract class A { typealias TA = A -class B : TA { - class NestedInB : A.Nested +class B : TA() { + 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 fafb6e8cb4a..3b2e8fb3ccf 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/NestedSuperType.rendered @@ -1,10 +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 Your : My() { + 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 8a797569c52..ac488d0784c 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.descriptors.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.descriptors.rendered @@ -5,9 +5,7 @@ annotation class base annotation class derived @base -class correct { - constructor(x: Int) - +class correct(x: Int) { @base constructor() @@ -17,8 +15,8 @@ class correct { @base enum class My { - FIRST, - SECOND + @base FIRST, + @base SECOND } @base diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered index 7436c1f6d3a..fedba85be85 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/annotation.rendered @@ -5,9 +5,7 @@ annotation class base annotation class derived @base -class correct { - constructor(@base x: Int) - +class correct(@base x: Int) { @base constructor() @@ -17,8 +15,8 @@ class correct { @base enum class My { - FIRST, - SECOND + @base FIRST, + @base SECOND } @base diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered deleted file mode 100644 index 082f1aab57a..00000000000 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/constructorInObject.descriptors.rendered +++ /dev/null @@ -1,16 +0,0 @@ -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/delegates.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.descriptors.rendered new file mode 100644 index 00000000000..4fcb1b4a046 --- /dev/null +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.descriptors.rendered @@ -0,0 +1,14 @@ +interface MyRwProperty { + operator fun getValue(thisRef: T, property: Any): V + + operator fun setValue(thisRef: T, property: Any, value: V) +} + +val x: Int + +val delegate: MyRwProperty + +val value: Int + +var variable: Int + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered index 4fcb1b4a046..024d2002b59 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/delegates.rendered @@ -5,10 +5,14 @@ interface MyRwProperty { } val x: Int + get() val delegate: MyRwProperty val value: Int + get() var variable: Int + get() + set(variable: Int) diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered index 9719e0403f1..31a8dba5f0c 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/derivedClass.rendered @@ -1,12 +1,8 @@ -open class Base { - constructor(x: T) - +open class Base(x: T) { val x: T } -class Derived : Base { - constructor(x: T) -} +class Derived(x: T) : Base() fun create(x: T): Derived diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered index 1d420b2b0a2..e7a42ba83f7 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums.rendered @@ -4,27 +4,31 @@ enum class Order { THIRD } -enum class Planet { - EARTH, - MERCURY, - VENERA; - - constructor(m: Double, r: Double) - - val g: Double - - val m: Double - - internal val r: Double +enum class Planet(m: Double, r: Double) { + EARTH { + override fun sayHello() + }, + MERCURY { + override fun sayHello() + }, + VENERA { + override fun sayHello() + }; abstract fun sayHello() companion object { const val G: Double } + + internal val r: Double + + val g: Double + + val m: Double } -enum class PseudoInsn { +enum class PseudoInsn(signature: String) { AS_NOT_NULL, FAKE_ALWAYS_FALSE_IFEQ, FAKE_ALWAYS_TRUE_IFEQ, @@ -33,10 +37,8 @@ enum class PseudoInsn { SAVE_STACK_BEFORE_TRY, STORE_NOT_NULL; - constructor(signature: String = ...) + fun emit() 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 12eda5197ae..d5f85bae76a 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/enums2.rendered @@ -4,14 +4,16 @@ object O1 : Some object O2 : Some -enum class SomeEnum { - FIRST, - SECOND; - - constructor(x: Some) - - val x: Some +enum class SomeEnum(x: Some) { + FIRST { + override fun check(y: Some): Boolean + }, + SECOND { + override fun check(y: Some): Boolean + }; abstract fun check(y: Some): Boolean + + val x: Some } diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered index bcfc77b2b94..e7b134b7818 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/genericProperty.rendered @@ -1,4 +1,5 @@ fun genericFoo(): T val T.generic: T + get() diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered index c79d7d94c13..adebc0bc92b 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/nestedClass.rendered @@ -1,14 +1,10 @@ -abstract class Base { - constructor(s: String) - +abstract class Base(s: String) { val s: String } class Outer { - class Derived : Base { - constructor(s: String) - } + class Derived(s: String) : Base() - object Obj : Base + object Obj : Base() } diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered index 2097685d986..4ce1636969a 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleClass.rendered @@ -1,17 +1,19 @@ interface SomeInterface { - val bar: Boolean - fun foo(x: Int, y: String): String + + val bar: Boolean } class SomeClass : SomeInterface { - override var bar: Boolean - - private val baz: Int - lateinit var fau: Double override fun foo(x: Int, y: String): String + + override var bar: Boolean + get() + set(value: Boolean) + + private val baz: Int } inline class InlineClass diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.descriptors.rendered new file mode 100644 index 00000000000..4f88b7713a3 --- /dev/null +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/simpleTypeAlias.descriptors.rendered @@ -0,0 +1,6 @@ +interface B + +typealias C = B + +class D : B + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.descriptors.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.descriptors.rendered new file mode 100644 index 00000000000..aff8c3f6147 --- /dev/null +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeAliasWithGeneric.descriptors.rendered @@ -0,0 +1,8 @@ +open class A + +interface B + +typealias C = B + +class D : B + diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered index 90265d1f7ab..f5441e0ebf8 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameterVsNested.rendered @@ -1,16 +1,16 @@ interface Some abstract class My { + abstract class Some : My.T() + + abstract fun foo(arg: 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 c981f2643be..41a5e30ac10 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/typeParameters.rendered @@ -10,7 +10,7 @@ typealias AnyList = List<*> abstract class AbstractList : List -class SomeList : AbstractList { +class SomeList : AbstractList() { 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 3e6baa8ceae..e578c87b014 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypes.rendered @@ -2,9 +2,7 @@ annotation class A1 @Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) -annotation class A2 { - constructor(value: String) - +annotation class A2(value: String) { val value: String } 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 356a2367497..07295f0a9a7 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/types/annotaionOnTypesWithComplexExpression.rendered @@ -1,7 +1,5 @@ @Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE]) -annotation class A { - constructor(value: Int) - +annotation class A(value: Int) { val value: Int } diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered index 747c27b323e..ab5fab8962b 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/renderDeclaration/where.rendered @@ -2,5 +2,5 @@ interface A interface B -class C where T : B +class C where T : A, T : B diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.descriptors.kt b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.descriptors.kt deleted file mode 100644 index 194ad42780b..00000000000 --- a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.descriptors.kt +++ /dev/null @@ -1,7 +0,0 @@ -fun test() { - class A - @Denotable("A") A() - @Denotable("kotlin.collections.List") listOf(A()) - @Nondenotable("``") object {} - @Nondenotable("kotlin.collections.List<``>") listOf(object {}) -} diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.kt b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.kt index 15c0fb47b64..d53fd0b71ba 100644 --- a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.kt +++ b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/localTypes.kt @@ -2,6 +2,6 @@ fun test() { class A @Denotable("A") A() @Denotable("kotlin.collections.List") listOf(A()) - @Nondenotable("") object {} - @Nondenotable("kotlin.collections.List<>") listOf(object {}) + @Nondenotable("``") object {} + @Nondenotable("kotlin.collections.List<``>") listOf(object {}) } diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.descriptors.kt b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.descriptors.kt index 998cfc95581..adfb5e7a9aa 100644 --- a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.descriptors.kt +++ b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.descriptors.kt @@ -18,7 +18,7 @@ fun test(a: Any?) { (@Denotable("kotlin.Any?") a).length (@Denotable("kotlin.Any?") a).inc() } - @Nondenotable("(kotlin.Comparable<*> & java.io.Serializable)") if (true) { + @Nondenotable("kotlin.Comparable<*> & java.io.Serializable") if (true) { "" } else { 1 diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.kt b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.kt index 6f817e2f7e5..e220d5dd276 100644 --- a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.kt +++ b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/smartcast.kt @@ -2,7 +2,7 @@ fun test(a: Any?) { if (a is String) { (@Denotable("kotlin.String") a).length if (a is Int) { - (@Nondenotable("(kotlin.String&kotlin.Int)") a).inc() + (@Nondenotable("kotlin.String & kotlin.Int") a).inc() } if (a is String) { (@Denotable("kotlin.String") a).length @@ -15,10 +15,10 @@ fun test(a: Any?) { (@Denotable("kotlin.Nothing?") a).isNothing() } if (a is String || a is Int) { - (@Nondenotable("(kotlin.Comparable<(kotlin.String&kotlin.Int)>&java.io.Serializable)") a).length - (@Nondenotable("(kotlin.Comparable<(kotlin.String&kotlin.Int)>&java.io.Serializable)") a).inc() + (@Nondenotable("kotlin.Comparable & java.io.Serializable") a).length + (@Nondenotable("kotlin.Comparable & java.io.Serializable") a).inc() } - @Nondenotable("(kotlin.Comparable<*>&java.io.Serializable)") if (true) { + @Nondenotable("kotlin.Comparable<*> & java.io.Serializable") if (true) { "" } else { 1 diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.descriptors.kt b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.descriptors.kt index da7c04d7b7e..8bca4dcbd1b 100644 --- a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.descriptors.kt +++ b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.descriptors.kt @@ -3,7 +3,7 @@ interface A fun test(t: T) { @Denotable("T") t if (t != null) { - (@Nondenotable("T & Any") t).equals("") + (@Nondenotable("T & kotlin.Any") t).equals("") } val outs = take(getOutProjection()) @Denotable("A") outs diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.kt b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.kt index 755246fcf87..04cf678fc8b 100644 --- a/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.kt +++ b/analysis/analysis-api/testData/components/typeInfoProvider/isDenotable/typeParameter.kt @@ -3,7 +3,7 @@ interface A fun test(t: T) { @Denotable("T") t if (t != null) { - (@Denotable("T!!") t).equals("") + (@Denotable("T & kotlin.Any") t).equals("") } val outs = take(getOutProjection()) @Denotable("A") outs diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/contravariant.txt b/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/contravariant.txt index 633d59f3ac2..05f39915cbf 100644 --- a/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/contravariant.txt +++ b/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/contravariant.txt @@ -1,17 +1,17 @@ [direct super types] -kotlin.collections.List -kotlin.collections.MutableCollection +kotlin.collections.List +kotlin.collections.MutableCollection [approximated direct super types] kotlin.collections.List kotlin.collections.MutableCollection [all super types] -kotlin.collections.List -kotlin.collections.MutableCollection -kotlin.collections.Collection -kotlin.collections.MutableIterable -kotlin.collections.Iterable +kotlin.collections.List +kotlin.collections.MutableCollection +kotlin.collections.Collection +kotlin.collections.MutableIterable +kotlin.collections.Iterable kotlin.Any [approximated all super types] @@ -21,3 +21,4 @@ kotlin.collections.Collection kotlin.collections.MutableIterable kotlin.collections.Iterable kotlin.Any + diff --git a/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/covariant.txt b/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/covariant.txt index c7bf8877b83..8496ca9c135 100644 --- a/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/covariant.txt +++ b/analysis/analysis-api/testData/components/typeInfoProvider/superTypes/covariant.txt @@ -1,17 +1,17 @@ [direct super types] -kotlin.collections.List -kotlin.collections.MutableCollection +kotlin.collections.List +kotlin.collections.MutableCollection [approximated direct super types] kotlin.collections.List kotlin.collections.MutableCollection [all super types] -kotlin.collections.List -kotlin.collections.MutableCollection -kotlin.collections.Collection -kotlin.collections.MutableIterable -kotlin.collections.Iterable +kotlin.collections.List +kotlin.collections.MutableCollection +kotlin.collections.Collection +kotlin.collections.MutableIterable +kotlin.collections.Iterable kotlin.Any [approximated all super types] @@ -21,3 +21,4 @@ kotlin.collections.Collection kotlin.collections.MutableIterable kotlin.collections.Iterable kotlin.Any + diff --git a/analysis/analysis-api/testData/referenceResolve/JavaReference.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/JavaReference.descriptors.txt index 8917600d756..91c55865caf 100644 --- a/analysis/analysis-api/testData/referenceResolve/JavaReference.descriptors.txt +++ b/analysis/analysis-api/testData/referenceResolve/JavaReference.descriptors.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) open class HashSet : java.util.AbstractSet, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet \ No newline at end of file +0: (in java.util) open class HashSet : java.util.AbstractSet(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/JavaReference.txt b/analysis/analysis-api/testData/referenceResolve/JavaReference.txt index bbca9253797..51bde494cfc 100644 --- a/analysis/analysis-api/testData/referenceResolve/JavaReference.txt +++ b/analysis/analysis-api/testData/referenceResolve/JavaReference.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) open class HashSet : java.util.AbstractSet<(E!!..E?)>, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet +0: (in java.util) open class HashSet : java.util.AbstractSet<(E & kotlin.Any..E?)>(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableSet \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/SamConstructor.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/SamConstructor.descriptors.txt index 1b56430e562..5a99b8d511d 100644 --- a/analysis/analysis-api/testData/referenceResolve/SamConstructor.descriptors.txt +++ b/analysis/analysis-api/testData/referenceResolve/SamConstructor.descriptors.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) fun Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator \ No newline at end of file +0: (in java.util) Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt b/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt index b205330b165..a44af3d22ad 100644 --- a/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt +++ b/analysis/analysis-api/testData/referenceResolve/SamConstructor.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) fun Comparator(function: ((T!!..T?), (T!!..T?)) -> kotlin.Int): java.util.Comparator +0: (in java.util) Comparator(function: ((T & kotlin.Any..T?), (T & kotlin.Any..T?)) -> kotlin.Int): java.util.Comparator \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.descriptors.txt index 1b56430e562..5a99b8d511d 100644 --- a/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.descriptors.txt +++ b/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.descriptors.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) fun Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator \ No newline at end of file +0: (in java.util) Comparator(function: (T!, T!) -> kotlin.Int): java.util.Comparator \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt b/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt index b205330b165..a44af3d22ad 100644 --- a/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt +++ b/analysis/analysis-api/testData/referenceResolve/SamConstructorTypeArguments.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) fun Comparator(function: ((T!!..T?), (T!!..T?)) -> kotlin.Int): java.util.Comparator +0: (in java.util) Comparator(function: ((T & kotlin.Any..T?), (T & kotlin.Any..T?)) -> kotlin.Int): java.util.Comparator \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary/notNull.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary/notNull.descriptors.txt new file mode 100644 index 00000000000..f26fb2d94a4 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/delegatedPropertyAccessors/inStandardLibrary/notNull.descriptors.txt @@ -0,0 +1,3 @@ +Resolved to: +0: (in kotlin.properties.ReadWriteProperty) operator fun setValue(thisRef: T, property: kotlin.reflect.KProperty<*>, value: V) +1: (in kotlin.properties.ReadWriteProperty) override operator fun getValue(thisRef: T, property: kotlin.reflect.KProperty<*>): V \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns/member.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns/member.descriptors.txt index dde5889efb2..26aaf671c35 100644 --- a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns/member.descriptors.txt +++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inBuiltIns/member.descriptors.txt @@ -1,4 +1,4 @@ Resolved to: -0: (in kotlin.collections.IntIterator) operator fun next(): kotlin.Int +0: (in kotlin.collections.IntIterator) override operator fun next(): kotlin.Int 1: (in kotlin.collections.Iterator) operator fun hasNext(): kotlin.Boolean -2: (in kotlin.ranges.IntProgression) operator fun iterator(): kotlin.collections.IntIterator \ No newline at end of file +2: (in kotlin.ranges.IntProgression) override operator fun iterator(): kotlin.collections.IntIterator \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/forLoopIn/inLibrary/extension.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inLibrary/extension.descriptors.txt new file mode 100644 index 00000000000..4d8a10586e5 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/forLoopIn/inLibrary/extension.descriptors.txt @@ -0,0 +1,4 @@ +Resolved to: +0: (in kotlin.collections.CharIterator) override operator fun next(): kotlin.Char +1: (in kotlin.collections.Iterator) operator fun hasNext(): kotlin.Boolean +2: (in kotlin.text) operator fun kotlin.CharSequence.iterator(): kotlin.collections.CharIterator \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.descriptors.txt index b29b2c90600..143004b5ac3 100644 --- a/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.descriptors.txt +++ b/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.descriptors.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) open class HashMap : java.util.AbstractMap, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap \ No newline at end of file +0: (in java.util) open class HashMap : java.util.AbstractMap(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.txt b/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.txt index f6d2e19bf07..546b8097519 100644 --- a/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.txt +++ b/analysis/analysis-api/testData/referenceResolve/inImport/javaClass.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in java.util) open class HashMap : java.util.AbstractMap<(K!!..K?), (V!!..V?)>, kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap +0: (in java.util) open class HashMap : java.util.AbstractMap<(K & kotlin.Any..K?), (V & kotlin.Any..V?)>(), kotlin.Cloneable, java.io.Serializable, kotlin.collections.MutableMap \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/inImport/kotlinClass.txt b/analysis/analysis-api/testData/referenceResolve/inImport/kotlinClass.txt index cd74c55fdf1..76ffe9080e7 100644 --- a/analysis/analysis-api/testData/referenceResolve/inImport/kotlinClass.txt +++ b/analysis/analysis-api/testData/referenceResolve/inImport/kotlinClass.txt @@ -1,3 +1,3 @@ Resolved to: 0: (in kotlin.collections) inline fun MutableList(size: kotlin.Int, init: (kotlin.Int) -> T): kotlin.collections.MutableList -1: (in kotlin.collections) interface MutableList : kotlin.collections.List, kotlin.collections.MutableCollection +1: (in kotlin.collections) interface MutableList : kotlin.collections.List, kotlin.collections.MutableCollection \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByFullName.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByFullName.txt index cdfb041156c..7f85e5f4c98 100644 --- a/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByFullName.txt +++ b/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByFullName.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in kotlin.collections) abstract class AbstractCollection : kotlin.collections.Collection +0: (in kotlin.collections) abstract class AbstractCollectionprotected constructor : kotlin.collections.Collection \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByShortName.txt b/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByShortName.txt index cdfb041156c..7f85e5f4c98 100644 --- a/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByShortName.txt +++ b/analysis/analysis-api/testData/referenceResolve/kDoc/qualified/stdlib/TopLevelClassFromStdlibByShortName.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in kotlin.collections) abstract class AbstractCollection : kotlin.collections.Collection +0: (in kotlin.collections) abstract class AbstractCollectionprotected constructor : kotlin.collections.Collection \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt index 64162b865af..694e8760ef3 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/multipleBounds.txt @@ -1,2 +1,2 @@ Resolved to: -0: T : A \ No newline at end of file +0: T \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt index 4e69179e8e2..74771e143e7 100644 --- a/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt +++ b/analysis/analysis-api/testData/referenceResolve/typeParameter/reified_extensionReceiver.txt @@ -1,2 +1,2 @@ Resolved to: -0: reified T : kotlin.Any \ No newline at end of file +0: reified T \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.descriptors.txt index 0ae25b60734..41402a7dd17 100644 --- a/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.descriptors.txt +++ b/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.descriptors.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in Controller) suspend fun suspendHere(x: ERROR_TYPE) \ No newline at end of file +0: (in Controller) suspend fun suspendHere(x: ERROR_TYPE(Unresolved type for Continuation)) \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.txt b/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.txt index ac7b10560c6..dae32552518 100644 --- a/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.txt +++ b/analysis/analysis-api/testData/referenceResolve/withErrors/CoroutineSuspensionPoint.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in Controller) suspend fun suspendHere(x: `Continuation`) +0: (in Controller) suspend fun suspendHere(x: ERROR_TYPE(Symbol not found for Continuation)) \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt new file mode 100644 index 00000000000..0abfc1669fd --- /dev/null +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/propertyWithGetter.descriptors.pretty.txt @@ -0,0 +1,2 @@ +val foo: kotlin.Int + get() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.pretty.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.pretty.txt index 580f6ae1852..ae24381accc 100644 --- a/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/simple.descriptors.pretty.txt @@ -1,11 +1,11 @@ -open var kotlin.Int.zoo: kotlin.Unit +var kotlin.Int.zoo: kotlin.Unit -open fun foo() +fun foo() -open fun kotlin.Int.smth(): kotlin.Short +fun kotlin.Int.smth(): kotlin.Short -open val foo: kotlin.Int +val foo: kotlin.Int -open var bar: kotlin.Long +var bar: kotlin.Long -open val kotlin.Int.doo: kotlin.String \ No newline at end of file +val kotlin.Int.doo: kotlin.String \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.pretty.txt b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.pretty.txt new file mode 100644 index 00000000000..833ed320f36 --- /dev/null +++ b/analysis/analysis-api/testData/scopes/delegatedMemberScope/withOverridden.descriptors.pretty.txt @@ -0,0 +1 @@ +fun bar() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.pretty.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.pretty.txt index 9e4e3c80e02..ac53e8ff5a0 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.pretty.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.pretty.txt @@ -15,4 +15,4 @@ val name: kotlin.String val ordinal: kotlin.Int -fun getDeclaringClass(): java.lang.Class! \ No newline at end of file +fun getDeclaringClass(): (java.lang.Class..java.lang.Class?) \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.pretty.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.pretty.txt index 4b41719d455..01b522738e3 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.pretty.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.pretty.txt @@ -2,11 +2,12 @@ private val value: kotlin.CharArray! private open var hash: kotlin.Int -public/*package*/ open fun hash32(): kotlin.Int +open fun hash32(): kotlin.Int private open var hash32: kotlin.Int open val length: kotlin.Int + get() open fun isEmpty(): kotlin.Boolean @@ -18,7 +19,7 @@ open fun codePointCount(beginIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.In open fun offsetByCodePoints(index: kotlin.Int, codePointOffset: kotlin.Int): kotlin.Int -public/*package*/ open fun getChars(dst: kotlin.CharArray!, dstBegin: kotlin.Int) +open fun getChars(dst: kotlin.CharArray!, dstBegin: kotlin.Int) open fun getChars(srcBegin: kotlin.Int, srcEnd: kotlin.Int, dst: kotlin.CharArray!, dstBegin: kotlin.Int) @@ -95,9 +96,9 @@ open fun replaceFirst(regex: kotlin.String!, replacement: kotlin.String!): kotli open fun replaceAll(regex: kotlin.String!, replacement: kotlin.String!): kotlin.String! -open fun split(regex: kotlin.String!, limit: kotlin.Int): kotlin.Array<(out) kotlin.String!>! +open fun split(regex: kotlin.String!, limit: kotlin.Int): (kotlin.Array..kotlin.Array?) -open fun split(regex: kotlin.String!): kotlin.Array<(out) kotlin.String!>! +open fun split(regex: kotlin.String!): (kotlin.Array..kotlin.Array?) open fun toLowerCase(locale: java.util.Locale!): kotlin.String! @@ -117,7 +118,7 @@ open fun intern(): kotlin.String! open operator fun get(index: kotlin.Int): kotlin.Char -private open class CaseInsensitiveComparator : kotlin.Any, java.util.Comparator, java.io.Serializable +private open class CaseInsensitiveComparator : java.util.Comparator, java.io.Serializable constructor() @@ -151,7 +152,7 @@ constructor(buffer: java.lang.StringBuffer!) constructor(builder: java.lang.StringBuilder!) -public/*package*/ constructor(value: kotlin.CharArray!, share: kotlin.Boolean) +constructor(value: kotlin.CharArray!, share: kotlin.Boolean) @kotlin.Deprecated(message = "Deprecated in Java") -public/*package*/ constructor(offset: kotlin.Int, count: kotlin.Int, value: kotlin.CharArray!) \ No newline at end of file +constructor(offset: kotlin.Int, count: kotlin.Int, value: kotlin.CharArray!) \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt index 5fca677ad59..f34bd27b21e 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt @@ -3,6 +3,7 @@ val noGeneric: test.Foo? val withOuterGeneric: test.Foo? val TT.withOwnGeneric: TT? + get() val TT.withOuterAndOwnGeneric: test.Foo? @@ -12,4 +13,4 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -constructor() +constructor() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt index 5aa353babc4..1914db8d795 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt @@ -8,4 +8,4 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -inner constructor() +constructor() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt index 9e78f084e0d..1a51dcf3bfb 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt @@ -10,4 +10,4 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -inner constructor() +constructor() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt index 492ef345557..b7d1214aa44 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt @@ -8,4 +8,4 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -inner constructor() +constructor() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt index 18a2f48b61a..5946184c9e3 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt @@ -8,4 +8,4 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -inner constructor() +constructor() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt index d35ac867d9d..fc5ab8f6193 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt @@ -10,4 +10,4 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -inner constructor() +constructor() \ No newline at end of file diff --git a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt index 4d4a7b73a82..0aa8b306ade 100644 --- a/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt +++ b/analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt @@ -6,9 +6,9 @@ operator fun contains(p0: kotlin.Any!): kotlin.Boolean abstract operator fun iterator(): kotlin.collections.MutableIterator -fun toArray(): kotlin.Array<(out) kotlin.Any!>! +fun toArray(): (kotlin.Array..kotlin.Array?) -fun toArray(p0: kotlin.Array<(out) (T!!..T?)>!): kotlin.Array<(out) (T!!..T?)>! +fun toArray(p0: (kotlin.Array<(T & kotlin.Any..T?)>..kotlin.Array?)): (kotlin.Array<(T & kotlin.Any..T?)>..kotlin.Array?) abstract fun add(p0: test.SomeClass!): kotlin.Boolean @@ -30,4 +30,4 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -constructor() +constructor() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.descriptors.pretty.txt deleted file mode 100644 index d281175a6b1..00000000000 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.descriptors.pretty.txt +++ /dev/null @@ -1 +0,0 @@ -object \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt index e0a354dd0c8..33ce30fa3d8 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/functionWithReceiverAnnotation.descriptors.pretty.txt @@ -1 +1 @@ -fun (@ReceiverTypeAnnotation kotlin.Int).foo() \ No newline at end of file +fun @ReceiverTypeAnnotation kotlin.Int.foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt index c3efbb7a804..4dc1184c8c4 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.descriptors.pretty.txt @@ -1,2 +1,6 @@ @PropertyAnnotation -var prop: kotlin.Int \ No newline at end of file +var prop: kotlin.Int + @GetAnnotation + get() + @SetAnnotation + set(@SetparamAnnotation value: kotlin.Int) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt index 476e31cb197..95042adef1b 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotations.pretty.txt @@ -1,3 +1,7 @@ @PropertyAnnotation -@FieldAnnotation -var prop: kotlin.Int \ No newline at end of file +@field:FieldAnnotation +var prop: kotlin.Int + @GetAnnotation + get() + @SetAnnotation + set(@setparam:SetparamAnnotation value: kotlin.Int) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt index 34307d36543..76f2af1b5e0 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithAnnotationsAndAccessors.pretty.txt @@ -1,5 +1,5 @@ @PropertyAnnotation -@FieldAnnotation +@field:FieldAnnotation var x: kotlin.Int @ExplicitGetAnnotation @GetAnnotation diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt index e15641e20f9..30a2f85bd98 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithDelegateAndAnnotations.pretty.txt @@ -1,4 +1,5 @@ @ExplicitPropertyAnnotation -@DelegateAnnotation +@delegate:DelegateAnnotation @PropertyAnnotation -val lazyProperty: kotlin.Int \ No newline at end of file +val lazyProperty: kotlin.Int + get() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt index 083096b703b..2cf64df2849 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.descriptors.pretty.txt @@ -1 +1,2 @@ -val (@ReceiverTypeAnnotation kotlin.Long).prop: kotlin.Boolean \ No newline at end of file +val @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean + get() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt index 99c5b8b07de..e15e3061b41 100644 --- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt +++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/propertyWithReceiverAnnotation.pretty.txt @@ -1 +1,2 @@ -val @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean \ No newline at end of file +val @ReceiverAnnotation @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean + get() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.pretty.txt deleted file mode 100644 index ca1f6abaacc..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.descriptors.pretty.txt +++ /dev/null @@ -1 +0,0 @@ -class String : java.io.Serializable, kotlin.Comparable, kotlin.CharSequence \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.pretty.txt index bc2026bcd40..ca1f6abaacc 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.pretty.txt @@ -1 +1 @@ -class String : kotlin.Any, java.io.Serializable, kotlin.Comparable, kotlin.CharSequence +class String : java.io.Serializable, kotlin.Comparable, kotlin.CharSequence \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.pretty.txt index 55d0c8dc10d..beb523c9d84 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.pretty.txt @@ -1,2 +1,2 @@ -@ERROR +@`` class MyClass \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.pretty.txt index 1a299d824ef..05626d66b65 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.pretty.txt @@ -1,2 +1,2 @@ @org.jetbrains.kotlin.fir.plugin.MyInterfaceSupertype -class MyClass : kotlin.Any, foo.MyInterface +class MyClass : foo.MyInterface \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.pretty.txt index c626e7cf909..db9ee628e21 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.pretty.txt @@ -1,6 +1,4 @@ -annotation class Anno { - constructor(param1: kotlin.String, param2: kotlin.Int) - +annotation class Anno(param1: kotlin.String, param2: kotlin.Int) { val param1: kotlin.String val param2: kotlin.Int diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.pretty.txt index 2ff06eb4a43..e11231400df 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.pretty.txt @@ -1 +1,3 @@ -var p: kotlin.Int \ No newline at end of file +var p: kotlin.Int + get() + set(value: kotlin.Int) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt index 58395a00267..bb29b26ae02 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.descriptors.txt @@ -57,7 +57,7 @@ KtClassInitializerSymbol: origin: SOURCE symbolKind: CLASS_MEMBER typeParameters: [] - getContainingModule: Could not render due to org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments: Unexpected KtSymbol KtFe10PsiClassInitializerSymbol + getContainingModule: Could not render due to java.lang.StackOverflowError deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.pretty.txt index 4791310d1b9..64d68871075 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.pretty.txt @@ -1,5 +1,3 @@ -class A { - constructor(a: kotlin.Int, b: kotlin.String) - +class A(a: kotlin.Int, b: kotlin.String) { val a: kotlin.Int } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.pretty.txt index 0a7e0ff490e..0445600b53d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.pretty.txt @@ -1 +1 @@ -class A<@org.jetbrains.annotations.NotNull T, R> \ No newline at end of file +class A \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt index 58a75628ec8..8ff322eb5b6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt @@ -7,9 +7,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -20,9 +18,7 @@ KtTypeParameterSymbol: name: R origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.pretty.txt index 538495a2946..d506a21631a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/contextReceivers/contextReceiversOnProperty.pretty.txt @@ -1 +1,2 @@ val y: kotlin.Int + get() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.pretty.txt index c7569431585..8246f1b879a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.pretty.txt @@ -1,6 +1,4 @@ -class MyColor { - constructor(x: kotlin.Int, y: kotlin.Int, z: kotlin.Int) - +class MyColor(x: kotlin.Int, y: kotlin.Int, z: kotlin.Int) { val x: kotlin.Int val y: kotlin.Int @@ -10,6 +8,7 @@ class MyColor { class Some { val delegate: MyColor + get() val lambda: kotlin.Lazy diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.pretty.txt index b244bdc41f8..4c3526245df 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.pretty.txt @@ -6,7 +6,6 @@ val i2: kotlin.Int get() var i3: kotlin.Int - get() @kotlin.Deprecated(message = "don't use getter of i3") set(value: kotlin.Int) @@ -19,10 +18,10 @@ var i4: kotlin.Int @kotlin.Deprecated(message = "don't use f") fun f(): kotlin.Int -@kotlin.Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j") +@kotlin.Deprecated(message = "don't use j", level = kotlin.DeprecationLevel.ERROR) val j: kotlin.Int -@kotlin.Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2") +@kotlin.Deprecated(message = "don't use j2", level = kotlin.DeprecationLevel.HIDDEN) val j2: kotlin.Int val j2: kotlin.Int diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.pretty.txt index 662a1520309..d1901f422b7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.pretty.txt @@ -18,10 +18,10 @@ var i4: kotlin.Int @kotlin.Deprecated(message = "don't use f") fun f(): kotlin.Int -@kotlin.Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j") +@kotlin.Deprecated(message = "don't use j", level = kotlin.DeprecationLevel.ERROR) val j: kotlin.Int -@kotlin.Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2") +@kotlin.Deprecated(message = "don't use j2", level = kotlin.DeprecationLevel.HIDDEN) val j2: kotlin.Int @java.lang.Deprecated diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.pretty.txt deleted file mode 100644 index edb93c58b07..00000000000 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.descriptors.pretty.txt +++ /dev/null @@ -1,9 +0,0 @@ -fun destruct(): kotlin.Int - -data class P { - constructor(x: kotlin.Int, y: kotlin.Int) - - val x: kotlin.Int - - val y: kotlin.Int -} \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.pretty.txt index 3ecaf04abe4..b28bb0eef6b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.pretty.txt @@ -1,15 +1,7 @@ fun destruct(): kotlin.Int -class P { - constructor(x: kotlin.Int, y: kotlin.Int) - +data class P(x: kotlin.Int, y: kotlin.Int) { val x: kotlin.Int val y: kotlin.Int - - operator fun component1(): kotlin.Int - - operator fun component2(): kotlin.Int - - fun copy(x: kotlin.Int = ..., y: kotlin.Int = ...): P } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.pretty.txt index 1d487d009c5..f8398bc0342 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryFunctions.pretty.txt @@ -1,5 +1,11 @@ enum class MyEnumClass { - FirstEntry, + FirstEntry { + fun a() + }, SecondEntry, - ThirdEntry + ThirdEntry { + fun one() + + fun one(i: kotlin.Int) + } } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.pretty.txt index bd6ff9a2f4c..674ada8116e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.descriptors.pretty.txt @@ -1,7 +1,20 @@ enum class MyEnumClass { - FirstEntry, - SecondEntry, - ThirdEntry; + FirstEntry { + fun a() + + override fun foo() + }, + SecondEntry { + override fun foo() + + override val i: kotlin.Int + get() + }, + ThirdEntry { + override fun foo() + + override fun foo(i: kotlin.Int) + }; abstract fun foo() diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.pretty.txt index 6d30260b02f..33c970ceca0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.pretty.txt @@ -1,7 +1,20 @@ enum class MyEnumClass { - FirstEntry, - SecondEntry, - ThirdEntry; + FirstEntry { + fun a() + + override fun foo() + }, + SecondEntry { + override fun foo() + + override val i: kotlin.Int + get() + }, + ThirdEntry { + override fun foo() + + override fun foo(i: kotlin.Int) + }; abstract fun foo() diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.pretty.txt index 1d487d009c5..5d5a33fa8d6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryProperties.pretty.txt @@ -1,5 +1,12 @@ enum class MyEnumClass { - FirstEntry, + FirstEntry { + val a: kotlin.Int + }, SecondEntry, - ThirdEntry + ThirdEntry { + val b: kotlin.Int + + val kotlin.Int.d: kotlin.Int + get() + } } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.pretty.txt index 2881d492ad1..f3d20160841 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.pretty.txt @@ -1,7 +1,8 @@ -enum class Style { - SHEET; - - constructor(value: kotlin.String) +enum class Style(value: kotlin.String) { + SHEET { + override val exitAnimation: kotlin.String + get() + }; abstract val exitAnimation: kotlin.String diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.pretty.txt index 7c6a22d7396..2cc24758826 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.pretty.txt @@ -1,7 +1,8 @@ -enum class Style { - SHEET; - - constructor(value: kotlin.String) +enum class Style(value: kotlin.String) { + SHEET { + override val exitAnimation: kotlin.String + get() + }; val value: kotlin.String diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.pretty.txt index 6ae4f637585..e11231400df 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/explicitBackingField.pretty.txt @@ -1 +1,3 @@ var p: kotlin.Int + get() + set(value: kotlin.Int) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt index 01618163ac2..03f595d94f8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt @@ -4,9 +4,7 @@ KtTypeParameterSymbol: name: X origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.pretty.txt index a9a1eaa75c6..aca1e5c8f0a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmField.pretty.txt @@ -1,5 +1,5 @@ @kotlin.jvm.JvmField var jvmField: kotlin.Long -@kotlin.jvm.JvmField +@field:kotlin.jvm.JvmField var jvmFieldOnField: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.pretty.txt index d6f7889ce0c..a794410b860 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.pretty.txt @@ -2,4 +2,5 @@ class A { val x: kotlin.Int val kotlin.Int.y: kotlin.Int + get() } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt index 4ac8488cd17..c014038cd54 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt @@ -4,9 +4,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -17,9 +15,7 @@ KtTypeParameterSymbol: name: T1 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -55,9 +51,7 @@ KtTypeParameterSymbol: name: T2 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -93,9 +87,7 @@ KtTypeParameterSymbol: name: T3 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -106,9 +98,7 @@ KtTypeParameterSymbol: name: T4 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -119,9 +109,7 @@ KtTypeParameterSymbol: name: T5 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -157,9 +145,7 @@ KtTypeParameterSymbol: name: T6 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -195,9 +181,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -208,9 +192,7 @@ KtTypeParameterSymbol: name: T1 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -246,9 +228,7 @@ KtTypeParameterSymbol: name: T2 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -284,9 +264,7 @@ KtTypeParameterSymbol: name: T3 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -297,9 +275,7 @@ KtTypeParameterSymbol: name: T4 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -310,9 +286,7 @@ KtTypeParameterSymbol: name: T5 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -348,9 +322,7 @@ KtTypeParameterSymbol: name: T6 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.pretty.txt index adfd37963f8..1493ba508b1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.pretty.txt @@ -1,7 +1,7 @@ class X { + fun foo() + inner class Y class Z - - fun foo() } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index e428cf3de9c..1de0f46707c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -4,9 +4,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -17,9 +15,7 @@ KtTypeParameterSymbol: name: T1 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -55,9 +51,7 @@ KtTypeParameterSymbol: name: T2 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -93,9 +87,7 @@ KtTypeParameterSymbol: name: T3 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -106,9 +98,7 @@ KtTypeParameterSymbol: name: T4 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -119,9 +109,7 @@ KtTypeParameterSymbol: name: T5 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -157,9 +145,7 @@ KtTypeParameterSymbol: name: T6 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -195,9 +181,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -208,9 +192,7 @@ KtTypeParameterSymbol: name: T1 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -246,9 +228,7 @@ KtTypeParameterSymbol: name: T2 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -284,9 +264,7 @@ KtTypeParameterSymbol: name: T3 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -297,9 +275,7 @@ KtTypeParameterSymbol: name: T4 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -310,9 +286,7 @@ KtTypeParameterSymbol: name: T5 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -348,9 +322,7 @@ KtTypeParameterSymbol: name: T6 origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt index 351be56cfdd..c3a400a0d1b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.descriptors.txt @@ -4,9 +4,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.pretty.txt index ca90db7adf2..68fdf38e8a6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.pretty.txt @@ -3,7 +3,5 @@ class X typealias TopLevelAlias = X class A { - typealias NestedLevelAlias = X - fun check() } \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt index 3fab1d575c0..6398b1e2a6e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt @@ -4,9 +4,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.pretty.txt index 762e730eee4..251656108bd 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.pretty.txt @@ -1,5 +1,8 @@ val x: kotlin.Int val kotlin.Int.y: kotlin.Int + get() -var kotlin.Short.get: kotlin.Long \ No newline at end of file +var kotlin.Short.get: kotlin.Long + get() + set(value: kotlin.Long) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt index 31fd8a97553..42eab7abe7b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt @@ -4,9 +4,7 @@ KtTypeParameterSymbol: name: T origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -42,9 +40,7 @@ KtTypeParameterSymbol: name: Z origin: SOURCE typeParameters: [] - upperBounds: [ - kotlin/Any? - ] + upperBounds: [] variance: INVARIANT getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.descriptors.pretty.txt index 49e633fb3e5..23994c7fdc1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.descriptors.pretty.txt @@ -4,4 +4,4 @@ fun nullablePrimitive(vararg b: kotlin.Float?) fun nonPrimitive(vararg c: kotlin.Any) -fun error(vararg d: ERROR_TYPE) \ No newline at end of file +fun error(vararg d: ERROR_TYPE(Unresolved type for Unresolved)) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.pretty.txt index 926cba7f0ca..b2b3a0c6f11 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.pretty.txt @@ -4,4 +4,4 @@ fun nullablePrimitive(vararg b: kotlin.Float?) fun nonPrimitive(vararg c: kotlin.Any) -fun error(vararg d: Unresolved) \ No newline at end of file +fun error(vararg d: ERROR_TYPE(Symbol not found for Unresolved)) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.pretty.txt index 8a99c5e60e9..68acaedb3d3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.descriptors.pretty.txt @@ -1 +1 @@ -constructor(c: (kotlin.collections.MutableCollection..kotlin.collections.Collection?)) \ No newline at end of file +constructor(c: kotlin.collections.(Mutable)Collection!) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt index 20cbaa66748..791222af132 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.pretty.txt @@ -1 +1 @@ -constructor(c: kotlin.collections.(Mutable)Collection!) +constructor(c: kotlin.collections.(Mutable)Collection!) \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.pretty.txt index e0a354dd0c8..33ce30fa3d8 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/functionReceiverParameter.descriptors.pretty.txt @@ -1 +1 @@ -fun (@ReceiverTypeAnnotation kotlin.Int).foo() \ No newline at end of file +fun @ReceiverTypeAnnotation kotlin.Int.foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.pretty.txt index 083096b703b..2cf64df2849 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/propertyReceiverParameter.descriptors.pretty.txt @@ -1 +1,2 @@ -val (@ReceiverTypeAnnotation kotlin.Long).prop: kotlin.Boolean \ No newline at end of file +val @ReceiverTypeAnnotation kotlin.Long.prop: kotlin.Boolean + get() \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.pretty.txt index a9eadce3ce4..f393abbf159 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.pretty.txt @@ -1 +1 @@ -fun Runnable(function: () -> kotlin.Unit): java.lang.Runnable +Runnable(function: () -> kotlin.Unit): java.lang.Runnable \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.pretty.txt b/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.pretty.txt index f9daad53a20..abfeaa8e99d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.pretty.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.pretty.txt @@ -1,2 +1,2 @@ -@ERROR +@`` class WithGeneratedCompanion \ No newline at end of file