Cleanup after review

+ stub builder test for multifile class

idea/testData/decompiler/decompiledTextJvm/MultifileClass.expected.kt

@@ -3,10 +3,18 @@
 
 package test
 
-public val p: kotlin.Int /* compiled code */
+public val val1b: kotlin.Int /* compiled code */
 
-public fun f(): kotlin.Unit { /* compiled code */ }
+private val kotlin.String.val2b: kotlin.Int /* compiled code */
 
-private var i: kotlin.Int /* compiled code */
+public fun fn1b(): kotlin.Unit { /* compiled code */ }
 
-public fun kotlin.Int.plus(i: kotlin.Int /* = compiled code */): kotlin.Int { /* compiled code */ }
+public fun kotlin.String.fn2b(): kotlin.Unit { /* compiled code */ }
+
+public val val1a: kotlin.Int /* compiled code */
+
+private val kotlin.String.val2a: kotlin.Int /* compiled code */
+
+public fun fn1a(): kotlin.Unit { /* compiled code */ }
+
+public fun kotlin.String.fn2a(): kotlin.Unit { /* compiled code */ }

idea/testData/decompiler/decompiledTextJvm/MultifileClass/MultifileClass.kt

@@ -2,9 +2,10 @@
 @file:JvmMultifileClass
 package test
 
-private var i = 2
-
-fun Int.plus(i: Int = 1) = this + i
+public val val1a = 42
+private val String.val2a: Int get() = 0
+public fun fn1a() {}
+public fun String.fn2a() {}
 
 class ShouldNotBeVisible1
 interface ShouldNotBeVisible2

idea/testData/decompiler/decompiledTextJvm/MultifileClass/andSomeMore.kt

@@ -2,5 +2,7 @@
 @file:JvmMultifileClass
 package test
 
-fun f() {}
-val p = 3
+public val val1b = 42
+private val String.val2b: Int get() = 0
+public fun fn1b() {}
+public fun String.fn2b() {}