Get rid of descriptors, resolved classifiers, + some cleanup

compiler/testData/fir/rawBuilder/declarations/F.txt

@@ -1,5 +1,5 @@
 FILE: F.kt
     public? open class A() {
     }
-    public? final? class B() : A {
+    public? final class B() : A {
     }

compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt

@@ -5,8 +5,8 @@ FILE: NestedOfAliasedType.kt
 
     }
     public? final typealias TA = A
-    public? final? class B() : TA {
-        public? final? class NestedInB() : Nested {
+    public? final class B() : TA {
+        public? final class NestedInB() : Nested {
         }
 
     }

compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt

@@ -7,8 +7,8 @@ FILE: NestedSuperType.kt
         }
 
     }
-    public? final? class Your() : My {
-        public? final? class NestedThree() : NestedOne {
+    public? final class Your() : My {
+        public? final class NestedThree() : NestedOne {
         }
 
     }

compiler/testData/fir/rawBuilder/declarations/complexTypes.txt

@@ -1,10 +1,10 @@
 FILE: complexTypes.kt
-    <T, out S> public? final? class C() {
-        <R, in P> public? final? class D(inner) {
+    <T, out S> public? final class C() {
+        <R, in P> public? final class D(inner) {
         }
 
     }
-    public? final? interface Test() {
+    public? abstract interface Test() {
         public? final? property x(val): a.b.C<out CharSequence, *>.D<in List<*>, *>
             public? get(): a.b.C<out CharSequence, *>.D<in List<*>, *>
 

compiler/testData/fir/rawBuilder/declarations/derivedClass.txt

@@ -3,7 +3,7 @@ FILE: derivedClass.kt
         public? constructor(x: T)
 
     }
-    <T : Any> public? final? class Derived() : Base<T> {
+    <T : Any> public? final class Derived() : Base<T> {
         public? constructor(x: T)STUB
 
     }

compiler/testData/fir/rawBuilder/declarations/enums.txt

@@ -1,5 +1,5 @@
 FILE: enums.kt
-    public? final? enum class Order() {
+    public? final enum class Order() {
         public? final enum entry FIRST() {
         }
 
@@ -10,7 +10,7 @@ FILE: enums.kt
         }
 
     }
-    public? final? enum class Planet() {
+    public? final enum class Planet() {
         public? constructor(m: Double, r: Double)
 
         public? final enum entry MERCURY() : Planet {
@@ -36,7 +36,7 @@ FILE: enums.kt
 
         public? abstract function sayHello(): <implicit>
 
-        public? final? object Companion(companion) {
+        public? final object Companion(companion) {
             public? final? const property G(val): <implicit> = STUB
                 public? get(): <implicit>
 

compiler/testData/fir/rawBuilder/declarations/enums2.txt

@@ -1,11 +1,11 @@
 FILE: enums2.kt
-    public? final? interface Some() {
+    public? abstract interface Some() {
     }
-    public? final? object O1() : Some {
+    public? final object O1() : Some {
     }
-    public? final? object O2() : Some {
+    public? final object O2() : Some {
     }
-    public? final? enum class SomeEnum() {
+    public? final enum class SomeEnum() {
         public? constructor(x: Some)
 
         public? final enum entry FIRST() : SomeEnum {

compiler/testData/fir/rawBuilder/declarations/expectActual.txt

@@ -1,10 +1,10 @@
 FILE: expectActual.kt
-    public? final? expect class MyClass() {
+    public? final expect class MyClass() {
     }
     public? final? expect function foo(): String
     public? final? expect property x(val): Int
         public? get(): Int
-    public? final? actual class MyClass() {
+    public? final actual class MyClass() {
     }
     public? final? actual function foo(): <implicit> {
         STUB

compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt

@@ -1,5 +1,5 @@
 FILE: genericFunctions.kt
-    public? final? interface Any() {
+    public? abstract interface Any() {
     }
     <reified T : Any> public? final? inline function safeAsAny.(): T? {
         STUB

compiler/testData/fir/rawBuilder/declarations/nestedClass.txt

@@ -3,13 +3,13 @@ FILE: nestedClass.kt
         public? constructor(s: String)
 
     }
-    public? final? class Outer() {
-        public? final? class Derived() : Base {
+    public? final class Outer() {
+        public? final class Derived() : Base {
             public? constructor(s: String)STUB
 
         }
 
-        public? final? object Obj() : Base {
+        public? final object Obj() : Base {
         }
 
     }

compiler/testData/fir/rawBuilder/declarations/simpleClass.txt

@@ -1,12 +1,12 @@
 FILE: simpleClass.kt
-    public? final? interface SomeInterface() {
+    public? abstract interface SomeInterface() {
         public? final? function foo(x: Int, y: String): String
 
         public? final? property bar(val): Boolean
             public? get(): Boolean
 
     }
-    public? final? class SomeClass() : SomeInterface {
+    public? final class SomeClass() : SomeInterface {
         private final? property baz(val): <implicit> = STUB
             public? get(): <implicit>
 

compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt

@@ -1,6 +1,6 @@
 FILE: simpleTypeAlias.kt
-    public? final? interface B() {
+    public? abstract interface B() {
     }
     public? final typealias C = B
-    public? final? class D() : C {
+    public? final class D() : C {
     }

compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt

@@ -1,8 +1,8 @@
 FILE: typeAliasWithGeneric.kt
     public? open class A() {
     }
-    <S, T : A> public? final? interface B() {
+    <S, T : A> public? abstract interface B() {
     }
     <T> public? final typealias C = B<T, A>
-    public? final? class D() : C<A> {
+    public? final class D() : C<A> {
     }

compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt

@@ -1,8 +1,8 @@
 FILE: typeParameterVsNested.kt
-    public? final? interface Some() {
+    public? abstract interface Some() {
     }
     <T : Some> public? abstract class My() {
-        public? final? class T(inner) {
+        public? final class T(inner) {
         }
 
         public? abstract property x(val): T
@@ -16,7 +16,7 @@ FILE: typeParameterVsNested.kt
         public? abstract property z(val): test.My.T
             public? get(): test.My.T
 
-        public? final? class Some() : T {
+        public? final class Some() : T {
         }
 
     }

compiler/testData/fir/rawBuilder/declarations/typeParameters.txt

@@ -1,5 +1,5 @@
 FILE: typeParameters.kt
-    <out T : Any> public? final? interface List() {
+    <out T : Any> public? abstract interface List() {
         public? final? operator function get(index: Int): T
 
         public? final? infix function concat(other: List<T>): List<T>
@@ -9,7 +9,7 @@ FILE: typeParameters.kt
     public? final typealias AnyList = List<*>
     <out T : Any> public? abstract class AbstractList() : List<T> {
     }
-    public? final? class SomeList() : AbstractList<Int> {
+    public? final class SomeList() : AbstractList<Int> {
         public? open? override function get(index: Int): Int {
             STUB
         }

compiler/testData/fir/resolve/F.txt

@@ -1,5 +1,5 @@
 FILE: F.kt
-    (resolved) public? open class A() {
+    public? open class A() {
     }
-    (resolved) public? final class B() : R/A/ {
+    public? final class B() : R/A/ {
     }

compiler/testData/fir/resolve/NestedOfAliasedType.txt

@@ -1,12 +1,12 @@
 FILE: NestedOfAliasedType.kt
-    (resolved) public? abstract class A() {
-        (resolved) public? abstract class Nested() {
+    public? abstract class A() {
+        public? abstract class Nested() {
         }
 
     }
-    (resolved) public? final typealias TA = R/A/
-    (resolved) public? final class B() : R/TA = A/ {
-        (resolved) public? final class NestedInB() : R/A.Nested/ {
+    public? final typealias TA = R/A/
+    public? final class B() : R/TA = A/ {
+        public? final class NestedInB() : R/A.Nested/ {
         }
 
     }

compiler/testData/fir/resolve/NestedSuperType.txt

@@ -1,14 +1,14 @@
 FILE: NestedSuperType.kt
-    (resolved) public? abstract class My() {
-        (resolved) public? abstract class NestedOne() : R/p/My/ {
-            (resolved) public? abstract class NestedTwo() : R/p/My.NestedOne/ {
+    public? abstract class My() {
+        public? abstract class NestedOne() : R/p/My/ {
+            public? abstract class NestedTwo() : R/p/My.NestedOne/ {
             }
 
         }
 
     }
-    (resolved) public? final class Your() : R/p/My/ {
-        (resolved) public? final class NestedThree() : R/p/My.NestedOne/ {
+    public? final class Your() : R/p/My/ {
+        public? final class NestedThree() : R/p/My.NestedOne/ {
         }
 
     }

compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt

@@ -1,5 +1,5 @@
 FILE: TwoDeclarationsInSameFile.kt
-    (resolved) public? open class A() {
+    public? open class A() {
     }
-    (resolved) public? final class B() : R/p/A/ {
+    public? final class B() : R/p/A/ {
     }

compiler/testData/fir/resolve/builtins/lists.txt

@@ -1,7 +1,7 @@
 FILE: lists.kt
-    (resolved) public? abstract class MyStringList() : R/kotlin/collections/List<kotlin/String>/ {
+    public? abstract class MyStringList() : R/kotlin/collections/List<kotlin/String>/ {
     }
-    (resolved) public? abstract class MyMutableStringList() : R/kotlin/collections/MutableList<kotlin/String>/ {
+    public? abstract class MyMutableStringList() : R/kotlin/collections/MutableList<kotlin/String>/ {
     }
     public? final? function convertR/kotlin/collections/List<kotlin/String>/.(): R/MyStringList/ {
         STUB

compiler/testData/fir/resolve/enum.txt

@@ -1,21 +1,21 @@
 FILE: enum.kt
-    (resolved) public? abstract interface Some() {
+    public? abstract interface Some() {
     }
-    (resolved) public? final object O1() : R/Some/ {
+    public? final object O1() : R/Some/ {
     }
-    (resolved) public? final object O2() : R/Some/ {
+    public? final object O2() : R/Some/ {
     }
-    (resolved) public? final enum class SomeEnum() {
+    public? final enum class SomeEnum() {
         public? constructor(x: R/Some/)
 
-        (resolved) public? final enum entry FIRST() : R/SomeEnum/ {
+        public? final enum entry FIRST() : R/SomeEnum/ {
             public? open? override function check(y: R/Some/): R/error: Symbol not found/ {
                 STUB
             }
 
         }
 
-        (resolved) public? final enum entry SECOND() : R/SomeEnum/ {
+        public? final enum entry SECOND() : R/SomeEnum/ {
             public? open? override function check(y: R/Some/): R/error: Symbol not found/ {
                 STUB
             }

compiler/testData/fir/resolve/genericFunctions.txt

@@ -1,10 +1,10 @@
 FILE: genericFunctions.kt
-    (resolved) public? abstract interface Any() {
+    public? abstract interface Any() {
     }
     <reified T : Any> public? final? inline function safeAsR/Any/.(): R/T/ {
         STUB
     }
-    (resolved) public? abstract class Summator() {
+    public? abstract class Summator() {
         <T> public? abstract function plus(first: R/T/, second: R/T/): R/T/
 
     }

compiler/testData/fir/resolve/multifile/NestedSuperType.txt

@@ -1,9 +1,9 @@
 FILE: NestedSuperType.kt
-    (resolved) public? final class A() : R/b/B/ {
-        (resolved) public? final class NestedInA1() : R/b/B.NestedInB/ {
+    public? final class A() : R/b/B/ {
+        public? final class NestedInA1() : R/b/B.NestedInB/ {
         }
 
-        (resolved) public? final class NestedInA2() : R/c/C.NestedInC/ {
+        public? final class NestedInA2() : R/c/C.NestedInC/ {
         }
 
     }

compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt

@@ -1,3 +1,3 @@
 FILE: TypeAliasExpansion.kt
-    (resolved) public? final class MyClass() : R/b/TA = b/A/ {
+    public? final class MyClass() : R/b/TA = b/A/ {
     }

compiler/testData/fir/resolve/multifile/sealedStarImport.txt

@@ -1,5 +1,5 @@
 FILE: sealedStarImport.kt
-    (resolved) public? abstract class Factory() {
+    public? abstract class Factory() {
         public? abstract function createTest(): R/error: Symbol not found/
 
         public? abstract function createObj(): R/test/Test.O/

compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt

@@ -1,3 +1,3 @@
 FILE: simpleAliasedImport.kt
-    (resolved) public? final class YourClass() : R/b/MyClass/ {
+    public? final class YourClass() : R/b/MyClass/ {
     }

compiler/testData/fir/resolve/multifile/simpleImport.txt

@@ -1,3 +1,3 @@
 FILE: simpleImport.kt
-    (resolved) public? final class YourClass() : R/b/MyClass/ {
+    public? final class YourClass() : R/b/MyClass/ {
     }

compiler/testData/fir/resolve/multifile/simpleImportNested.txt

@@ -1,3 +1,3 @@
 FILE: simpleImportNested.kt
-    (resolved) public? final class YourClass() : R/a/MyClass.MyNested/ {
+    public? final class YourClass() : R/a/MyClass.MyNested/ {
     }

compiler/testData/fir/resolve/multifile/simpleImportOuter.txt

@@ -1,3 +1,3 @@
 FILE: simpleImportOuter.kt
-    (resolved) public? final class My() : R/a/Outer.Nested/ {
+    public? final class My() : R/a/Outer.Nested/ {
     }

compiler/testData/fir/resolve/simpleClass.txt

@@ -1,12 +1,12 @@
 FILE: simpleClass.kt
-    (resolved) public? abstract interface SomeInterface() {
+    public? abstract interface SomeInterface() {
         public? final? function foo(x: R/kotlin/Int/, y: R/kotlin/String/): R/kotlin/String/
 
         public? final? property bar(val): R/kotlin/Boolean/
             public? get(): R/kotlin/Boolean/
 
     }
-    (resolved) public? final class SomeClass() : R/SomeInterface/ {
+    public? final class SomeClass() : R/SomeInterface/ {
         private final? property baz(val): R/error: Not supported: FirImplicitTypeImpl/ = STUB
             public? get(): R/error: Not supported: FirImplicitTypeImpl/
 

compiler/testData/fir/resolve/simpleTypeAlias.txt

@@ -1,6 +1,6 @@
 FILE: simpleTypeAlias.kt
-    (resolved) public? abstract interface B() {
+    public? abstract interface B() {
     }
-    (resolved) public? final typealias C = R/B/
-    (resolved) public? final class D() : R/C = B/ {
+    public? final typealias C = R/B/
+    public? final class D() : R/C = B/ {
     }

compiler/testData/fir/resolve/typeAliasWithGeneric.txt

@@ -1,8 +1,8 @@
 FILE: typeAliasWithGeneric.kt
-    (resolved) public? open class A() {
+    public? open class A() {
     }
-    (resolved) <(resolved) S, (resolved) T : R/A/> public? abstract interface B() {
+    <S, T : R/A/> public? abstract interface B() {
     }
-    (resolved) public? final class D() : R/C<A> = B<T, A>/ {
+    public? final class D() : R/C<A> = B<T, A>/ {
     }
-    (resolved) <(resolved) T> public? final typealias C = R/B<T, A>/
+    <T> public? final typealias C = R/B<T, A>/

compiler/testData/fir/resolve/typeParameterVsNested.txt

@@ -1,8 +1,8 @@
 FILE: typeParameterVsNested.kt
-    (resolved) public? abstract interface Some() {
+    public? abstract interface Some() {
     }
-    (resolved) <(resolved) T : R/test/Some/> public? abstract class My() {
-        (resolved) public? final class T(inner) {
+    <T : R/test/Some/> public? abstract class My() {
+        public? final class T(inner) {
         }
 
         public? abstract property x(val): R/T/
@@ -16,7 +16,7 @@ FILE: typeParameterVsNested.kt
         public? abstract property z(val): R/test/My.T/
             public? get(): R/test/My.T/
 
-        (resolved) public? final class Some() : R/test/My.T/ {
+        public? final class Some() : R/test/My.T/ {
         }
 
     }