diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt index 62accfa5ae2..0cceaca7f05 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt @@ -52,18 +52,18 @@ class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager) : CoreJ private lateinit var packagePartProviders: List private val topLevelClassesCache: MutableMap = THashMap() private val allScope = GlobalSearchScope.allScope(myPsiManager.project) - private var useFastClassFilesReading = false + private var usePsiClassFilesReading = false fun initialize( index: JvmDependenciesIndex, packagePartProviders: List, singleJavaFileRootsIndex: SingleJavaFileRootsIndex, - useFastClassFilesReading: Boolean + usePsiClassFilesReading: Boolean ) { this.index = index this.packagePartProviders = packagePartProviders this.singleJavaFileRootsIndex = singleJavaFileRootsIndex - this.useFastClassFilesReading = useFastClassFilesReading + this.usePsiClassFilesReading = usePsiClassFilesReading } private fun findPsiClass(classId: ClassId, searchScope: GlobalSearchScope): PsiClass? = perfCounter.time { @@ -88,7 +88,7 @@ class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager) : CoreJ val (classId, classFileContentFromRequest, outerClassFromRequest) = request val virtualFile = findVirtualFileForTopLevelClass(classId, searchScope) ?: return null - if (useFastClassFilesReading && virtualFile.extension == "class") { + if (!usePsiClassFilesReading && virtualFile.extension == "class") { // We return all class files' names in the directory in knownClassNamesInPackage method, so one may request an inner class return binaryCache.getOrPut(classId) { // Note that currently we implicitly suppose that searchScope for binary classes is constant and we do not use it diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 0272f58025d..305319d09bb 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -240,7 +240,7 @@ class KotlinCoreEnvironment private constructor( rootsIndex, packagePartProviders, SingleJavaFileRootsIndex(singleJavaFileRoots), - configuration.getBoolean(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING) + configuration.getBoolean(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING) ) project.registerService( diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt index d71af6c2c98..fd02751d1a8 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt @@ -186,7 +186,7 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr put(JVMConfigurationKeys.USE_TYPE_TABLE, arguments.useTypeTable) put(JVMConfigurationKeys.SKIP_RUNTIME_VERSION_CHECK, arguments.skipRuntimeVersionCheck) - put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, !arguments.useOldClassFilesReading) + put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, arguments.useOldClassFilesReading) if (arguments.useOldClassFilesReading) { getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt index 818a7550aea..98ea70afe94 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt @@ -105,7 +105,6 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { val configuration = KotlinTestUtils.newConfiguration(configurationKind, testJdkKind, moduleData.classpath, moduleData.javaSourceRoots) - configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true) configuration.addAll( CONTENT_ROOTS, moduleData.sources.filter { it.extension == "kt" }.map { KotlinSourceRoot(it.absolutePath, false) }) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt index f375b1ed6d5..facfedc1895 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt @@ -72,8 +72,6 @@ class NonFirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { ) } - configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true) - System.getProperty("fir.bench.oldfe.jvm_target")?.let { configuration.put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.fromString(it) ?: error("Unknown JvmTarget")) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java b/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java index ddd8465a4f1..b6535749ddd 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java @@ -96,8 +96,8 @@ public class JVMConfigurationKeys { public static final CompilerConfigurationKey IR = CompilerConfigurationKey.create("IR"); - public static final CompilerConfigurationKey USE_FAST_CLASS_FILES_READING = - CompilerConfigurationKey.create("use fast class files reading implementation [experimental]"); + public static final CompilerConfigurationKey USE_PSI_CLASS_FILES_READING = + CompilerConfigurationKey.create("use a slower (PSI-based) class files reading implementation"); public static final CompilerConfigurationKey USE_JAVAC = CompilerConfigurationKey.create("use javac [experimental]"); diff --git a/compiler/testData/builtin-classes/newMethods/kotlin.txt b/compiler/testData/builtin-classes/newMethods/kotlin.txt index 636588e0ba2..36220ae9bb9 100644 --- a/compiler/testData/builtin-classes/newMethods/kotlin.txt +++ b/compiler/testData/builtin-classes/newMethods/kotlin.txt @@ -762,7 +762,7 @@ public final class String : kotlin.Comparable, kotlin.CharSequenc public open class Throwable : kotlin.Any, java.io.Serializable { public constructor Throwable() - @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public constructor Throwable(/*0*/ x: kotlin.Double) + @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "This member is not fully supported by Kotlin compiler, so it may be absent or have different signature in next major version", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public constructor Throwable(/*0*/ p0: kotlin.Double) public constructor Throwable(/*0*/ message: kotlin.String?) /*primary*/ public constructor Throwable(/*0*/ message: kotlin.String?, /*1*/ cause: kotlin.Throwable?) public constructor Throwable(/*0*/ cause: kotlin.Throwable?) @@ -773,11 +773,11 @@ public open class Throwable : kotlin.Any, java.io.Serializable { public open fun fillInStackTrace(): kotlin.Throwable! public open fun getLocalizedMessage(): kotlin.String! public open fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>! - public open fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable! + public open fun initCause(/*0*/ p0: kotlin.Throwable!): kotlin.Throwable! public open fun printStackTrace(): kotlin.Unit - public open fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit - public open fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit - public open fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit + public open fun printStackTrace(/*0*/ p0: java.io.PrintStream!): kotlin.Unit + public open fun printStackTrace(/*0*/ p0: java.io.PrintWriter!): kotlin.Unit + public open fun setStackTrace(/*0*/ p0: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit } public object Unit { diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/divisionByZeroInJava.kt b/compiler/testData/codegen/boxAgainstJava/annotations/divisionByZeroInJava.kt index 692535b68f2..cf517081616 100644 --- a/compiler/testData/codegen/boxAgainstJava/annotations/divisionByZeroInJava.kt +++ b/compiler/testData/codegen/boxAgainstJava/annotations/divisionByZeroInJava.kt @@ -1,4 +1,4 @@ -// KOTLIN_CONFIGURATION_FLAGS: -JVM.USE_FAST_CLASS_FILES_READING +// KOTLIN_CONFIGURATION_FLAGS: +JVM.USE_PSI_CLASS_FILES_READING // FILE: J.java public @interface J { diff --git a/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt b/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt index 71ad45a470c..feaab7eb462 100644 --- a/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt +++ b/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt @@ -137,5 +137,5 @@ FILE fqName: fileName:/breakContinueInWhen.kt arg0: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null arg1: CONST String type=kotlin.String value="1;2;" then: THROW type=kotlin.Nothing - CONSTRUCTOR_CALL 'public constructor (detailMessage: kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null - detailMessage: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null + CONSTRUCTOR_CALL 'public constructor (p0: kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null + p0: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt b/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt index 3ddffe10a5f..8701f23b05f 100644 --- a/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt +++ b/compiler/testData/ir/irText/expressions/breakContinueInWhen.txt @@ -144,5 +144,5 @@ FILE fqName: fileName:/breakContinueInWhen.kt arg0: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null arg1: CONST String type=kotlin.String value="1;2;" then: THROW type=kotlin.Nothing - CONSTRUCTOR_CALL 'public constructor (detailMessage: kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null - detailMessage: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null + CONSTRUCTOR_CALL 'public constructor (p0: kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null + p0: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt index 1e5137aeaea..d923f65f0c7 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt @@ -19,9 +19,9 @@ FILE fqName: fileName:/coercionToUnit.kt element: CONST String type=kotlin.String value="" FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit? origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit? origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="Hello," - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit? origin=null + p0: CONST String type=kotlin.String value="Hello," + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit? origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="world!" + p0: CONST String type=kotlin.String value="world!" diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.txt index 05e5cdb0e35..bb5272a5955 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.txt @@ -33,9 +33,9 @@ FILE fqName: fileName:/coercionToUnit.kt then: CONST Null type=kotlin.Nothing? value=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + then: CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_VAR 'val tmp_0: java.io.PrintStream? [val] declared in .test3' type=java.io.PrintStream? origin=null - x: CONST String type=kotlin.String value="Hello," + p0: CONST String type=kotlin.String value="Hello," TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit BLOCK type=kotlin.Unit? origin=SAFE_CALL VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:java.io.PrintStream? [val] @@ -48,6 +48,6 @@ FILE fqName: fileName:/coercionToUnit.kt then: CONST Null type=kotlin.Nothing? value=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + then: CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_VAR 'val tmp_1: java.io.PrintStream? [val] declared in .test3' type=java.io.PrintStream? origin=null - x: CONST String type=kotlin.String value="world!" + p0: CONST String type=kotlin.String value="world!" diff --git a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt index 3b0aab7dfbf..f7841f19a32 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt @@ -2,5 +2,5 @@ FILE fqName: fileName:/implicitCastOnPlatformType.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test (): kotlin.String declared in ' - CALL 'public open fun getProperty (key: kotlin.String?): kotlin.String? declared in java.lang.System' type=kotlin.String? origin=null - key: CONST String type=kotlin.String value="test" + CALL 'public open fun getProperty (p0: kotlin.String?): kotlin.String? declared in java.lang.System' type=kotlin.String? origin=null + p0: CONST String type=kotlin.String value="test" diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt index 5917714f5fc..958ce03e82e 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt @@ -1,25 +1,25 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt FUN name:testFun visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="testFun" + p0: CONST String type=kotlin.String value="testFun" PROPERTY name:testProp visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Any correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="testProp/get" + p0: CONST String type=kotlin.String value="testProp/get" RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' CONST Int type=kotlin.Any value=42 FUN name: visibility:public modality:FINAL <> (value:kotlin.Any) returnType:kotlin.Unit correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Any BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="testProp/set" + p0: CONST String type=kotlin.String value="testProp/set" CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass CONSTRUCTOR visibility:public <> () returnType:.TestClass [primary] @@ -33,9 +33,9 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BRANCH if: CONST Boolean type=kotlin.Boolean value=true then: BLOCK type=kotlin.Int origin=null - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="TestClass/test" + p0: CONST String type=kotlin.String value="TestClass/test" CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestClass) returnType:kotlin.Int correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] @@ -46,9 +46,9 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt receiver: GET_VAR ': .TestClass declared in .TestClass.' type=.TestClass origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="TestClass/init" + p0: CONST String type=kotlin.String value="TestClass/init" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt index 7b6941a6a5c..661b0b62033 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt @@ -1,25 +1,25 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt FUN name:testFun visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="testFun" + p0: CONST String type=kotlin.String value="testFun" PROPERTY name:testProp visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Any correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="testProp/get" + p0: CONST String type=kotlin.String value="testProp/get" RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' CONST Int type=kotlin.Int value=42 FUN name: visibility:public modality:FINAL <> (value:kotlin.Any) returnType:kotlin.Unit correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Any BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="testProp/set" + p0: CONST String type=kotlin.String value="testProp/set" CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass CONSTRUCTOR visibility:public <> () returnType:.TestClass [primary] @@ -33,9 +33,9 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BRANCH if: CONST Boolean type=kotlin.Boolean value=true then: BLOCK type=kotlin.Int origin=null - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="TestClass/test" + p0: CONST String type=kotlin.String value="TestClass/test" CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestClass) returnType:kotlin.Int correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] @@ -46,9 +46,9 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt receiver: GET_VAR ': .TestClass declared in .TestClass.' type=.TestClass origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null + CALL 'public open fun println (p0: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:java.io.PrintStream? visibility:public [final,static]' type=java.io.PrintStream? origin=GET_PROPERTY - x: CONST String type=kotlin.String value="TestClass/init" + p0: CONST String type=kotlin.String value="TestClass/init" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any diff --git a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.fast.txt b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.psi.txt similarity index 72% rename from compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.fast.txt rename to compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.psi.txt index 2a349bea6ea..892737dbb16 100644 --- a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.fast.txt +++ b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.psi.txt @@ -4,8 +4,8 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { public constructor ClassDoesNotOverrideMethod() invisible_fake final override /*1*/ /*fake_override*/ var cdate: sun.util.calendar.BaseCalendar.Date! invisible_fake final override /*1*/ /*fake_override*/ var fastTime: kotlin.Long - public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date!): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date!): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun after(/*0*/ `when`: java.util.Date!): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun before(/*0*/ `when`: java.util.Date!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date! @@ -20,18 +20,18 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date! - invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date! - invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ date: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date! + invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ s: java.io.ObjectInputStream!): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ date: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ hours: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ minutes: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ month: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ seconds: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ time: kotlin.Long): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ year: kotlin.Int): kotlin.Unit @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String! @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ s: java.io.ObjectOutputStream!): kotlin.Unit // Static members invisible_fake final override /*1*/ /*fake_override*/ var defaultCenturyStart: kotlin.Int @@ -40,12 +40,12 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { invisible_fake const final override /*1*/ /*fake_override*/ val serialVersionUID: kotlin.Long = 7523967970034938905.toLong() invisible_fake final override /*1*/ /*fake_override*/ val ttb: kotlin.IntArray! invisible_fake final override /*1*/ /*fake_override*/ val wtb: kotlin.Array<(out) kotlin.String!>! - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun UTC(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int, /*3*/ p3: kotlin.Int, /*4*/ p4: kotlin.Int, /*5*/ p5: kotlin.Int): kotlin.Long - invisible_fake final override /*1*/ /*fake_override*/ fun convertToAbbr(/*0*/ p0: java.lang.StringBuilder!, /*1*/ p1: kotlin.String!): java.lang.StringBuilder! - invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ p0: kotlin.Int): sun.util.calendar.BaseCalendar! - invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ p0: kotlin.Long): sun.util.calendar.BaseCalendar! - invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar! + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun UTC(/*0*/ year: kotlin.Int, /*1*/ month: kotlin.Int, /*2*/ date: kotlin.Int, /*3*/ hrs: kotlin.Int, /*4*/ min: kotlin.Int, /*5*/ sec: kotlin.Int): kotlin.Long + invisible_fake final override /*1*/ /*fake_override*/ fun convertToAbbr(/*0*/ sb: java.lang.StringBuilder!, /*1*/ name: kotlin.String!): java.lang.StringBuilder! + invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ year: kotlin.Int): sun.util.calendar.BaseCalendar! + invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ utc: kotlin.Long): sun.util.calendar.BaseCalendar! + invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ cdate: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar! invisible_fake final override /*1*/ /*fake_override*/ fun getJulianCalendar(): sun.util.calendar.BaseCalendar! - invisible_fake final override /*1*/ /*fake_override*/ fun getMillisOf(/*0*/ p0: java.util.Date!): kotlin.Long - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun parse(/*0*/ p0: kotlin.String!): kotlin.Long + invisible_fake final override /*1*/ /*fake_override*/ fun getMillisOf(/*0*/ date: java.util.Date!): kotlin.Long + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun parse(/*0*/ s: kotlin.String!): kotlin.Long } diff --git a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt index 892737dbb16..2a349bea6ea 100644 --- a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt +++ b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt @@ -4,8 +4,8 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { public constructor ClassDoesNotOverrideMethod() invisible_fake final override /*1*/ /*fake_override*/ var cdate: sun.util.calendar.BaseCalendar.Date! invisible_fake final override /*1*/ /*fake_override*/ var fastTime: kotlin.Long - public open override /*1*/ /*fake_override*/ fun after(/*0*/ `when`: java.util.Date!): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun before(/*0*/ `when`: java.util.Date!): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date!): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date! @@ -20,18 +20,18 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date! - invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ date: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date! - invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ s: java.io.ObjectInputStream!): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ date: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ hours: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ minutes: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ month: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ seconds: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ time: kotlin.Long): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ year: kotlin.Int): kotlin.Unit + invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date! + invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String! @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ s: java.io.ObjectOutputStream!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit // Static members invisible_fake final override /*1*/ /*fake_override*/ var defaultCenturyStart: kotlin.Int @@ -40,12 +40,12 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { invisible_fake const final override /*1*/ /*fake_override*/ val serialVersionUID: kotlin.Long = 7523967970034938905.toLong() invisible_fake final override /*1*/ /*fake_override*/ val ttb: kotlin.IntArray! invisible_fake final override /*1*/ /*fake_override*/ val wtb: kotlin.Array<(out) kotlin.String!>! - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun UTC(/*0*/ year: kotlin.Int, /*1*/ month: kotlin.Int, /*2*/ date: kotlin.Int, /*3*/ hrs: kotlin.Int, /*4*/ min: kotlin.Int, /*5*/ sec: kotlin.Int): kotlin.Long - invisible_fake final override /*1*/ /*fake_override*/ fun convertToAbbr(/*0*/ sb: java.lang.StringBuilder!, /*1*/ name: kotlin.String!): java.lang.StringBuilder! - invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ year: kotlin.Int): sun.util.calendar.BaseCalendar! - invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ utc: kotlin.Long): sun.util.calendar.BaseCalendar! - invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ cdate: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar! + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun UTC(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int, /*3*/ p3: kotlin.Int, /*4*/ p4: kotlin.Int, /*5*/ p5: kotlin.Int): kotlin.Long + invisible_fake final override /*1*/ /*fake_override*/ fun convertToAbbr(/*0*/ p0: java.lang.StringBuilder!, /*1*/ p1: kotlin.String!): java.lang.StringBuilder! + invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ p0: kotlin.Int): sun.util.calendar.BaseCalendar! + invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ p0: kotlin.Long): sun.util.calendar.BaseCalendar! + invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarSystem(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar! invisible_fake final override /*1*/ /*fake_override*/ fun getJulianCalendar(): sun.util.calendar.BaseCalendar! - invisible_fake final override /*1*/ /*fake_override*/ fun getMillisOf(/*0*/ date: java.util.Date!): kotlin.Long - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun parse(/*0*/ s: kotlin.String!): kotlin.Long + invisible_fake final override /*1*/ /*fake_override*/ fun getMillisOf(/*0*/ p0: java.util.Date!): kotlin.Long + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun parse(/*0*/ p0: kotlin.String!): kotlin.Long } diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fast.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.psi.txt similarity index 57% rename from compiler/testData/loadJava/compiledJava/TopLevel$Class.fast.txt rename to compiler/testData/loadJava/compiledJava/TopLevel$Class.psi.txt index eb2c9438366..8d0d3e3dd3e 100644 --- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fast.txt +++ b/compiler/testData/loadJava/compiledJava/TopLevel$Class.psi.txt @@ -2,5 +2,5 @@ package test public open class `TopLevel$Class` { public constructor `TopLevel$Class`() - public open fun foo(/*0*/ p0: test.`TopLevel$Class`!): kotlin.Unit + public open fun foo(/*0*/ p0: test.TopLevel.Class!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.txt index 8d0d3e3dd3e..eb2c9438366 100644 --- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.txt +++ b/compiler/testData/loadJava/compiledJava/TopLevel$Class.txt @@ -2,5 +2,5 @@ package test public open class `TopLevel$Class` { public constructor `TopLevel$Class`() - public open fun foo(/*0*/ p0: test.TopLevel.Class!): kotlin.Unit + public open fun foo(/*0*/ p0: test.`TopLevel$Class`!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.fast.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.psi.txt similarity index 56% rename from compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.fast.txt rename to compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.psi.txt index a33d3007c4f..f50535322e7 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.fast.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.psi.txt @@ -9,6 +9,6 @@ public/*package*/ open class AnnotatedParameterInInnerClassConstructor { } public/*package*/ open inner class JavaEnum { - public/*package*/ constructor JavaEnum(/*0*/ p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) + public/*package*/ constructor JavaEnum(/*0*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.txt index f50535322e7..a33d3007c4f 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInEnumClassConstructor.txt @@ -9,6 +9,6 @@ public/*package*/ open class AnnotatedParameterInInnerClassConstructor { } public/*package*/ open inner class JavaEnum { - public/*package*/ constructor JavaEnum(/*0*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) + public/*package*/ constructor JavaEnum(/*0*/ p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fast.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.psi.txt similarity index 57% rename from compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fast.txt rename to compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.psi.txt index 505a1634936..868534de5df 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fast.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.psi.txt @@ -2,7 +2,7 @@ package test public/*package*/ open class AnnotatedTypeInFun { public/*package*/ constructor AnnotatedTypeInFun() - public/*package*/ open fun foo(/*0*/ p0: @test.AnnotatedTypeInFun.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedTypeInFun.Anno(value = "b") kotlin.String!): kotlin.Unit + public/*package*/ open fun foo(/*0*/ @test.AnnotatedTypeInFun.Anno(value = "a") p0: @test.AnnotatedTypeInFun.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedTypeInFun.Anno(value = "b") p1: @test.AnnotatedTypeInFun.Anno(value = "b") kotlin.String!): kotlin.Unit @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.txt index 868534de5df..505a1634936 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.txt @@ -2,7 +2,7 @@ package test public/*package*/ open class AnnotatedTypeInFun { public/*package*/ constructor AnnotatedTypeInFun() - public/*package*/ open fun foo(/*0*/ @test.AnnotatedTypeInFun.Anno(value = "a") p0: @test.AnnotatedTypeInFun.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedTypeInFun.Anno(value = "b") p1: @test.AnnotatedTypeInFun.Anno(value = "b") kotlin.String!): kotlin.Unit + public/*package*/ open fun foo(/*0*/ p0: @test.AnnotatedTypeInFun.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedTypeInFun.Anno(value = "b") kotlin.String!): kotlin.Unit @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class Anno : kotlin.Annotation { public constructor Anno(/*0*/ value: kotlin.String) diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.fast.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.fast.txt deleted file mode 100644 index d55b0caa786..00000000000 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.fast.txt +++ /dev/null @@ -1,18 +0,0 @@ -package test - -public/*package*/ open class AnnotatedParameterInInnerClassConstructor { - public/*package*/ constructor AnnotatedParameterInInnerClassConstructor() - - @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class Anno : kotlin.Annotation { - public constructor Anno(/*0*/ value: kotlin.String) - public final val value: kotlin.String - } - - public/*package*/ open inner class Inner { - public/*package*/ constructor Inner(/*0*/ p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) - } - - public/*package*/ open inner class InnerGeneric { - public/*package*/ constructor InnerGeneric(/*0*/ p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) - } -} diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.psi.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.psi.txt new file mode 100644 index 00000000000..9a6c11e322a --- /dev/null +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.psi.txt @@ -0,0 +1,18 @@ +package test + +public/*package*/ open class AnnotatedParameterInInnerClassConstructor { + public/*package*/ constructor AnnotatedParameterInInnerClassConstructor() + + @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class Anno : kotlin.Annotation { + public constructor Anno(/*0*/ value: kotlin.String) + public final val value: kotlin.String + } + + public/*package*/ open inner class Inner { + public/*package*/ constructor Inner(/*0*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) + } + + public/*package*/ open inner class InnerGeneric { + public/*package*/ constructor InnerGeneric(/*0*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) + } +} diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.txt index 9a6c11e322a..d55b0caa786 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInInnerClassConstructor.txt @@ -9,10 +9,10 @@ public/*package*/ open class AnnotatedParameterInInnerClassConstructor { } public/*package*/ open inner class Inner { - public/*package*/ constructor Inner(/*0*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) + public/*package*/ constructor Inner(/*0*/ p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) } public/*package*/ open inner class InnerGeneric { - public/*package*/ constructor InnerGeneric(/*0*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) + public/*package*/ constructor InnerGeneric(/*0*/ p0: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "a") kotlin.String!, /*1*/ p1: @test.AnnotatedParameterInInnerClassConstructor.Anno(value = "b") kotlin.String!) } } diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fast.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.psi.txt similarity index 86% rename from compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fast.txt rename to compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.psi.txt index feeb39b6f00..98aaf68ade1 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fast.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.psi.txt @@ -18,20 +18,20 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ index: kotlin.Int): kotlin.String! + invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ index: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String! - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String! public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>! - public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! + public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! // Static members invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int = 2147483639 - invisible_fake open override /*1*/ /*fake_override*/ fun finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>! - invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int + invisible_fake open override /*1*/ /*fake_override*/ fun finishToArray(/*0*/ r: kotlin.Array<(out) T!>!, /*1*/ it: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>! + invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ minCapacity: kotlin.Int): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt index 98aaf68ade1..feeb39b6f00 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt @@ -18,20 +18,20 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ index: kotlin.Int): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ index: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String! + invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String! + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String! public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>! - public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! + public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! // Static members invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int = 2147483639 - invisible_fake open override /*1*/ /*fake_override*/ fun finishToArray(/*0*/ r: kotlin.Array<(out) T!>!, /*1*/ it: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>! - invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ minCapacity: kotlin.Int): kotlin.Int + invisible_fake open override /*1*/ /*fake_override*/ fun finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>! + invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt index 4e7c73b4d84..4e2aa7b5519 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt @@ -1,5 +1,6 @@ // FULL_JDK // JAVAC_EXPECTED_FILE +// NO_CHECK_SOURCE_VS_BINARY package test diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt index 03f49b3d056..90f7564924d 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt @@ -4,8 +4,8 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { /*primary*/ public constructor ClassDoesNotOverrideMethod() invisible_fake final override /*1*/ /*fake_override*/ var cdate: sun.util.calendar.BaseCalendar.Date! invisible_fake final override /*1*/ /*fake_override*/ var fastTime: kotlin.Long - public open override /*1*/ /*fake_override*/ fun after(/*0*/ `when`: java.util.Date!): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun before(/*0*/ `when`: java.util.Date!): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date!): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date! @@ -20,16 +20,16 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date! - invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ date: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date! - invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ s: java.io.ObjectInputStream!): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ date: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ hours: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ minutes: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ month: kotlin.Int): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ seconds: kotlin.Int): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ time: kotlin.Long): kotlin.Unit - @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ year: kotlin.Int): kotlin.Unit + invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date! + invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: kotlin.Int): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit + @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String! @kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ s: java.io.ObjectOutputStream!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt index 107d6e16d36..626bb8bbeec 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt @@ -1,5 +1,6 @@ // FULL_JDK // JAVAC_EXPECTED_FILE +// NO_CHECK_SOURCE_VS_BINARY package test diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt index 2ef5d1c98fa..620f0f8ec8c 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt @@ -19,15 +19,15 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ index: kotlin.Int): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ index: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String! + invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String! - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String! + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String! public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>! - public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! + public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! } diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt index 1947b33c2db..96e29e1ba2d 100644 --- a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt @@ -1,5 +1,7 @@ // FULL_JDK // JAVAC_EXPECTED_FILE +// NO_CHECK_SOURCE_VS_BINARY + package test class C: java.util.ArrayList() diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt index 3052d2a5337..509e6a1703e 100644 --- a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt @@ -11,37 +11,37 @@ public final class C : java.util.ArrayList { public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ c: kotlin.collections.(Mutable)Collection<*>!, /*1*/ complement: kotlin.Boolean): kotlin.Boolean + invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ index: kotlin.Int): kotlin.String! - public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ minCapacity: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ minCapacity: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun ensureExplicitCapacity(/*0*/ minCapacity: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun fastRemove(/*0*/ index: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String! + public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun ensureExplicitCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun fastRemove(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String - invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ minCapacity: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ index: kotlin.Int): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ index: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ index: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ s: java.io.ObjectInputStream!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String! + invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>! - public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! + public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ s: java.io.ObjectOutputStream!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt index c20e5f40877..265ba1a6d1d 100644 --- a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt @@ -1,5 +1,7 @@ // FULL_JDK // JAVAC_EXPECTED_FILE +// NO_CHECK_SOURCE_VS_BINARY + package test class C: java.util.ArrayList() diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt index 4107b815fd9..59aa0f731ab 100644 --- a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt @@ -11,37 +11,37 @@ public final class C : java.util.ArrayList { public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ c: kotlin.collections.(Mutable)Collection<*>!, /*1*/ complement: kotlin.Boolean): kotlin.Boolean + invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ index: kotlin.Int): kotlin.String? - public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ minCapacity: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ minCapacity: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun ensureExplicitCapacity(/*0*/ minCapacity: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun fastRemove(/*0*/ index: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String? + public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun ensureExplicitCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun fastRemove(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String? - invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ minCapacity: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String?): kotlin.Int public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator - invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ index: kotlin.Int): kotlin.String! - invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ index: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ index: kotlin.Int): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ s: java.io.ObjectInputStream!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String! + invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String? - protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String? + protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String?): kotlin.String? public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>! - public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! + public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit - invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ s: java.io.ObjectOutputStream!): kotlin.Unit + invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit } diff --git a/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.fast.txt b/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.psi.txt similarity index 51% rename from compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.fast.txt rename to compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.psi.txt index 5e4ceb48ec3..a0cb256777a 100644 --- a/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.fast.txt +++ b/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.psi.txt @@ -8,7 +8,7 @@ public open class InnerClassTypeAnnotation { } public open inner class Inner { - public constructor Inner(/*0*/ p0: @test.InnerClassTypeAnnotation.Foo kotlin.String!) - public open fun bar(/*0*/ p0: kotlin.String!, /*1*/ p1: @test.InnerClassTypeAnnotation.Foo kotlin.String!): @test.InnerClassTypeAnnotation.Foo kotlin.String! + public constructor Inner(/*0*/ @test.InnerClassTypeAnnotation.Foo p0: @test.InnerClassTypeAnnotation.Foo kotlin.String!) + @test.InnerClassTypeAnnotation.Foo public open fun bar(/*0*/ p0: kotlin.String!, /*1*/ @test.InnerClassTypeAnnotation.Foo p1: @test.InnerClassTypeAnnotation.Foo kotlin.String!): @test.InnerClassTypeAnnotation.Foo kotlin.String! } } diff --git a/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.txt b/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.txt index a0cb256777a..5e4ceb48ec3 100644 --- a/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.txt +++ b/compiler/testData/loadJava8/compiledJava/InnerClassTypeAnnotation.txt @@ -8,7 +8,7 @@ public open class InnerClassTypeAnnotation { } public open inner class Inner { - public constructor Inner(/*0*/ @test.InnerClassTypeAnnotation.Foo p0: @test.InnerClassTypeAnnotation.Foo kotlin.String!) - @test.InnerClassTypeAnnotation.Foo public open fun bar(/*0*/ p0: kotlin.String!, /*1*/ @test.InnerClassTypeAnnotation.Foo p1: @test.InnerClassTypeAnnotation.Foo kotlin.String!): @test.InnerClassTypeAnnotation.Foo kotlin.String! + public constructor Inner(/*0*/ p0: @test.InnerClassTypeAnnotation.Foo kotlin.String!) + public open fun bar(/*0*/ p0: kotlin.String!, /*1*/ p1: @test.InnerClassTypeAnnotation.Foo kotlin.String!): @test.InnerClassTypeAnnotation.Foo kotlin.String! } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest.kt similarity index 85% rename from compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest.kt index 475529e2a9b..57f367d07ff 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest.kt @@ -19,9 +19,10 @@ package org.jetbrains.kotlin.checkers import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys -abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest : AbstractForeignAnnotationsNoAnnotationInClasspathTest() { +abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest : + AbstractForeignAnnotationsNoAnnotationInClasspathTest() { override fun performCustomConfiguration(configuration: CompilerConfiguration) { super.performCustomConfiguration(configuration) - configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true) + configuration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true) } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt index edc620bf577..16d37c7a90f 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt @@ -34,7 +34,8 @@ abstract class AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest : Abst } } -abstract class AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTest : AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest() { +abstract class AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest : + AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest() { override val annotationsPath: String get() = JAVA8_ANNOTATION_SOURCES_PATH diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java index b4d8f51d5f7..7f6d84c1ec4 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.JVMConfigurationKeys; import org.jetbrains.kotlin.parsing.KotlinParserDefinition; import org.jetbrains.kotlin.test.*; import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase; @@ -71,6 +72,10 @@ public abstract class KotlinMultiFileTestWithJava extends KtUsefulTestCase ContentRootsKt.addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath()); } + // Currently, we're testing IDE behavior when generating the .txt files for comparison, but this can be changed. + // The main difference is the fact that the new class file reading implementation doesn't load parameter names from JDK classes. + configuration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true); + performCustomConfiguration(configuration); return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles()); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt index 072c5c51f89..df1978abae9 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot import org.jetbrains.kotlin.config.CompilerConfiguration -import org.jetbrains.kotlin.config.JVMConfigurationKeys import java.io.File abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() { @@ -37,10 +36,5 @@ abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenT override fun updateConfiguration(configuration: CompilerConfiguration) { configuration.addJvmClasspathRoot(javaClassesOutputDirectory) - - if (configuration.get(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING) == null) { - // By default (unless disabled in the test with a directive), use the fast class reading mode - configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true) - } } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt index 433f09db20a..915e0118b9f 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt @@ -80,11 +80,9 @@ abstract class AbstractCompileJavaAgainstKotlinTest : TestCaseWithTmpdir() { if (!compiledSuccessfully) return - val environment = KotlinCoreEnvironment.createForTests( - testRootDisposable, - newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK, getAnnotationsJar(), out), - EnvironmentConfigFiles.JVM_CONFIG_FILES - ) + val configuration = newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK, getAnnotationsJar(), out) + configuration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true) + val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) setupLanguageVersionSettingsForCompilerTests(ktFile.readText(), environment) val analysisResult = JvmResolveUtil.analyze(environment) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index f7f925d186f..61f21639325 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -180,7 +180,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { } } - protected boolean useFastClassFilesReading() { + protected boolean usePsiClassFilesReading() { return false; } @@ -310,7 +310,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { ) throws IOException { compileJavaWithAnnotationsJar(javaFiles, outDir); return loadTestPackageAndBindingContextFromJavaRoot(outDir, myTestRootDisposable, getJdkKind(), configurationKind, true, - useFastClassFilesReading(), useJavacWrapper(), null, + usePsiClassFilesReading(), useJavacWrapper(), null, getExtraClasspath(), this::configureEnvironment); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithPsiClassReadingTest.kt similarity index 84% rename from compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithPsiClassReadingTest.kt index 64d6b133169..07bd9e3a0ae 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithPsiClassReadingTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -abstract class AbstractLoadJavaWithFastClassReadingTest : AbstractLoadJavaTest() { - override fun useFastClassFilesReading() = true +abstract class AbstractLoadJavaWithPsiClassReadingTest : AbstractLoadJavaTest() { + override fun usePsiClassFilesReading() = true override fun getExpectedFile(expectedFileName: String): File { - val differentResultFile = KotlinTestUtils.replaceExtension(File(expectedFileName), "fast.txt") + val differentResultFile = KotlinTestUtils.replaceExtension(File(expectedFileName), "psi.txt") if (differentResultFile.exists()) return differentResultFile return super.getExpectedFile(expectedFileName) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java index 1ebcd11146e..e5291ecc78f 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java @@ -78,7 +78,7 @@ public class LoadDescriptorUtil { @NotNull TestJdkKind testJdkKind, @NotNull ConfigurationKind configurationKind, boolean isBinaryRoot, - boolean useFastClassReading, + boolean usePsiClassReading, boolean useJavacWrapper, @Nullable LanguageVersionSettings explicitLanguageVersionSettings ) { @@ -88,7 +88,7 @@ public class LoadDescriptorUtil { testJdkKind, configurationKind, isBinaryRoot, - useFastClassReading, + usePsiClassReading, useJavacWrapper, explicitLanguageVersionSettings, Collections.emptyList(), @@ -103,7 +103,7 @@ public class LoadDescriptorUtil { @NotNull TestJdkKind testJdkKind, @NotNull ConfigurationKind configurationKind, boolean isBinaryRoot, - boolean useFastClassReading, + boolean usePsiClassReading, boolean useJavacWrapper, @Nullable LanguageVersionSettings explicitLanguageVersionSettings, @NotNull List additionalClasspath, @@ -125,7 +125,7 @@ public class LoadDescriptorUtil { } CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(configurationKind, testJdkKind, javaBinaryRoots, javaSourceRoots); - configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, useFastClassReading); + configuration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, usePsiClassReading); configuration.put(JVMConfigurationKeys.USE_JAVAC, useJavacWrapper); if (explicitLanguageVersionSettings != null) { configuration.put(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, explicitLanguageVersionSettings); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/ir/AbstractIrLoadJavaTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/ir/AbstractIrLoadJavaTest.kt index 9b8daffe9b0..f5afa185bba 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/ir/AbstractIrLoadJavaTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/ir/AbstractIrLoadJavaTest.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.jvm.compiler.ir import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys -import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJavaWithFastClassReadingTest +import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJavaWithPsiClassReadingTest -abstract class AbstractIrLoadJavaTest : AbstractLoadJavaWithFastClassReadingTest() { +abstract class AbstractIrLoadJavaTest : AbstractLoadJavaWithPsiClassReadingTest() { override fun updateConfiguration(configuration: CompilerConfiguration) = configuration.put(JVMConfigurationKeys.IR, true) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java index 313cd1d3115..7832ca5c5b3 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java @@ -7,12 +7,12 @@ package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.JVMConfigurationKeys; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; -import org.jetbrains.kotlin.test.TestFiles; +import org.jetbrains.kotlin.test.*; import java.io.File; import java.util.List; @@ -23,7 +23,9 @@ public abstract class ExtensibleResolveTestCase extends KotlinTestWithEnvironmen @Override protected KotlinCoreEnvironment createEnvironment() { - return createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY); + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK); + configuration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true); + return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); } @Override diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java similarity index 95% rename from compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated.java rename to compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java index bbc698b07d9..06afbc02a0e 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class ForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTest { +public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -46,7 +46,7 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingT @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Jsr305 extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class Jsr305 extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -84,7 +84,7 @@ public class ForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingT @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeEnhancement extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class TypeEnhancement extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt index 16b2c6effaf..c2ead6b73bd 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt @@ -17,15 +17,12 @@ package org.jetbrains.kotlin.generators.tests import org.jetbrains.kotlin.checkers.AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest -import org.jetbrains.kotlin.checkers.AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithFastClassReadingTest +import org.jetbrains.kotlin.checkers.AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest import org.jetbrains.kotlin.checkers.AbstractForeignJava8AnnotationsTest import org.jetbrains.kotlin.checkers.javac.AbstractJavacForeignJava8AnnotationsTest -import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest -import org.jetbrains.kotlin.codegen.AbstractCompileKotlinAgainstKotlinTest -import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest import org.jetbrains.kotlin.generators.tests.generator.testGroup import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8Test -import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8WithFastClassReadingTest +import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8WithPsiClassReadingTest import org.jetbrains.kotlin.jvm.compiler.javac.AbstractLoadJava8UsingJavacTest import org.jetbrains.kotlin.resolve.calls.AbstractEnhancedSignaturesResolvedCallsTest @@ -45,7 +42,7 @@ fun main(args: Array) { model("foreignAnnotationsJava8/tests") } - testClass { + testClass { model("foreignAnnotationsJava8/tests") } @@ -59,7 +56,7 @@ fun main(args: Array) { model("loadJava8/sourceJava", extension = "java", testMethod = "doTestSourceJava") } - testClass { + testClass { model("loadJava8/compiledJava", extension = "java", testMethod = "doTestCompiledJava") } diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8WithFastClassReadingTest.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8WithPsiClassReadingTest.kt similarity index 87% rename from compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8WithFastClassReadingTest.kt rename to compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8WithPsiClassReadingTest.kt index 5d46c979330..f6fc387ccb5 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8WithFastClassReadingTest.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8WithPsiClassReadingTest.kt @@ -18,6 +18,6 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.kotlin.test.TestJdkKind -abstract class AbstractLoadJava8WithFastClassReadingTest : AbstractLoadJavaWithFastClassReadingTest() { +abstract class AbstractLoadJava8WithPsiClassReadingTest : AbstractLoadJavaWithPsiClassReadingTest() { override fun getJdkKind() = TestJdkKind.FULL_JDK } diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/LoadJava8WithFastClassReadingTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/LoadJava8WithPsiClassReadingTestGenerated.java similarity index 95% rename from compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/LoadJava8WithFastClassReadingTestGenerated.java rename to compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/LoadJava8WithPsiClassReadingTestGenerated.java index 15343c7965a..0d3cd6494ed 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/LoadJava8WithFastClassReadingTestGenerated.java +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/LoadJava8WithPsiClassReadingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/loadJava8/compiledJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class LoadJava8WithFastClassReadingTestGenerated extends AbstractLoadJava8WithFastClassReadingTest { +public class LoadJava8WithPsiClassReadingTestGenerated extends AbstractLoadJava8WithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java similarity index 97% rename from compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java index 99042316309..3a935cbfd1f 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/foreignAnnotations/tests") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGenerated extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { +public class ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -86,7 +86,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -118,7 +118,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Ignore extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class Ignore extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -136,7 +136,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -183,7 +183,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FromPlatformTypes extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class FromPlatformTypes extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -296,7 +296,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -350,7 +350,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -409,7 +409,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -421,7 +421,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Migration extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class Migration extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @@ -480,7 +480,7 @@ public class ForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTestGe @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest { + public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt index 4e3ebb03651..e0e25beab9d 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt @@ -206,7 +206,7 @@ class KotlinCliJavaFileManagerTest : KotlinTestWithEnvironment() { JvmDependenciesIndexImpl(listOf(JavaRoot(root, JavaRoot.RootType.SOURCE))), emptyList(), SingleJavaFileRootsIndex(emptyList()), - useFastClassFilesReading = true + usePsiClassFilesReading = false ) return coreJavaFileManager diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index fde1c808f50..248e2825539 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -127,7 +127,7 @@ fun main(args: Array) { model("foreignAnnotations/tests") } - testClass { + testClass { model("foreignAnnotations/tests") } @@ -278,7 +278,7 @@ fun main(args: Array) { model("loadJava/compiledKotlin") } - testClass { + testClass { model("loadJava/compiledJava", extension = "java", testMethod = "doTestCompiledJava") } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaWithFastClassReadingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaWithPsiClassReadingTestGenerated.java similarity index 98% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaWithFastClassReadingTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaWithPsiClassReadingTestGenerated.java index 660c2b71157..035310b0b14 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaWithFastClassReadingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaWithPsiClassReadingTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/loadJava/compiledJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaWithFastClassReadingTest { +public class LoadJavaWithPsiClassReadingTestGenerated extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -256,7 +256,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/annotations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Annotations extends AbstractLoadJavaWithFastClassReadingTest { + public static class Annotations extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -459,7 +459,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/constructor") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Constructor extends AbstractLoadJavaWithFastClassReadingTest { + public static class Constructor extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -487,7 +487,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/enum") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Enum extends AbstractLoadJavaWithFastClassReadingTest { + public static class Enum extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -515,7 +515,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/javaBean") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaBean extends AbstractLoadJavaWithFastClassReadingTest { + public static class JavaBean extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -558,7 +558,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinSignature extends AbstractLoadJavaWithFastClassReadingTest { + public static class KotlinSignature extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -650,7 +650,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Error extends AbstractLoadJavaWithFastClassReadingTest { + public static class Error extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -683,7 +683,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Propagation extends AbstractLoadJavaWithFastClassReadingTest { + public static class Propagation extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -700,7 +700,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Parameter extends AbstractLoadJavaWithFastClassReadingTest { + public static class Parameter extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -823,7 +823,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Return extends AbstractLoadJavaWithFastClassReadingTest { + public static class Return extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1006,7 +1006,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeParameter extends AbstractLoadJavaWithFastClassReadingTest { + public static class TypeParameter extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1056,7 +1056,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/library") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Library extends AbstractLoadJavaWithFastClassReadingTest { + public static class Library extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1084,7 +1084,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/modality") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Modality extends AbstractLoadJavaWithFastClassReadingTest { + public static class Modality extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1102,7 +1102,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/mutability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Mutability extends AbstractLoadJavaWithFastClassReadingTest { + public static class Mutability extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1140,7 +1140,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/notNull") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NotNull extends AbstractLoadJavaWithFastClassReadingTest { + public static class NotNull extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1178,7 +1178,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/protectedPackage") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedPackage extends AbstractLoadJavaWithFastClassReadingTest { + public static class ProtectedPackage extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1206,7 +1206,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/protectedStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ProtectedStatic extends AbstractLoadJavaWithFastClassReadingTest { + public static class ProtectedStatic extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1224,7 +1224,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/rendering") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Rendering extends AbstractLoadJavaWithFastClassReadingTest { + public static class Rendering extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1242,7 +1242,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/sam") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Sam extends AbstractLoadJavaWithFastClassReadingTest { + public static class Sam extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1334,7 +1334,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Adapters extends AbstractLoadJavaWithFastClassReadingTest { + public static class Adapters extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1416,7 +1416,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inheritance extends AbstractLoadJavaWithFastClassReadingTest { + public static class Inheritance extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1481,7 +1481,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/signatureAnnotations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SignatureAnnotations extends AbstractLoadJavaWithFastClassReadingTest { + public static class SignatureAnnotations extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1499,7 +1499,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SignaturePropagation extends AbstractLoadJavaWithFastClassReadingTest { + public static class SignaturePropagation extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1557,7 +1557,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/static") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Static extends AbstractLoadJavaWithFastClassReadingTest { + public static class Static extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } @@ -1625,7 +1625,7 @@ public class LoadJavaWithFastClassReadingTestGenerated extends AbstractLoadJavaW @TestMetadata("compiler/testData/loadJava/compiledJava/vararg") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Vararg extends AbstractLoadJavaWithFastClassReadingTest { + public static class Vararg extends AbstractLoadJavaWithPsiClassReadingTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledJava, this, testDataFilePath); } diff --git a/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt b/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt index 96eb2b93fac..b39549f1f47 100644 --- a/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt +++ b/plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt @@ -106,11 +106,11 @@ abstract class AbstractKotlinUastTest : AbstractUastTest() { override fun createEnvironment(source: File): AbstractCoreEnvironment { val appWasNull = ApplicationManager.getApplication() == null compilerConfiguration = createKotlinCompilerConfiguration(source) + compilerConfiguration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true) + val parentDisposable = Disposer.newDisposable() - val kotlinCoreEnvironment = KotlinCoreEnvironment.createForTests( - parentDisposable, - compilerConfiguration, - EnvironmentConfigFiles.JVM_CONFIG_FILES) + val kotlinCoreEnvironment = + KotlinCoreEnvironment.createForTests(parentDisposable, compilerConfiguration, EnvironmentConfigFiles.JVM_CONFIG_FILES) this.kotlinCoreEnvironment = kotlinCoreEnvironment