From f01b4706d1e5eb6ccf701984621003da090b72eb Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Sun, 19 Jan 2020 12:01:53 +0300 Subject: [PATCH] Switch to 193 platform --- .bunch | 10 +- .../KotlinCoreApplicationEnvironment.java | 147 ++++++++++++- .../KotlinCoreApplicationEnvironment.java.192 | 64 ++++++ .../KotlinCoreApplicationEnvironment.java.193 | 197 ------------------ .../test/testFramework/KtParsingTestCase.java | 30 ++- ...se.java.193 => KtParsingTestCase.java.192} | 30 +-- .../testFramework/KtPlatformLiteFixture.java | 3 +- ...ava.193 => KtPlatformLiteFixture.java.192} | 3 +- gradle/versions.properties | 5 +- ...properties.193 => versions.properties.192} | 5 +- ...ider.kt.193 => KotlinMLRankingProvider.kt} | 0 .../ml/KotlinMLRankingProvider.kt.192} | 0 .../InterfaceDefaultImplsNonImported.java | 10 +- .../InterfaceDefaultImplsNonImported.java.192 | 11 + .../InterfaceDefaultImplsNonImported.java.193 | 11 - .../testData/injava/stdlib/List.java | 4 +- .../testData/injava/stdlib/List.java.192 | 9 + .../testData/injava/stdlib/List.java.193 | 9 - ...bstractKotlinSourceInJavaCompletionTest.kt | 2 +- ...ctKotlinSourceInJavaCompletionTest.kt.192} | 2 +- ...Test.kt.193 => KotlinModelMetadataTest.kt} | 0 .../test/KotlinModelMetadataTest.kt.192} | 0 ...assesInScriptDependenciesShortNameCache.kt | 4 - ...InScriptDependenciesShortNameCache.kt.192} | 4 + .../git/KotlinExplicitMovementProvider.kt | 5 - ... => KotlinExplicitMovementProvider.kt.192} | 5 + ...dle Kotlin DSL Build Script.gradle.ft.192} | 0 ... Gradle Kotlin DSL Settings.gradle.ft.192} | 0 .../idea/actions/ShowKotlinGradleDslLogs.kt | 7 +- ....kt.193 => ShowKotlinGradleDslLogs.kt.192} | 7 +- ...radleAbstractMultiplatformModuleBuilder.kt | 20 +- ...AbstractMultiplatformModuleBuilder.kt.192} | 20 +- .../importing/KotlinDslScriptModelResolver.kt | 12 +- ...93 => KotlinDslScriptModelResolver.kt.192} | 12 +- .../idea/scratch/actions/RunScratchAction.kt | 23 +- ...hAction.kt.193 => RunScratchAction.kt.192} | 23 +- .../kotlin/console/ConsoleCompilerHelper.kt | 13 +- ...er.kt.193 => ConsoleCompilerHelper.kt.192} | 13 +- .../KotlinLightCodeInsightFixtureTestCase.kt | 6 +- ...linLightCodeInsightFixtureTestCase.kt.192} | 6 +- .../test/KotlinLightProjectDescriptor.java | 10 +- ... => KotlinLightProjectDescriptor.java.192} | 10 +- .../CoroutineDebugConfigurationExtension.kt | 2 +- ...routineDebugConfigurationExtension.kt.192} | 2 +- .../idea/testFramework/projectRoutines.kt | 11 +- ...Routines.kt.193 => projectRoutines.kt.192} | 11 +- idea/resources/META-INF/plugin.xml | 13 +- .../{plugin.xml.193 => plugin.xml.192} | 13 +- .../AbstractCompletionBenchmarkAction.kt | 4 +- ... AbstractCompletionBenchmarkAction.kt.192} | 4 +- .../idea/migration/kotlinMigrationProfile.kt | 4 +- ...e.kt.193 => kotlinMigrationProfile.kt.192} | 4 +- .../idea/refactoring/kotlinRefactoringUtil.kt | 18 +- ...il.kt.193 => kotlinRefactoringUtil.kt.192} | 18 +- .../idea/util/ProgressIndicatorUtils.kt | 2 +- ...s.kt.193 => ProgressIndicatorUtils.kt.192} | 2 +- ...rc.fail.193 => ClassObject.kt.libsrc.fail} | 0 .../usercode/ClassObject.kt.libsrc.fail.192 | 0 ....fail.193 => ClassObject.kt.libsrcjs.fail} | 0 .../usercode/ClassObject.kt.libsrcjs.fail.192 | 0 ...rc.fail.193 => Constructor.kt.libsrc.fail} | 0 .../usercode/Constructor.kt.libsrc.fail.192 | 0 ....fail.193 => Constructor.kt.libsrcjs.fail} | 0 .../usercode/Constructor.kt.libsrcjs.fail.192 | 0 ...kt.libsrc.fail.193 => Enum.kt.libsrc.fail} | 0 .../usercode/Enum.kt.libsrc.fail.192 | 0 ...ibsrcjs.fail.193 => Enum.kt.libsrcjs.fail} | 0 .../usercode/Enum.kt.libsrcjs.fail.192 | 0 ...l.193 => ExtensionFunction.kt.libsrc.fail} | 0 .../ExtensionFunction.kt.libsrc.fail.192 | 0 ...193 => ExtensionFunction.kt.libsrcjs.fail} | 0 .../ExtensionFunction.kt.libsrcjs.fail.192 | 0 ...l.193 => ExtensionProperty.kt.libsrc.fail} | 0 .../ExtensionProperty.kt.libsrc.fail.192 | 0 ...193 => ExtensionProperty.kt.libsrcjs.fail} | 0 .../ExtensionProperty.kt.libsrcjs.fail.192 | 0 ...citlyDeclaredTypeArguments.kt.libsrc.fail} | 0 ...lyDeclaredTypeArguments.kt.libsrc.fail.192 | 0 ...tlyDeclaredTypeArguments.kt.libsrcjs.fail} | 0 ...DeclaredTypeArguments.kt.libsrcjs.fail.192 | 0 ...nWithInferredTypeArguments.kt.libsrc.fail} | 0 ...thInferredTypeArguments.kt.libsrc.fail.192 | 0 ...ithInferredTypeArguments.kt.libsrcjs.fail} | 0 ...InferredTypeArguments.kt.libsrcjs.fail.192 | 0 ...fail.193 => GlobalFunction.kt.libsrc.fail} | 0 .../GlobalFunction.kt.libsrc.fail.192 | 0 ...il.193 => GlobalFunction.kt.libsrcjs.fail} | 0 .../GlobalFunction.kt.libsrcjs.fail.192 | 0 ...fail.193 => GlobalProperty.kt.libsrc.fail} | 0 .../GlobalProperty.kt.libsrc.fail.192 | 0 ...il.193 => GlobalProperty.kt.libsrcjs.fail} | 0 .../GlobalProperty.kt.libsrcjs.fail.192 | 0 ...rc.fail.193 => NamedObject.kt.libsrc.fail} | 0 .../usercode/NamedObject.kt.libsrc.fail.192 | 0 ....fail.193 => NamedObject.kt.libsrcjs.fail} | 0 .../usercode/NamedObject.kt.libsrcjs.fail.192 | 0 ...OverloadedFunWithTypeParam.kt.libsrc.fail} | 0 ...rloadedFunWithTypeParam.kt.libsrc.fail.192 | 0 ...erloadedFunWithTypeParam.kt.libsrcjs.fail} | 0 ...oadedFunWithTypeParam.kt.libsrcjs.fail.192 | 0 ...ibsrc.fail.193 => Property.kt.libsrc.fail} | 0 .../usercode/Property.kt.libsrc.fail.192 | 0 ...cjs.fail.193 => Property.kt.libsrcjs.fail} | 0 .../usercode/Property.kt.libsrcjs.fail.192 | 0 ...SameNameInDifferentSources.kt.libsrc.fail} | 0 ...eNameInDifferentSources.kt.libsrc.fail.192 | 0 ...meNameInDifferentSources.kt.libsrcjs.fail} | 0 ...ameInDifferentSources.kt.libsrcjs.fail.192 | 0 ...bsrc.fail.193 => TypeAlias.kt.libsrc.fail} | 0 .../usercode/TypeAlias.kt.libsrc.fail.192 | 0 ...js.fail.193 => TypeAlias.kt.libsrcjs.fail} | 0 .../usercode/TypeAlias.kt.libsrcjs.fail.192 | 0 ...3 => TypeWithSameShortName.kt.libsrc.fail} | 0 .../TypeWithSameShortName.kt.libsrc.fail.192 | 0 ...=> TypeWithSameShortName.kt.libsrcjs.fail} | 0 ...TypeWithSameShortName.kt.libsrcjs.fail.192 | 0 ....fail.193 => LibraryClassUsages.0.kt.fail} | 0 .../LibraryClassUsages.0.kt.fail.192 | 0 ...193 => LibraryNestedClassUsages.0.kt.fail} | 0 .../LibraryNestedClassUsages.0.kt.fail.192 | 0 ...fail.193 => LibraryObjectUsages.0.kt.fail} | 0 .../LibraryObjectUsages.0.kt.fail.192 | 0 .../build.gradle.4.9.after | 4 +- ...9.after.193 => build.gradle.4.9.after.192} | 4 +- .../kotlinClass/KotlinClass_verification.xml | 2 +- ...l.193 => KotlinClass_verification.xml.192} | 2 +- .../KotlinFunction_verification.xml | 2 +- ...93 => KotlinFunction_verification.xml.192} | 2 +- .../KotlinNestedClass_verification.xml | 2 +- ...=> KotlinNestedClass_verification.xml.192} | 2 +- .../KotlinNestedInnerClass_verification.xml | 2 +- ...tlinNestedInnerClass_verification.xml.192} | 2 +- .../KotlinPackageFunction_verification.xml | 2 +- ...otlinPackageFunction_verification.xml.192} | 2 +- .../KotlinPackageProperty_verification.xml | 2 +- ...otlinPackageProperty_verification.xml.192} | 2 +- .../KotlinProperty_verification.xml | 2 +- ...93 => KotlinProperty_verification.xml.192} | 2 +- .../javaMethod/JavaMethod_verification.xml | 8 +- .../JavaMethod_verification.xml.192 | 5 + .../JavaMethod_verification.xml.193 | 5 - ...Lib.kt.fail.193 => useJavaFromLib.kt.fail} | 0 .../withLib1/useJavaFromLib.kt.fail.192 | 0 ....kt.fail.193 => useJavaSAMFromLib.kt.fail} | 0 .../withLib2/useJavaSAMFromLib.kt.fail.192 | 0 ....kt.fail.193 => useJavaSAMFromLib.kt.fail} | 0 .../withLib3/useJavaSAMFromLib.kt.fail.192 | 0 ...ce.kt.fail.193 => inLibrarySource.kt.fail} | 0 .../inLibrarySource.kt.fail.192 | 0 ...ter.kt.fail.193 => toFunParameter.kt.fail} | 0 .../referenceInLib/toFunParameter.kt.fail.192 | 0 ...ocalFun.kt.fail.193 => toLocalFun.kt.fail} | 0 .../referenceInLib/toLocalFun.kt.fail.192 | 0 .../kotlin/DataFlowValueRenderingTest.kt | 18 +- ....193 => DataFlowValueRenderingTest.kt.192} | 18 +- .../AbstractUpdateKotlinCopyrightTest.kt | 2 +- ... AbstractUpdateKotlinCopyrightTest.kt.192} | 2 +- ...actConfigureProjectByChangingFileTest.java | 17 +- ...nfigureProjectByChangingFileTest.java.192} | 17 +- .../AbstractParameterInfoTest.kt | 6 +- ...t.193 => AbstractParameterInfoTest.kt.192} | 6 +- .../kotlin/idea/script/extensionsUtil.kt | 11 +- ...sionsUtil.kt.193 => extensionsUtil.kt.192} | 11 +- .../kotlin/test/util/ProjectStructureUtils.kt | 20 +- ...ls.kt.193 => ProjectStructureUtils.kt.192} | 20 +- ...ractJavaToKotlinConverterForWebDemoTest.kt | 3 +- ...avaToKotlinConverterForWebDemoTest.kt.192} | 3 +- .../tests/KotlinUastReferencesTest.kt | 77 +++---- ...kt.193 => KotlinUastReferencesTest.kt.192} | 77 ++++--- tests/mute-platform.csv | 137 +++++++++++- tests/mute-platform.csv.192 | 22 ++ tests/mute-platform.csv.193 | 145 ------------- 172 files changed, 763 insertions(+), 763 deletions(-) create mode 100644 compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.192 delete mode 100644 compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.193 rename compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/{KtParsingTestCase.java.193 => KtParsingTestCase.java.192} (91%) rename compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/{KtPlatformLiteFixture.java.193 => KtPlatformLiteFixture.java.192} (96%) rename gradle/{versions.properties.193 => versions.properties.192} (77%) rename idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/{KotlinMLRankingProvider.kt.193 => KotlinMLRankingProvider.kt} (100%) rename idea/{idea-gradle/res/fileTemplates/Gradle Kotlin DSL Build Script.gradle.ft.193 => idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/KotlinMLRankingProvider.kt.192} (100%) create mode 100644 idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.192 delete mode 100644 idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.193 create mode 100644 idea/idea-completion/testData/injava/stdlib/List.java.192 delete mode 100644 idea/idea-completion/testData/injava/stdlib/List.java.193 rename idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/{AbstractKotlinSourceInJavaCompletionTest.kt.193 => AbstractKotlinSourceInJavaCompletionTest.kt.192} (92%) rename idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/{KotlinModelMetadataTest.kt.193 => KotlinModelMetadataTest.kt} (100%) rename idea/{idea-gradle/res/fileTemplates/Gradle Kotlin DSL Settings.gradle.ft.193 => idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinModelMetadataTest.kt.192} (100%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/{JavaClassesInScriptDependenciesShortNameCache.kt.193 => JavaClassesInScriptDependenciesShortNameCache.kt.192} (95%) rename idea/idea-git/src/org/jetbrains/kotlin/git/{KotlinExplicitMovementProvider.kt.193 => KotlinExplicitMovementProvider.kt.192} (91%) rename idea/idea-gradle/res/fileTemplates/{Gradle Kotlin DSL Build Script.gradle.ft => Gradle Kotlin DSL Build Script.gradle.ft.192} (100%) rename idea/idea-gradle/res/fileTemplates/{Gradle Kotlin DSL Settings.gradle.ft => Gradle Kotlin DSL Settings.gradle.ft.192} (100%) rename idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/{ShowKotlinGradleDslLogs.kt.193 => ShowKotlinGradleDslLogs.kt.192} (93%) rename idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/{KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 => KotlinGradleAbstractMultiplatformModuleBuilder.kt.192} (93%) rename idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/{KotlinDslScriptModelResolver.kt.193 => KotlinDslScriptModelResolver.kt.192} (81%) rename idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/{RunScratchAction.kt.193 => RunScratchAction.kt.192} (82%) rename idea/idea-repl/src/org/jetbrains/kotlin/console/{ConsoleCompilerHelper.kt.193 => ConsoleCompilerHelper.kt.192} (76%) rename idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/{KotlinLightCodeInsightFixtureTestCase.kt.193 => KotlinLightCodeInsightFixtureTestCase.kt.192} (98%) rename idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/{KotlinLightProjectDescriptor.java.193 => KotlinLightProjectDescriptor.java.192} (89%) rename idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/{CoroutineDebugConfigurationExtension.kt.193 => CoroutineDebugConfigurationExtension.kt.192} (97%) rename idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/{projectRoutines.kt.193 => projectRoutines.kt.192} (91%) rename idea/resources/META-INF/{plugin.xml.193 => plugin.xml.192} (92%) rename idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/{AbstractCompletionBenchmarkAction.kt.193 => AbstractCompletionBenchmarkAction.kt.192} (97%) rename idea/src/org/jetbrains/kotlin/idea/migration/{kotlinMigrationProfile.kt.193 => kotlinMigrationProfile.kt.192} (93%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{kotlinRefactoringUtil.kt.193 => kotlinRefactoringUtil.kt.192} (98%) rename idea/src/org/jetbrains/kotlin/idea/util/{ProgressIndicatorUtils.kt.193 => ProgressIndicatorUtils.kt.192} (80%) rename idea/testData/decompiler/navigation/usercode/{ClassObject.kt.libsrc.fail.193 => ClassObject.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{ClassObject.kt.libsrcjs.fail.193 => ClassObject.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{Constructor.kt.libsrc.fail.193 => Constructor.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{Constructor.kt.libsrcjs.fail.193 => Constructor.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{Enum.kt.libsrc.fail.193 => Enum.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{Enum.kt.libsrcjs.fail.193 => Enum.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{ExtensionFunction.kt.libsrc.fail.193 => ExtensionFunction.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{ExtensionFunction.kt.libsrcjs.fail.193 => ExtensionFunction.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{ExtensionProperty.kt.libsrc.fail.193 => ExtensionProperty.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{ExtensionProperty.kt.libsrcjs.fail.193 => ExtensionProperty.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.193 => GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.193 => GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.193 => GenericFunctionWithInferredTypeArguments.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.193 => GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{GlobalFunction.kt.libsrc.fail.193 => GlobalFunction.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{GlobalFunction.kt.libsrcjs.fail.193 => GlobalFunction.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{GlobalProperty.kt.libsrc.fail.193 => GlobalProperty.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{GlobalProperty.kt.libsrcjs.fail.193 => GlobalProperty.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{NamedObject.kt.libsrc.fail.193 => NamedObject.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{NamedObject.kt.libsrcjs.fail.193 => NamedObject.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{OverloadedFunWithTypeParam.kt.libsrc.fail.193 => OverloadedFunWithTypeParam.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{OverloadedFunWithTypeParam.kt.libsrcjs.fail.193 => OverloadedFunWithTypeParam.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{Property.kt.libsrc.fail.193 => Property.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{Property.kt.libsrcjs.fail.193 => Property.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{SameNameInDifferentSources.kt.libsrc.fail.193 => SameNameInDifferentSources.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{SameNameInDifferentSources.kt.libsrcjs.fail.193 => SameNameInDifferentSources.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{TypeAlias.kt.libsrc.fail.193 => TypeAlias.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{TypeAlias.kt.libsrcjs.fail.193 => TypeAlias.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.192 rename idea/testData/decompiler/navigation/usercode/{TypeWithSameShortName.kt.libsrc.fail.193 => TypeWithSameShortName.kt.libsrc.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.192 rename idea/testData/decompiler/navigation/usercode/{TypeWithSameShortName.kt.libsrcjs.fail.193 => TypeWithSameShortName.kt.libsrcjs.fail} (100%) create mode 100644 idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.192 rename idea/testData/findUsages/libraryUsages/kotlinLibrary/{LibraryClassUsages.0.kt.fail.193 => LibraryClassUsages.0.kt.fail} (100%) create mode 100644 idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt.fail.192 rename idea/testData/findUsages/libraryUsages/kotlinLibrary/{LibraryNestedClassUsages.0.kt.fail.193 => LibraryNestedClassUsages.0.kt.fail} (100%) create mode 100644 idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt.fail.192 rename idea/testData/findUsages/libraryUsages/kotlinLibrary/{LibraryObjectUsages.0.kt.fail.193 => LibraryObjectUsages.0.kt.fail} (100%) create mode 100644 idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt.fail.192 rename idea/testData/gradle/configurator/configureKotlinDevVersion/{build.gradle.4.9.after.193 => build.gradle.4.9.after.192} (64%) rename idea/testData/hierarchy/calls/callers/kotlinClass/{KotlinClass_verification.xml.193 => KotlinClass_verification.xml.192} (93%) rename idea/testData/hierarchy/calls/callers/kotlinFunction/{KotlinFunction_verification.xml.193 => KotlinFunction_verification.xml.192} (92%) rename idea/testData/hierarchy/calls/callers/kotlinNestedClass/{KotlinNestedClass_verification.xml.193 => KotlinNestedClass_verification.xml.192} (93%) rename idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/{KotlinNestedInnerClass_verification.xml.193 => KotlinNestedInnerClass_verification.xml.192} (93%) rename idea/testData/hierarchy/calls/callers/kotlinPackageFunction/{KotlinPackageFunction_verification.xml.193 => KotlinPackageFunction_verification.xml.192} (93%) rename idea/testData/hierarchy/calls/callers/kotlinPackageProperty/{KotlinPackageProperty_verification.xml.193 => KotlinPackageProperty_verification.xml.192} (93%) rename idea/testData/hierarchy/calls/callers/kotlinProperty/{KotlinProperty_verification.xml.193 => KotlinProperty_verification.xml.192} (92%) create mode 100644 idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.192 delete mode 100644 idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.193 rename idea/testData/parameterInfo/withLib1/{useJavaFromLib.kt.fail.193 => useJavaFromLib.kt.fail} (100%) create mode 100644 idea/testData/parameterInfo/withLib1/useJavaFromLib.kt.fail.192 rename idea/testData/parameterInfo/withLib2/{useJavaSAMFromLib.kt.fail.193 => useJavaSAMFromLib.kt.fail} (100%) create mode 100644 idea/testData/parameterInfo/withLib2/useJavaSAMFromLib.kt.fail.192 rename idea/testData/parameterInfo/withLib3/{useJavaSAMFromLib.kt.fail.193 => useJavaSAMFromLib.kt.fail} (100%) create mode 100644 idea/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt.fail.192 rename idea/testData/resolve/referenceInLib/{inLibrarySource.kt.fail.193 => inLibrarySource.kt.fail} (100%) create mode 100644 idea/testData/resolve/referenceInLib/inLibrarySource.kt.fail.192 rename idea/testData/resolve/referenceInLib/{toFunParameter.kt.fail.193 => toFunParameter.kt.fail} (100%) create mode 100644 idea/testData/resolve/referenceInLib/toFunParameter.kt.fail.192 rename idea/testData/resolve/referenceInLib/{toLocalFun.kt.fail.193 => toLocalFun.kt.fail} (100%) create mode 100644 idea/testData/resolve/referenceInLib/toLocalFun.kt.fail.192 rename idea/tests/org/jetbrains/kotlin/{DataFlowValueRenderingTest.kt.193 => DataFlowValueRenderingTest.kt.192} (82%) rename idea/tests/org/jetbrains/kotlin/copyright/{AbstractUpdateKotlinCopyrightTest.kt.193 => AbstractUpdateKotlinCopyrightTest.kt.192} (97%) rename idea/tests/org/jetbrains/kotlin/idea/configuration/{AbstractConfigureProjectByChangingFileTest.java.193 => AbstractConfigureProjectByChangingFileTest.java.192} (92%) rename idea/tests/org/jetbrains/kotlin/idea/parameterInfo/{AbstractParameterInfoTest.kt.193 => AbstractParameterInfoTest.kt.192} (93%) rename idea/tests/org/jetbrains/kotlin/idea/script/{extensionsUtil.kt.193 => extensionsUtil.kt.192} (68%) rename idea/tests/org/jetbrains/kotlin/test/util/{ProjectStructureUtils.kt.193 => ProjectStructureUtils.kt.192} (79%) rename j2k/tests/org/jetbrains/kotlin/j2k/{AbstractJavaToKotlinConverterForWebDemoTest.kt.193 => AbstractJavaToKotlinConverterForWebDemoTest.kt.192} (98%) rename plugins/uast-kotlin/tests/{KotlinUastReferencesTest.kt.193 => KotlinUastReferencesTest.kt.192} (63%) create mode 100644 tests/mute-platform.csv.192 delete mode 100644 tests/mute-platform.csv.193 diff --git a/.bunch b/.bunch index 4215d5fdbc1..9dcd65c731f 100644 --- a/.bunch +++ b/.bunch @@ -1,6 +1,6 @@ -192 193 -191 -as35_191 -as36 -as40_193 +192 +191_192 +as35_191_192 +as36_192 +as40 \ No newline at end of file diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java index cbb289a3139..e0a0186e4f1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java @@ -5,39 +5,76 @@ package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.codeInsight.ContainerProvider; +import com.intellij.codeInsight.JavaContainerProvider; +import com.intellij.codeInsight.folding.JavaCodeFoldingSettings; +import com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsBase; +import com.intellij.codeInsight.folding.impl.JavaFoldingBuilderBase; import com.intellij.codeInsight.runner.JavaMainMethodProvider; import com.intellij.core.CoreApplicationEnvironment; -import com.intellij.core.JavaCoreApplicationEnvironment; +import com.intellij.core.CoreJavaDirectoryService; +import com.intellij.core.CorePsiPackageImplementationHelper; +import com.intellij.ide.highlighter.ArchiveFileType; +import com.intellij.ide.highlighter.JavaClassFileType; +import com.intellij.ide.highlighter.JavaFileType; +import com.intellij.lang.LanguageASTFactory; import com.intellij.lang.MetaLanguage; +import com.intellij.lang.folding.LanguageFolding; +import com.intellij.lang.java.JavaLanguage; +import com.intellij.lang.java.JavaParserDefinition; +import com.intellij.navigation.ItemPresentationProviders; import com.intellij.openapi.Disposable; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.extensions.ExtensionsArea; import com.intellij.openapi.fileTypes.FileTypeExtensionPoint; +import com.intellij.openapi.fileTypes.PlainTextFileType; +import com.intellij.openapi.fileTypes.PlainTextLanguage; +import com.intellij.openapi.fileTypes.PlainTextParserDefinition; +import com.intellij.openapi.projectRoots.JavaVersionService; +import com.intellij.openapi.util.KeyWithDefaultValue; import com.intellij.openapi.vfs.VirtualFileSystem; -import com.intellij.psi.FileContextProvider; +import com.intellij.psi.*; import com.intellij.psi.augment.PsiAugmentProvider; import com.intellij.psi.augment.TypeAnnotationModifier; import com.intellij.psi.compiled.ClassFileDecompilers; +import com.intellij.psi.impl.EmptySubstitutorImpl; +import com.intellij.psi.impl.LanguageConstantExpressionEvaluator; +import com.intellij.psi.impl.PsiExpressionEvaluator; +import com.intellij.psi.impl.compiled.ClassFileStubBuilder; +import com.intellij.psi.impl.file.PsiPackageImplementationHelper; +import com.intellij.psi.impl.search.MethodSuperSearcher; +import com.intellij.psi.impl.source.tree.JavaASTFactory; +import com.intellij.psi.impl.source.tree.PlainTextASTFactory; import com.intellij.psi.meta.MetaDataContributor; +import com.intellij.psi.presentation.java.*; +import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.stubs.BinaryFileStubBuilders; +import com.intellij.util.QueryExecutor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem; -// Mostly a placeholder for the functionality added to the bunch 193 -public class KotlinCoreApplicationEnvironment extends JavaCoreApplicationEnvironment { +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +/** + * adapted from com.intellij.core.JavaCoreApplicationEnvironment + * TODO: initiate removal original from com.intellij.core since it seems that there are no usages left + */ +public class KotlinCoreApplicationEnvironment extends CoreApplicationEnvironment { public static KotlinCoreApplicationEnvironment create(@NotNull Disposable parentDisposable, boolean unitTestMode) { - Extensions.cleanRootArea(parentDisposable); - registerExtensionPoints(); return new KotlinCoreApplicationEnvironment(parentDisposable, unitTestMode); } private KotlinCoreApplicationEnvironment(@NotNull Disposable parentDisposable, boolean unitTestMode) { super(parentDisposable, unitTestMode); + + registerExtensionPoints(); + + registerExtensions(); } - private static void registerExtensionPoints() { + private void registerExtensionPoints() { ExtensionsArea area = Extensions.getRootArea(); CoreApplicationEnvironment.registerExtensionPoint(area, BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint.class); @@ -56,9 +93,105 @@ public class KotlinCoreApplicationEnvironment extends JavaCoreApplicationEnviron IdeaExtensionPoints.INSTANCE.registerVersionSpecificAppExtensionPoints(area); } + private void registerExtensions() { + registerFileType(JavaClassFileType.INSTANCE, "class"); + registerFileType(JavaFileType.INSTANCE, "java"); + registerFileType(ArchiveFileType.INSTANCE, "jar;zip"); + registerFileType(PlainTextFileType.INSTANCE, "txt;sh;bat;cmd;policy;log;cgi;MF;jad;jam;htaccess"); + + addExplicitExtension(LanguageASTFactory.INSTANCE, PlainTextLanguage.INSTANCE, new PlainTextASTFactory()); + registerParserDefinition(new PlainTextParserDefinition()); + + addExplicitExtension(FileTypeFileViewProviders.INSTANCE, JavaClassFileType.INSTANCE, new ClassFileViewProviderFactory()); + addExplicitExtension(BinaryFileStubBuilders.INSTANCE, JavaClassFileType.INSTANCE, new ClassFileStubBuilder()); + + addExplicitExtension(LanguageASTFactory.INSTANCE, JavaLanguage.INSTANCE, new JavaASTFactory()); + registerParserDefinition(new JavaParserDefinition()); + addExplicitExtension(LanguageConstantExpressionEvaluator.INSTANCE, JavaLanguage.INSTANCE, new PsiExpressionEvaluator()); + + addExtension(ContainerProvider.EP_NAME, new JavaContainerProvider()); + + myApplication.registerService(PsiPackageImplementationHelper.class, new CorePsiPackageImplementationHelper()); + + EmptySubstitutorImpl emptySubstitutor = new EmptySubstitutorImpl(); + myApplication.registerService(EmptySubstitutor.class, emptySubstitutor); + + // Patch null values obtained because of cyclic dependency during initialization + updateInterfaceField(PsiSubstitutor.class, "EMPTY", emptySubstitutor); + updateInterfaceField(PsiSubstitutor.class, "UNKNOWN", PsiSubstitutor.EMPTY); + + myApplication.registerService(JavaDirectoryService.class, createJavaDirectoryService()); + myApplication.registerService(JavaVersionService.class, new JavaVersionService()); + + addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiPackage.class, new PackagePresentationProvider()); + addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiClass.class, new ClassPresentationProvider()); + addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiMethod.class, new MethodPresentationProvider()); + addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiField.class, new FieldPresentationProvider()); + addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiLocalVariable.class, new VariablePresentationProvider()); + addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiParameter.class, new VariablePresentationProvider()); + + registerApplicationService(JavaCodeFoldingSettings.class, new JavaCodeFoldingSettingsBase()); + addExplicitExtension(LanguageFolding.INSTANCE, JavaLanguage.INSTANCE, new JavaFoldingBuilderBase() { + @Override + protected boolean shouldShowExplicitLambdaType(@NotNull PsiAnonymousClass anonymousClass, @NotNull PsiNewExpression expression) { + return false; + } + + @Override + protected boolean isBelowRightMargin(@NotNull PsiFile file, int lineLength) { + return false; + } + }); + + registerApplicationExtensionPoint(SuperMethodsSearch.EP_NAME, QueryExecutor.class); + addExtension(SuperMethodsSearch.EP_NAME, new MethodSuperSearcher()); + } + + // overridden in upsource + protected CoreJavaDirectoryService createJavaDirectoryService() { + return new CoreJavaDirectoryService(); + } + @Nullable @Override protected VirtualFileSystem createJrtFileSystem() { return new CoreJrtFileSystem(); } + + private static void updateInterfaceField(Class klass, String name, Object value) { + try { + Field field = klass.getDeclaredField(name); + + boolean wasAccessible = field.isAccessible(); + + try { + if (!wasAccessible) { + field.setAccessible(true); + } + + Field modifiersField = Field.class.getDeclaredField("modifiers"); + + int modifiers = field.getModifiers(); + + try { + modifiersField.setAccessible(true); + modifiersField.setInt(field, modifiers & ~Modifier.FINAL); + + field.set(null, value); + } + finally { + modifiersField.setInt(field, modifiers); + modifiersField.setAccessible(false); + } + } + finally { + if (!wasAccessible) { + field.setAccessible(false); + } + } + } + catch (NoSuchFieldException | IllegalAccessException e) { + throw new IllegalStateException(e); + } + } } \ No newline at end of file diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.192 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.192 new file mode 100644 index 00000000000..cbb289a3139 --- /dev/null +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.192 @@ -0,0 +1,64 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ +package org.jetbrains.kotlin.cli.jvm.compiler; + +import com.intellij.codeInsight.ContainerProvider; +import com.intellij.codeInsight.runner.JavaMainMethodProvider; +import com.intellij.core.CoreApplicationEnvironment; +import com.intellij.core.JavaCoreApplicationEnvironment; +import com.intellij.lang.MetaLanguage; +import com.intellij.openapi.Disposable; +import com.intellij.openapi.extensions.Extensions; +import com.intellij.openapi.extensions.ExtensionsArea; +import com.intellij.openapi.fileTypes.FileTypeExtensionPoint; +import com.intellij.openapi.vfs.VirtualFileSystem; +import com.intellij.psi.FileContextProvider; +import com.intellij.psi.augment.PsiAugmentProvider; +import com.intellij.psi.augment.TypeAnnotationModifier; +import com.intellij.psi.compiled.ClassFileDecompilers; +import com.intellij.psi.meta.MetaDataContributor; +import com.intellij.psi.stubs.BinaryFileStubBuilders; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem; + +// Mostly a placeholder for the functionality added to the bunch 193 +public class KotlinCoreApplicationEnvironment extends JavaCoreApplicationEnvironment { + + public static KotlinCoreApplicationEnvironment create(@NotNull Disposable parentDisposable, boolean unitTestMode) { + Extensions.cleanRootArea(parentDisposable); + registerExtensionPoints(); + return new KotlinCoreApplicationEnvironment(parentDisposable, unitTestMode); + } + + private KotlinCoreApplicationEnvironment(@NotNull Disposable parentDisposable, boolean unitTestMode) { + super(parentDisposable, unitTestMode); + } + + private static void registerExtensionPoints() { + ExtensionsArea area = Extensions.getRootArea(); + + CoreApplicationEnvironment.registerExtensionPoint(area, BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint.class); + CoreApplicationEnvironment.registerExtensionPoint(area, FileContextProvider.EP_NAME, FileContextProvider.class); + + CoreApplicationEnvironment.registerExtensionPoint(area, MetaDataContributor.EP_NAME, MetaDataContributor.class); + CoreApplicationEnvironment.registerExtensionPoint(area, PsiAugmentProvider.EP_NAME, PsiAugmentProvider.class); + CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider.class); + + CoreApplicationEnvironment.registerExtensionPoint(area, ContainerProvider.EP_NAME, ContainerProvider.class); + CoreApplicationEnvironment.registerExtensionPoint(area, ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler.class); + + CoreApplicationEnvironment.registerExtensionPoint(area, TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier.class); + CoreApplicationEnvironment.registerExtensionPoint(area, MetaLanguage.EP_NAME, MetaLanguage.class); + + IdeaExtensionPoints.INSTANCE.registerVersionSpecificAppExtensionPoints(area); + } + + @Nullable + @Override + protected VirtualFileSystem createJrtFileSystem() { + return new CoreJrtFileSystem(); + } +} \ No newline at end of file diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.193 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.193 deleted file mode 100644 index e0a0186e4f1..00000000000 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.193 +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ -package org.jetbrains.kotlin.cli.jvm.compiler; - -import com.intellij.codeInsight.ContainerProvider; -import com.intellij.codeInsight.JavaContainerProvider; -import com.intellij.codeInsight.folding.JavaCodeFoldingSettings; -import com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsBase; -import com.intellij.codeInsight.folding.impl.JavaFoldingBuilderBase; -import com.intellij.codeInsight.runner.JavaMainMethodProvider; -import com.intellij.core.CoreApplicationEnvironment; -import com.intellij.core.CoreJavaDirectoryService; -import com.intellij.core.CorePsiPackageImplementationHelper; -import com.intellij.ide.highlighter.ArchiveFileType; -import com.intellij.ide.highlighter.JavaClassFileType; -import com.intellij.ide.highlighter.JavaFileType; -import com.intellij.lang.LanguageASTFactory; -import com.intellij.lang.MetaLanguage; -import com.intellij.lang.folding.LanguageFolding; -import com.intellij.lang.java.JavaLanguage; -import com.intellij.lang.java.JavaParserDefinition; -import com.intellij.navigation.ItemPresentationProviders; -import com.intellij.openapi.Disposable; -import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.extensions.ExtensionsArea; -import com.intellij.openapi.fileTypes.FileTypeExtensionPoint; -import com.intellij.openapi.fileTypes.PlainTextFileType; -import com.intellij.openapi.fileTypes.PlainTextLanguage; -import com.intellij.openapi.fileTypes.PlainTextParserDefinition; -import com.intellij.openapi.projectRoots.JavaVersionService; -import com.intellij.openapi.util.KeyWithDefaultValue; -import com.intellij.openapi.vfs.VirtualFileSystem; -import com.intellij.psi.*; -import com.intellij.psi.augment.PsiAugmentProvider; -import com.intellij.psi.augment.TypeAnnotationModifier; -import com.intellij.psi.compiled.ClassFileDecompilers; -import com.intellij.psi.impl.EmptySubstitutorImpl; -import com.intellij.psi.impl.LanguageConstantExpressionEvaluator; -import com.intellij.psi.impl.PsiExpressionEvaluator; -import com.intellij.psi.impl.compiled.ClassFileStubBuilder; -import com.intellij.psi.impl.file.PsiPackageImplementationHelper; -import com.intellij.psi.impl.search.MethodSuperSearcher; -import com.intellij.psi.impl.source.tree.JavaASTFactory; -import com.intellij.psi.impl.source.tree.PlainTextASTFactory; -import com.intellij.psi.meta.MetaDataContributor; -import com.intellij.psi.presentation.java.*; -import com.intellij.psi.search.searches.SuperMethodsSearch; -import com.intellij.psi.stubs.BinaryFileStubBuilders; -import com.intellij.util.QueryExecutor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - -/** - * adapted from com.intellij.core.JavaCoreApplicationEnvironment - * TODO: initiate removal original from com.intellij.core since it seems that there are no usages left - */ -public class KotlinCoreApplicationEnvironment extends CoreApplicationEnvironment { - - public static KotlinCoreApplicationEnvironment create(@NotNull Disposable parentDisposable, boolean unitTestMode) { - return new KotlinCoreApplicationEnvironment(parentDisposable, unitTestMode); - } - - private KotlinCoreApplicationEnvironment(@NotNull Disposable parentDisposable, boolean unitTestMode) { - super(parentDisposable, unitTestMode); - - registerExtensionPoints(); - - registerExtensions(); - } - - private void registerExtensionPoints() { - ExtensionsArea area = Extensions.getRootArea(); - - CoreApplicationEnvironment.registerExtensionPoint(area, BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint.class); - CoreApplicationEnvironment.registerExtensionPoint(area, FileContextProvider.EP_NAME, FileContextProvider.class); - - CoreApplicationEnvironment.registerExtensionPoint(area, MetaDataContributor.EP_NAME, MetaDataContributor.class); - CoreApplicationEnvironment.registerExtensionPoint(area, PsiAugmentProvider.EP_NAME, PsiAugmentProvider.class); - CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider.class); - - CoreApplicationEnvironment.registerExtensionPoint(area, ContainerProvider.EP_NAME, ContainerProvider.class); - CoreApplicationEnvironment.registerExtensionPoint(area, ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler.class); - - CoreApplicationEnvironment.registerExtensionPoint(area, TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier.class); - CoreApplicationEnvironment.registerExtensionPoint(area, MetaLanguage.EP_NAME, MetaLanguage.class); - - IdeaExtensionPoints.INSTANCE.registerVersionSpecificAppExtensionPoints(area); - } - - private void registerExtensions() { - registerFileType(JavaClassFileType.INSTANCE, "class"); - registerFileType(JavaFileType.INSTANCE, "java"); - registerFileType(ArchiveFileType.INSTANCE, "jar;zip"); - registerFileType(PlainTextFileType.INSTANCE, "txt;sh;bat;cmd;policy;log;cgi;MF;jad;jam;htaccess"); - - addExplicitExtension(LanguageASTFactory.INSTANCE, PlainTextLanguage.INSTANCE, new PlainTextASTFactory()); - registerParserDefinition(new PlainTextParserDefinition()); - - addExplicitExtension(FileTypeFileViewProviders.INSTANCE, JavaClassFileType.INSTANCE, new ClassFileViewProviderFactory()); - addExplicitExtension(BinaryFileStubBuilders.INSTANCE, JavaClassFileType.INSTANCE, new ClassFileStubBuilder()); - - addExplicitExtension(LanguageASTFactory.INSTANCE, JavaLanguage.INSTANCE, new JavaASTFactory()); - registerParserDefinition(new JavaParserDefinition()); - addExplicitExtension(LanguageConstantExpressionEvaluator.INSTANCE, JavaLanguage.INSTANCE, new PsiExpressionEvaluator()); - - addExtension(ContainerProvider.EP_NAME, new JavaContainerProvider()); - - myApplication.registerService(PsiPackageImplementationHelper.class, new CorePsiPackageImplementationHelper()); - - EmptySubstitutorImpl emptySubstitutor = new EmptySubstitutorImpl(); - myApplication.registerService(EmptySubstitutor.class, emptySubstitutor); - - // Patch null values obtained because of cyclic dependency during initialization - updateInterfaceField(PsiSubstitutor.class, "EMPTY", emptySubstitutor); - updateInterfaceField(PsiSubstitutor.class, "UNKNOWN", PsiSubstitutor.EMPTY); - - myApplication.registerService(JavaDirectoryService.class, createJavaDirectoryService()); - myApplication.registerService(JavaVersionService.class, new JavaVersionService()); - - addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiPackage.class, new PackagePresentationProvider()); - addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiClass.class, new ClassPresentationProvider()); - addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiMethod.class, new MethodPresentationProvider()); - addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiField.class, new FieldPresentationProvider()); - addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiLocalVariable.class, new VariablePresentationProvider()); - addExplicitExtension(ItemPresentationProviders.INSTANCE, PsiParameter.class, new VariablePresentationProvider()); - - registerApplicationService(JavaCodeFoldingSettings.class, new JavaCodeFoldingSettingsBase()); - addExplicitExtension(LanguageFolding.INSTANCE, JavaLanguage.INSTANCE, new JavaFoldingBuilderBase() { - @Override - protected boolean shouldShowExplicitLambdaType(@NotNull PsiAnonymousClass anonymousClass, @NotNull PsiNewExpression expression) { - return false; - } - - @Override - protected boolean isBelowRightMargin(@NotNull PsiFile file, int lineLength) { - return false; - } - }); - - registerApplicationExtensionPoint(SuperMethodsSearch.EP_NAME, QueryExecutor.class); - addExtension(SuperMethodsSearch.EP_NAME, new MethodSuperSearcher()); - } - - // overridden in upsource - protected CoreJavaDirectoryService createJavaDirectoryService() { - return new CoreJavaDirectoryService(); - } - - @Nullable - @Override - protected VirtualFileSystem createJrtFileSystem() { - return new CoreJrtFileSystem(); - } - - private static void updateInterfaceField(Class klass, String name, Object value) { - try { - Field field = klass.getDeclaredField(name); - - boolean wasAccessible = field.isAccessible(); - - try { - if (!wasAccessible) { - field.setAccessible(true); - } - - Field modifiersField = Field.class.getDeclaredField("modifiers"); - - int modifiers = field.getModifiers(); - - try { - modifiersField.setAccessible(true); - modifiersField.setInt(field, modifiers & ~Modifier.FINAL); - - field.set(null, value); - } - finally { - modifiersField.setInt(field, modifiers); - modifiersField.setAccessible(false); - } - } - finally { - if (!wasAccessible) { - field.setAccessible(false); - } - } - } - catch (NoSuchFieldException | IllegalAccessException e) { - throw new IllegalStateException(e); - } - } -} \ No newline at end of file diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java index 8e34c41a923..2e42e3a75b2 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java @@ -17,6 +17,8 @@ package org.jetbrains.kotlin.test.testFramework; import com.intellij.core.CoreASTFactory; +import com.intellij.ide.util.AppPropertiesComponentImpl; +import com.intellij.ide.util.PropertiesComponent; import com.intellij.lang.*; import com.intellij.lang.impl.PsiBuilderFactoryImpl; import com.intellij.mock.*; @@ -30,6 +32,8 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.impl.LoadTextUtil; import com.intellij.openapi.fileTypes.FileTypeFactory; import com.intellij.openapi.fileTypes.FileTypeManager; +import com.intellij.openapi.fileTypes.FileTypeRegistry; +import com.intellij.openapi.options.SchemeManagerFactory; import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.impl.CoreProgressManager; @@ -45,14 +49,14 @@ import com.intellij.psi.*; import com.intellij.psi.impl.*; import com.intellij.psi.util.CachedValuesManager; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.testFramework.MockSchemeManagerFactory; import com.intellij.testFramework.TestDataFile; import com.intellij.util.CachedValuesManagerImpl; import com.intellij.util.Function; -import com.intellij.util.messages.MessageBus; -import com.intellij.util.messages.MessageBusFactory; import junit.framework.TestCase; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.KotlinFileType; import org.picocontainer.ComponentAdapter; import org.picocontainer.MutablePicoContainer; @@ -95,21 +99,31 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture { myPsiManager = new MockPsiManager(myProject); myFileFactory = new PsiFileFactoryImpl(myPsiManager); MutablePicoContainer appContainer = getApplication().getPicoContainer(); - registerComponentInstance(appContainer, MessageBus.class, MessageBusFactory.newMessageBus(getApplication())); final MockEditorFactory editorFactory = new MockEditorFactory(); - registerComponentInstance(appContainer, EditorFactory.class, editorFactory); - registerComponentInstance(appContainer, FileDocumentManager.class, new MockFileDocumentManagerImpl(new Function() { + MockFileTypeManager mockFileTypeManager = new MockFileTypeManager(KotlinFileType.INSTANCE); + MockFileDocumentManagerImpl mockFileDocumentManager = new MockFileDocumentManagerImpl(new Function() { @Override public Document fun(CharSequence charSequence) { return editorFactory.createDocument(charSequence); } - }, HARD_REF_TO_DOCUMENT_KEY)); - registerComponentInstance(appContainer, PsiDocumentManager.class, new MockPsiDocumentManager()); + }, HARD_REF_TO_DOCUMENT_KEY); + + registerApplicationService(PropertiesComponent.class, new AppPropertiesComponentImpl()); registerApplicationService(PsiBuilderFactory.class, new PsiBuilderFactoryImpl()); registerApplicationService(DefaultASTFactory.class, new CoreASTFactory()); + registerApplicationService(SchemeManagerFactory.class, new MockSchemeManagerFactory()); + registerApplicationService(FileTypeManager.class, mockFileTypeManager); + registerApplicationService(FileDocumentManager.class, mockFileDocumentManager); registerApplicationService(ProgressManager.class, new CoreProgressManager()); + registerComponentInstance(appContainer, FileTypeRegistry.class, mockFileTypeManager); + registerComponentInstance(appContainer, FileTypeManager.class, mockFileTypeManager); + registerComponentInstance(appContainer, EditorFactory.class, editorFactory); + registerComponentInstance(appContainer, FileDocumentManager.class, mockFileDocumentManager); + registerComponentInstance(appContainer, PsiDocumentManager.class, new MockPsiDocumentManager()); + + myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(myPsiManager))); myProject.registerService(PsiManager.class, myPsiManager); @@ -323,7 +337,7 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture { public static void ensureCorrectReparse(@NotNull PsiFile file) { String psiToStringDefault = DebugUtil.psiToString(file, false, false); String fileText = file.getText(); - DiffLog diffLog = (new BlockSupportImpl(file.getProject())).reparseRange( + DiffLog diffLog = (new BlockSupportImpl()).reparseRange( file, file.getNode(), TextRange.allOf(fileText), fileText, new EmptyProgressIndicator(), fileText); diffLog.performActualPsiChange(file); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.193 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.192 similarity index 91% rename from compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.193 rename to compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.192 index 2e42e3a75b2..8e34c41a923 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.193 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java.192 @@ -17,8 +17,6 @@ package org.jetbrains.kotlin.test.testFramework; import com.intellij.core.CoreASTFactory; -import com.intellij.ide.util.AppPropertiesComponentImpl; -import com.intellij.ide.util.PropertiesComponent; import com.intellij.lang.*; import com.intellij.lang.impl.PsiBuilderFactoryImpl; import com.intellij.mock.*; @@ -32,8 +30,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.impl.LoadTextUtil; import com.intellij.openapi.fileTypes.FileTypeFactory; import com.intellij.openapi.fileTypes.FileTypeManager; -import com.intellij.openapi.fileTypes.FileTypeRegistry; -import com.intellij.openapi.options.SchemeManagerFactory; import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.impl.CoreProgressManager; @@ -49,14 +45,14 @@ import com.intellij.psi.*; import com.intellij.psi.impl.*; import com.intellij.psi.util.CachedValuesManager; import com.intellij.testFramework.LightVirtualFile; -import com.intellij.testFramework.MockSchemeManagerFactory; import com.intellij.testFramework.TestDataFile; import com.intellij.util.CachedValuesManagerImpl; import com.intellij.util.Function; +import com.intellij.util.messages.MessageBus; +import com.intellij.util.messages.MessageBusFactory; import junit.framework.TestCase; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.KotlinFileType; import org.picocontainer.ComponentAdapter; import org.picocontainer.MutablePicoContainer; @@ -99,31 +95,21 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture { myPsiManager = new MockPsiManager(myProject); myFileFactory = new PsiFileFactoryImpl(myPsiManager); MutablePicoContainer appContainer = getApplication().getPicoContainer(); + registerComponentInstance(appContainer, MessageBus.class, MessageBusFactory.newMessageBus(getApplication())); final MockEditorFactory editorFactory = new MockEditorFactory(); - MockFileTypeManager mockFileTypeManager = new MockFileTypeManager(KotlinFileType.INSTANCE); - MockFileDocumentManagerImpl mockFileDocumentManager = new MockFileDocumentManagerImpl(new Function() { + registerComponentInstance(appContainer, EditorFactory.class, editorFactory); + registerComponentInstance(appContainer, FileDocumentManager.class, new MockFileDocumentManagerImpl(new Function() { @Override public Document fun(CharSequence charSequence) { return editorFactory.createDocument(charSequence); } - }, HARD_REF_TO_DOCUMENT_KEY); - - registerApplicationService(PropertiesComponent.class, new AppPropertiesComponentImpl()); + }, HARD_REF_TO_DOCUMENT_KEY)); + registerComponentInstance(appContainer, PsiDocumentManager.class, new MockPsiDocumentManager()); registerApplicationService(PsiBuilderFactory.class, new PsiBuilderFactoryImpl()); registerApplicationService(DefaultASTFactory.class, new CoreASTFactory()); - registerApplicationService(SchemeManagerFactory.class, new MockSchemeManagerFactory()); - registerApplicationService(FileTypeManager.class, mockFileTypeManager); - registerApplicationService(FileDocumentManager.class, mockFileDocumentManager); registerApplicationService(ProgressManager.class, new CoreProgressManager()); - registerComponentInstance(appContainer, FileTypeRegistry.class, mockFileTypeManager); - registerComponentInstance(appContainer, FileTypeManager.class, mockFileTypeManager); - registerComponentInstance(appContainer, EditorFactory.class, editorFactory); - registerComponentInstance(appContainer, FileDocumentManager.class, mockFileDocumentManager); - registerComponentInstance(appContainer, PsiDocumentManager.class, new MockPsiDocumentManager()); - - myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(myPsiManager))); myProject.registerService(PsiManager.class, myPsiManager); @@ -337,7 +323,7 @@ public abstract class KtParsingTestCase extends KtPlatformLiteFixture { public static void ensureCorrectReparse(@NotNull PsiFile file) { String psiToStringDefault = DebugUtil.psiToString(file, false, false); String fileText = file.getText(); - DiffLog diffLog = (new BlockSupportImpl()).reparseRange( + DiffLog diffLog = (new BlockSupportImpl(file.getProject())).reparseRange( file, file.getNode(), TextRange.allOf(fileText), fileText, new EmptyProgressIndicator(), fileText); diffLog.performActualPsiChange(file); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java index 37b08d64a89..918542f7249 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java @@ -35,7 +35,8 @@ public abstract class KtPlatformLiteFixture extends KtUsefulTestCase { @Override protected void setUp() throws Exception { super.setUp(); - Extensions.cleanRootArea(getTestRootDisposable()); + // FIXME: There is no `Extensions.cleanRootArea` in 193 + // Extensions.cleanRootArea(getTestRootDisposable()); } public static MockApplicationEx getApplication() { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java.193 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java.192 similarity index 96% rename from compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java.193 rename to compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java.192 index 918542f7249..37b08d64a89 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java.193 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java.192 @@ -35,8 +35,7 @@ public abstract class KtPlatformLiteFixture extends KtUsefulTestCase { @Override protected void setUp() throws Exception { super.setUp(); - // FIXME: There is no `Extensions.cleanRootArea` in 193 - // Extensions.cleanRootArea(getTestRootDisposable()); + Extensions.cleanRootArea(getTestRootDisposable()); } public static MockApplicationEx getApplication() { diff --git a/gradle/versions.properties b/gradle/versions.properties index 562adb50368..ea01292cebb 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -1,8 +1,8 @@ -versions.intellijSdk=192.7142.36 +versions.intellijSdk=193.6015.22-EAP-SNAPSHOT versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=181.3494.12 versions.jar.asm-all=7.0.1 -versions.jar.guava=25.1-jre +versions.jar.guava=27.1-jre versions.jar.groovy-all=2.4.17 versions.jar.lombok-ast=0.2.3 versions.jar.swingx-core=1.6.2-2 @@ -11,5 +11,6 @@ versions.jar.streamex=0.6.8 versions.jar.gson=2.8.5 versions.jar.oro=2.0.8 versions.jar.picocontainer=1.2 +versions.jar.serviceMessages=2019.1.4 ignore.jar.snappy-in-java=true versions.gradle-api=4.5.1 diff --git a/gradle/versions.properties.193 b/gradle/versions.properties.192 similarity index 77% rename from gradle/versions.properties.193 rename to gradle/versions.properties.192 index ea01292cebb..562adb50368 100644 --- a/gradle/versions.properties.193 +++ b/gradle/versions.properties.192 @@ -1,8 +1,8 @@ -versions.intellijSdk=193.6015.22-EAP-SNAPSHOT +versions.intellijSdk=192.7142.36 versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=181.3494.12 versions.jar.asm-all=7.0.1 -versions.jar.guava=27.1-jre +versions.jar.guava=25.1-jre versions.jar.groovy-all=2.4.17 versions.jar.lombok-ast=0.2.3 versions.jar.swingx-core=1.6.2-2 @@ -11,6 +11,5 @@ versions.jar.streamex=0.6.8 versions.jar.gson=2.8.5 versions.jar.oro=2.0.8 versions.jar.picocontainer=1.2 -versions.jar.serviceMessages=2019.1.4 ignore.jar.snappy-in-java=true versions.gradle-api=4.5.1 diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/KotlinMLRankingProvider.kt.193 b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/KotlinMLRankingProvider.kt similarity index 100% rename from idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/KotlinMLRankingProvider.kt.193 rename to idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/KotlinMLRankingProvider.kt diff --git a/idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Build Script.gradle.ft.193 b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/KotlinMLRankingProvider.kt.192 similarity index 100% rename from idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Build Script.gradle.ft.193 rename to idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ml/KotlinMLRankingProvider.kt.192 diff --git a/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java b/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java index 1450ed0f319..6398a2a7bc7 100644 --- a/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java +++ b/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java @@ -4,8 +4,8 @@ public class Testing { } } -// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractFun)" } -// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractFunWithExpressionBody)" } -// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractProperty)" } -// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractPropertyWithBody)" } -// ABSENT: { lookupString: "DefaultImpls", tailText: " (defaultImpls.AllAbstract)" } \ No newline at end of file +// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractFun" } +// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractFunWithExpressionBody" } +// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractProperty" } +// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractPropertyWithBody" } +// ABSENT: { lookupString: "DefaultImpls", tailText: " defaultImpls.AllAbstract" } \ No newline at end of file diff --git a/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.192 b/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.192 new file mode 100644 index 00000000000..1450ed0f319 --- /dev/null +++ b/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.192 @@ -0,0 +1,11 @@ +public class Testing { + public static void test() { + DefaultImpl + } +} + +// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractFun)" } +// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractFunWithExpressionBody)" } +// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractProperty)" } +// EXIST: { lookupString: "DefaultImpls", tailText: " (defaultImpls.NonAbstractPropertyWithBody)" } +// ABSENT: { lookupString: "DefaultImpls", tailText: " (defaultImpls.AllAbstract)" } \ No newline at end of file diff --git a/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.193 b/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.193 deleted file mode 100644 index 6398a2a7bc7..00000000000 --- a/idea/idea-completion/testData/injava/InterfaceDefaultImplsNonImported.java.193 +++ /dev/null @@ -1,11 +0,0 @@ -public class Testing { - public static void test() { - DefaultImpl - } -} - -// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractFun" } -// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractFunWithExpressionBody" } -// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractProperty" } -// EXIST: { lookupString: "DefaultImpls", tailText: " defaultImpls.NonAbstractPropertyWithBody" } -// ABSENT: { lookupString: "DefaultImpls", tailText: " defaultImpls.AllAbstract" } \ No newline at end of file diff --git a/idea/idea-completion/testData/injava/stdlib/List.java b/idea/idea-completion/testData/injava/stdlib/List.java index 953c2a0cc86..e12419f58cc 100644 --- a/idea/idea-completion/testData/injava/stdlib/List.java +++ b/idea/idea-completion/testData/injava/stdlib/List.java @@ -5,5 +5,5 @@ public class Testing { } // EXIST: EmptyList -// EXIST: { lookupString:List,tailText:" (java.util)" } -// ABSENT: { lookupString:List,tailText:" (kotlin.collections)" } \ No newline at end of file +// EXIST: { lookupString:List,tailText:" java.util" } +// ABSENT: { lookupString:List,tailText:" kotlin.collections" } \ No newline at end of file diff --git a/idea/idea-completion/testData/injava/stdlib/List.java.192 b/idea/idea-completion/testData/injava/stdlib/List.java.192 new file mode 100644 index 00000000000..953c2a0cc86 --- /dev/null +++ b/idea/idea-completion/testData/injava/stdlib/List.java.192 @@ -0,0 +1,9 @@ +public class Testing { + public static void test() { + List + } +} + +// EXIST: EmptyList +// EXIST: { lookupString:List,tailText:" (java.util)" } +// ABSENT: { lookupString:List,tailText:" (kotlin.collections)" } \ No newline at end of file diff --git a/idea/idea-completion/testData/injava/stdlib/List.java.193 b/idea/idea-completion/testData/injava/stdlib/List.java.193 deleted file mode 100644 index e12419f58cc..00000000000 --- a/idea/idea-completion/testData/injava/stdlib/List.java.193 +++ /dev/null @@ -1,9 +0,0 @@ -public class Testing { - public static void test() { - List - } -} - -// EXIST: EmptyList -// EXIST: { lookupString:List,tailText:" java.util" } -// ABSENT: { lookupString:List,tailText:" kotlin.collections" } \ No newline at end of file diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt index 0da5e248c7d..3bbe56bc7e3 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt @@ -27,7 +27,7 @@ abstract class AbstractKotlinSourceInJavaCompletionTest : KotlinFixtureCompletio val paths = collectPaths(mockLibDir).toTypedArray() paths.forEach { path -> - val vFile = myFixture.copyFileToProject(path, path.substring(mockPath.length)) + val vFile = myFixture.copyFileToProject(path.substringAfter(testDataPath), path.substring(mockPath.length)) myFixture.configureFromExistingVirtualFile(vFile) } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt.193 b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt.192 similarity index 92% rename from idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt.193 rename to idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt.192 index 3bbe56bc7e3..0da5e248c7d 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt.193 +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt.192 @@ -27,7 +27,7 @@ abstract class AbstractKotlinSourceInJavaCompletionTest : KotlinFixtureCompletio val paths = collectPaths(mockLibDir).toTypedArray() paths.forEach { path -> - val vFile = myFixture.copyFileToProject(path.substringAfter(testDataPath), path.substring(mockPath.length)) + val vFile = myFixture.copyFileToProject(path, path.substring(mockPath.length)) myFixture.configureFromExistingVirtualFile(vFile) } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinModelMetadataTest.kt.193 b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinModelMetadataTest.kt similarity index 100% rename from idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinModelMetadataTest.kt.193 rename to idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinModelMetadataTest.kt diff --git a/idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Settings.gradle.ft.193 b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinModelMetadataTest.kt.192 similarity index 100% rename from idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Settings.gradle.ft.193 rename to idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinModelMetadataTest.kt.192 diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt index f1743e57992..a3da71200b7 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt @@ -46,8 +46,6 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project override fun getAllMethodNames() = emptyArray() - override fun getAllMethodNames(set: HashSet) {} - override fun getFieldsByName(name: String, scope: GlobalSearchScope) = PsiField.EMPTY_ARRAY override fun getMethodsByNameIfNotMoreThan(name: String, scope: GlobalSearchScope, maxCount: Int) = PsiMethod.EMPTY_ARRAY @@ -56,7 +54,5 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project override fun getAllFieldNames() = emptyArray() - override fun getAllFieldNames(set: HashSet) {} - override fun getFieldsByNameIfNotMoreThan(name: String, scope: GlobalSearchScope, maxCount: Int) = PsiField.EMPTY_ARRAY } \ No newline at end of file diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt.193 b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt.192 similarity index 95% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt.193 rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt.192 index a3da71200b7..f1743e57992 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt.193 +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt.192 @@ -46,6 +46,8 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project override fun getAllMethodNames() = emptyArray() + override fun getAllMethodNames(set: HashSet) {} + override fun getFieldsByName(name: String, scope: GlobalSearchScope) = PsiField.EMPTY_ARRAY override fun getMethodsByNameIfNotMoreThan(name: String, scope: GlobalSearchScope, maxCount: Int) = PsiMethod.EMPTY_ARRAY @@ -54,5 +56,7 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project override fun getAllFieldNames() = emptyArray() + override fun getAllFieldNames(set: HashSet) {} + override fun getFieldsByNameIfNotMoreThan(name: String, scope: GlobalSearchScope, maxCount: Int) = PsiField.EMPTY_ARRAY } \ No newline at end of file diff --git a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt index c9628aceb6e..3b6520e0331 100644 --- a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt +++ b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt @@ -7,17 +7,12 @@ package org.jetbrains.kotlin.git import com.intellij.openapi.project.Project import com.intellij.openapi.util.Couple -import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.vcs.FilePath import git4idea.checkin.GitCheckinExplicitMovementProvider import org.jetbrains.kotlin.idea.actions.pathBeforeJ2K import java.util.* class KotlinExplicitMovementProvider : GitCheckinExplicitMovementProvider() { - init { - Registry.get("git.explicit.commit.renames.prohibit.multiple.calls").setValue(false) - } - override fun isEnabled(project: Project): Boolean { return true } diff --git a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.193 b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.192 similarity index 91% rename from idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.193 rename to idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.192 index 3b6520e0331..c9628aceb6e 100644 --- a/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.193 +++ b/idea/idea-git/src/org/jetbrains/kotlin/git/KotlinExplicitMovementProvider.kt.192 @@ -7,12 +7,17 @@ package org.jetbrains.kotlin.git import com.intellij.openapi.project.Project import com.intellij.openapi.util.Couple +import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.vcs.FilePath import git4idea.checkin.GitCheckinExplicitMovementProvider import org.jetbrains.kotlin.idea.actions.pathBeforeJ2K import java.util.* class KotlinExplicitMovementProvider : GitCheckinExplicitMovementProvider() { + init { + Registry.get("git.explicit.commit.renames.prohibit.multiple.calls").setValue(false) + } + override fun isEnabled(project: Project): Boolean { return true } diff --git a/idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Build Script.gradle.ft b/idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Build Script.gradle.ft.192 similarity index 100% rename from idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Build Script.gradle.ft rename to idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Build Script.gradle.ft.192 diff --git a/idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Settings.gradle.ft b/idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Settings.gradle.ft.192 similarity index 100% rename from idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Settings.gradle.ft rename to idea/idea-gradle/res/fileTemplates/Gradle Kotlin DSL Settings.gradle.ft.192 diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt index 7b82cd43452..5a89cf81a6b 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt @@ -26,18 +26,19 @@ class ShowKotlinGradleDslLogs : IntentionAction, AnAction(), DumbAware { } override fun actionPerformed(e: AnActionEvent) { - openLogsDirIfPresent(e.project) + val project = e.project ?: return + openLogsDirIfPresent(project) } override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?) = ShowFilePathAction.isSupported() override fun update(e: AnActionEvent) { val presentation = e.presentation - presentation.isVisible = ShowFilePathAction.isSupported() + presentation.isEnabledAndVisible = e.project != null && ShowFilePathAction.isSupported() presentation.text = NAME } - private fun openLogsDirIfPresent(project: Project?) { + private fun openLogsDirIfPresent(project: Project) { val logsDir = findLogsDir() if (logsDir != null) { ShowFilePathAction.openDirectory(logsDir) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt.192 similarity index 93% rename from idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt.193 rename to idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt.192 index 5a89cf81a6b..7b82cd43452 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt.193 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/actions/ShowKotlinGradleDslLogs.kt.192 @@ -26,19 +26,18 @@ class ShowKotlinGradleDslLogs : IntentionAction, AnAction(), DumbAware { } override fun actionPerformed(e: AnActionEvent) { - val project = e.project ?: return - openLogsDirIfPresent(project) + openLogsDirIfPresent(e.project) } override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?) = ShowFilePathAction.isSupported() override fun update(e: AnActionEvent) { val presentation = e.presentation - presentation.isEnabledAndVisible = e.project != null && ShowFilePathAction.isSupported() + presentation.isVisible = ShowFilePathAction.isSupported() presentation.text = NAME } - private fun openLogsDirIfPresent(project: Project) { + private fun openLogsDirIfPresent(project: Project?) { val logsDir = findLogsDir() if (logsDir != null) { ShowFilePathAction.openDirectory(logsDir) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt index c479b6557b2..d99f6180531 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt @@ -10,10 +10,8 @@ import com.intellij.ide.util.projectWizard.WizardContext import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager import com.intellij.openapi.externalSystem.model.ProjectSystemId import com.intellij.openapi.externalSystem.model.project.ModuleData -import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.module.Module -import com.intellij.openapi.roots.ui.configuration.ModulesProvider import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.KotlinIcons @@ -23,11 +21,13 @@ import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.TargetSupportException import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder -import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl import org.jetbrains.plugins.gradle.settings.DistributionType import com.intellij.openapi.externalSystem.model.project.ProjectData +import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep +import com.intellij.openapi.roots.ui.configuration.ModulesProvider import org.jetbrains.kotlin.idea.statistics.FUSEventGroups import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger +import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl import javax.swing.Icon abstract class KotlinGradleAbstractMultiplatformModuleBuilder( @@ -38,6 +38,20 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( override fun getNodeIcon(): Icon = KotlinIcons.MPP + /* + This overriding is a temporary workaround of a problem with how we use GradleModuleBuilder(). + IDEA implies that we will create new GradleModuleBuilder every time we call Kotlin New Project Wizard. + But we create it once for every kind of GradleModuleBuilder-based New Project Wizard and the just reuse it. + How the problem looks for a user: KT-34229 + Ticket that should properly fix it: KT-34591 + */ + override fun cleanup() { + super.cleanup() + this.name = null + this.contentEntryPath = null + this.moduleFilePath = null + } + override fun createWizardSteps(wizardContext: WizardContext, modulesProvider: ModulesProvider): Array { super.createWizardSteps(wizardContext, modulesProvider) // initializes GradleModuleBuilder.myWizardContext return arrayOf( diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 similarity index 93% rename from idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 rename to idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 index d99f6180531..c479b6557b2 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 @@ -10,8 +10,10 @@ import com.intellij.ide.util.projectWizard.WizardContext import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager import com.intellij.openapi.externalSystem.model.ProjectSystemId import com.intellij.openapi.externalSystem.model.project.ModuleData +import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.module.Module +import com.intellij.openapi.roots.ui.configuration.ModulesProvider import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.KotlinIcons @@ -21,13 +23,11 @@ import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.TargetSupportException import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder +import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl import org.jetbrains.plugins.gradle.settings.DistributionType import com.intellij.openapi.externalSystem.model.project.ProjectData -import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep -import com.intellij.openapi.roots.ui.configuration.ModulesProvider import org.jetbrains.kotlin.idea.statistics.FUSEventGroups import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger -import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl import javax.swing.Icon abstract class KotlinGradleAbstractMultiplatformModuleBuilder( @@ -38,20 +38,6 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( override fun getNodeIcon(): Icon = KotlinIcons.MPP - /* - This overriding is a temporary workaround of a problem with how we use GradleModuleBuilder(). - IDEA implies that we will create new GradleModuleBuilder every time we call Kotlin New Project Wizard. - But we create it once for every kind of GradleModuleBuilder-based New Project Wizard and the just reuse it. - How the problem looks for a user: KT-34229 - Ticket that should properly fix it: KT-34591 - */ - override fun cleanup() { - super.cleanup() - this.name = null - this.contentEntryPath = null - this.moduleFilePath = null - } - override fun createWizardSteps(wizardContext: WizardContext, modulesProvider: ModulesProvider): Array { super.createWizardSteps(wizardContext, modulesProvider) // initializes GradleModuleBuilder.myWizardContext return arrayOf( diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt index 0fe429786b3..bf3e89c476a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt @@ -7,9 +7,11 @@ package org.jetbrains.kotlin.idea.scripting.gradle.importing import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.project.ProjectData +import org.gradle.tooling.model.GradleProject import org.gradle.tooling.model.idea.IdeaProject import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported +import org.jetbrains.plugins.gradle.model.Build class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { override fun getModelProvider() = KotlinDslScriptModelProvider() @@ -19,7 +21,7 @@ class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { super.populateProjectExtraModels(gradleProject, ideProject) if (kotlinDslScriptsModelImportSupported(resolverCtx.projectGradleVersion)) { - populateBuildModels(gradleProject, ideProject) + populateBuildModels(resolverCtx.models.mainBuild, ideProject) resolverCtx.models.includedBuilds.forEach { includedRoot -> populateBuildModels(includedRoot, ideProject) @@ -28,12 +30,12 @@ class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { } private fun populateBuildModels( - root: IdeaProject, + root: Build, ideProject: DataNode ) { - root.modules.forEach { - if (it.gradleProject.parent == null) { - resolverCtx.getExtraProject(it, KotlinDslScriptsModel::class.java)?.let { model -> + root.projects.forEach { + if ((it as? GradleProject)?.parent == null) { + resolverCtx.models.getModel(it, KotlinDslScriptsModel::class.java)?.let { model -> ideProject.KOTLIN_DSL_SCRIPT_MODELS.addAll(model.toListOfScriptModels()) } } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192 similarity index 81% rename from idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.193 rename to idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192 index bf3e89c476a..0fe429786b3 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.193 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelResolver.kt.192 @@ -7,11 +7,9 @@ package org.jetbrains.kotlin.idea.scripting.gradle.importing import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.project.ProjectData -import org.gradle.tooling.model.GradleProject import org.gradle.tooling.model.idea.IdeaProject import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel import org.jetbrains.kotlin.idea.scripting.gradle.kotlinDslScriptsModelImportSupported -import org.jetbrains.plugins.gradle.model.Build class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { override fun getModelProvider() = KotlinDslScriptModelProvider() @@ -21,7 +19,7 @@ class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { super.populateProjectExtraModels(gradleProject, ideProject) if (kotlinDslScriptsModelImportSupported(resolverCtx.projectGradleVersion)) { - populateBuildModels(resolverCtx.models.mainBuild, ideProject) + populateBuildModels(gradleProject, ideProject) resolverCtx.models.includedBuilds.forEach { includedRoot -> populateBuildModels(includedRoot, ideProject) @@ -30,12 +28,12 @@ class KotlinDslScriptModelResolver : KotlinDslScriptModelResolverCommon() { } private fun populateBuildModels( - root: Build, + root: IdeaProject, ideProject: DataNode ) { - root.projects.forEach { - if ((it as? GradleProject)?.parent == null) { - resolverCtx.models.getModel(it, KotlinDslScriptsModel::class.java)?.let { model -> + root.modules.forEach { + if (it.gradleProject.parent == null) { + resolverCtx.getExtraProject(it, KotlinDslScriptsModel::class.java)?.let { model -> ideProject.KOTLIN_DSL_SCRIPT_MODELS.addAll(model.toListOfScriptModels()) } } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt index a922289d80f..bd7ec9cc219 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt @@ -21,7 +21,10 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.keymap.KeymapManager import com.intellij.openapi.keymap.KeymapUtil import com.intellij.openapi.project.DumbService +import com.intellij.task.ProjectTaskContext import com.intellij.task.ProjectTaskManager +import com.intellij.task.ProjectTaskNotification +import com.intellij.task.ProjectTaskResult import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.scratch.* import org.jetbrains.kotlin.idea.scratch.printDebugMessage @@ -72,19 +75,21 @@ class RunScratchAction : ScratchAction( if (!isAutoRun && module != null && isMakeBeforeRun) { val project = scratchFile.project - ProjectTaskManager.getInstance(project).build(arrayOf(module)) { result -> - if (result.isAborted || result.errors > 0) { - executor.errorOccurs("There were compilation errors in module ${module.name}") - } + ProjectTaskManager.getInstance(project).build(arrayOf(module), object : ProjectTaskNotification { + override fun finished(context: ProjectTaskContext, executionResult: ProjectTaskResult) { + if (executionResult.isAborted || executionResult.errors > 0) { + executor.errorOccurs("There were compilation errors in module ${module.name}") + } - if (DumbService.isDumb(project)) { - DumbService.getInstance(project).smartInvokeLater { + if (DumbService.isDumb(project)) { + DumbService.getInstance(project).smartInvokeLater { + executeScratch() + } + } else { executeScratch() } - } else { - executeScratch() } - } + }) } else { executeScratch() } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt.193 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt.192 similarity index 82% rename from idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt.193 rename to idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt.192 index bd7ec9cc219..a922289d80f 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt.193 +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/actions/RunScratchAction.kt.192 @@ -21,10 +21,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.keymap.KeymapManager import com.intellij.openapi.keymap.KeymapUtil import com.intellij.openapi.project.DumbService -import com.intellij.task.ProjectTaskContext import com.intellij.task.ProjectTaskManager -import com.intellij.task.ProjectTaskNotification -import com.intellij.task.ProjectTaskResult import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.scratch.* import org.jetbrains.kotlin.idea.scratch.printDebugMessage @@ -75,21 +72,19 @@ class RunScratchAction : ScratchAction( if (!isAutoRun && module != null && isMakeBeforeRun) { val project = scratchFile.project - ProjectTaskManager.getInstance(project).build(arrayOf(module), object : ProjectTaskNotification { - override fun finished(context: ProjectTaskContext, executionResult: ProjectTaskResult) { - if (executionResult.isAborted || executionResult.errors > 0) { - executor.errorOccurs("There were compilation errors in module ${module.name}") - } + ProjectTaskManager.getInstance(project).build(arrayOf(module)) { result -> + if (result.isAborted || result.errors > 0) { + executor.errorOccurs("There were compilation errors in module ${module.name}") + } - if (DumbService.isDumb(project)) { - DumbService.getInstance(project).smartInvokeLater { - executeScratch() - } - } else { + if (DumbService.isDumb(project)) { + DumbService.getInstance(project).smartInvokeLater { executeScratch() } + } else { + executeScratch() } - }) + } } else { executeScratch() } diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt index b0108dacd31..02f938dbdd8 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt @@ -22,7 +22,10 @@ import com.intellij.execution.ui.RunContentDescriptor import com.intellij.openapi.compiler.CompilerManager import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project +import com.intellij.task.ProjectTaskContext import com.intellij.task.ProjectTaskManager +import com.intellij.task.ProjectTaskNotification +import com.intellij.task.ProjectTaskResult class ConsoleCompilerHelper( private val project: Project, @@ -39,11 +42,13 @@ class ConsoleCompilerHelper( fun compileModule() { if (ExecutionManager.getInstance(project).contentManager.removeRunContent(executor, contentDescriptor)) { - ProjectTaskManager.getInstance(project).build(arrayOf(module)) { result -> - if (!module.isDisposed) { - KotlinConsoleKeeper.getInstance(project).run(module, previousCompilationFailed = result.errors > 0) + ProjectTaskManager.getInstance(project).build(arrayOf(module), object : ProjectTaskNotification { + override fun finished(context: ProjectTaskContext, executionResult: ProjectTaskResult) { + if (!module.isDisposed) { + KotlinConsoleKeeper.getInstance(project).run(module, previousCompilationFailed = executionResult.errors > 0) + } } - } + }) } } } \ No newline at end of file diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.193 b/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.192 similarity index 76% rename from idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.193 rename to idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.192 index 02f938dbdd8..b0108dacd31 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.193 +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/ConsoleCompilerHelper.kt.192 @@ -22,10 +22,7 @@ import com.intellij.execution.ui.RunContentDescriptor import com.intellij.openapi.compiler.CompilerManager import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project -import com.intellij.task.ProjectTaskContext import com.intellij.task.ProjectTaskManager -import com.intellij.task.ProjectTaskNotification -import com.intellij.task.ProjectTaskResult class ConsoleCompilerHelper( private val project: Project, @@ -42,13 +39,11 @@ class ConsoleCompilerHelper( fun compileModule() { if (ExecutionManager.getInstance(project).contentManager.removeRunContent(executor, contentDescriptor)) { - ProjectTaskManager.getInstance(project).build(arrayOf(module), object : ProjectTaskNotification { - override fun finished(context: ProjectTaskContext, executionResult: ProjectTaskResult) { - if (!module.isDisposed) { - KotlinConsoleKeeper.getInstance(project).run(module, previousCompilationFailed = executionResult.errors > 0) - } + ProjectTaskManager.getInstance(project).build(arrayOf(module)) { result -> + if (!module.isDisposed) { + KotlinConsoleKeeper.getInstance(project).run(module, previousCompilationFailed = result.errors > 0) } - }) + } } } } \ No newline at end of file diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index 52f8dd24e5b..061dc411ca9 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -86,9 +86,9 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix UnusedSymbolInspection() (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities() - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(project, KotlinTestUtils.getHomeDirectory()) - project.getComponent(EditorTracker::class.java)?.projectOpened() + EditorTracker.getInstance(project) invalidateLibraryCache(project) @@ -105,8 +105,6 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix override fun tearDown() { LoggedErrorProcessor.restoreDefaultProcessor() - VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) - super.tearDown() if (exceptions.isNotEmpty()) { diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.193 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.192 similarity index 98% rename from idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.193 rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.192 index 061dc411ca9..52f8dd24e5b 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.193 +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt.192 @@ -86,9 +86,9 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix UnusedSymbolInspection() (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities() - VfsRootAccess.allowRootAccess(project, KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) - EditorTracker.getInstance(project) + project.getComponent(EditorTracker::class.java)?.projectOpened() invalidateLibraryCache(project) @@ -105,6 +105,8 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix override fun tearDown() { LoggedErrorProcessor.restoreDefaultProcessor() + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) + super.tearDown() if (exceptions.isNotEmpty()) { diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java index 637c72e6871..07fd6548c28 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java @@ -17,8 +17,7 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.StdModuleTypes; +import com.intellij.openapi.module.ModuleTypeId; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; @@ -30,10 +29,11 @@ public class KotlinLightProjectDescriptor extends LightProjectDescriptor { } public static final KotlinLightProjectDescriptor INSTANCE = new KotlinLightProjectDescriptor(); - + + @NotNull @Override - public ModuleType getModuleType() { - return StdModuleTypes.JAVA; + public String getModuleTypeId() { + return ModuleTypeId.JAVA_MODULE; } @Override diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java.193 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java.192 similarity index 89% rename from idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java.193 rename to idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java.192 index 07fd6548c28..637c72e6871 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java.193 +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightProjectDescriptor.java.192 @@ -17,7 +17,8 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleTypeId; +import com.intellij.openapi.module.ModuleType; +import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; @@ -29,11 +30,10 @@ public class KotlinLightProjectDescriptor extends LightProjectDescriptor { } public static final KotlinLightProjectDescriptor INSTANCE = new KotlinLightProjectDescriptor(); - - @NotNull + @Override - public String getModuleTypeId() { - return ModuleTypeId.JAVA_MODULE; + public ModuleType getModuleType() { + return StdModuleTypes.JAVA; } @Override diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt index 5077c47f7c3..15871ccf7ed 100644 --- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt @@ -20,7 +20,7 @@ class CoroutineDebugConfigurationExtension : RunConfigurationExtension() { override fun ?> updateJavaParameters( configuration: T, - params: JavaParameters?, + params: JavaParameters, runnerSettings: RunnerSettings? ) { if (runnerSettings is DebuggingRunnerData && configuration is RunConfigurationBase<*>) { diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.193 b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.192 similarity index 97% rename from idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.193 rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.192 index 15871ccf7ed..5077c47f7c3 100644 --- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.193 +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.192 @@ -20,7 +20,7 @@ class CoroutineDebugConfigurationExtension : RunConfigurationExtension() { override fun ?> updateJavaParameters( configuration: T, - params: JavaParameters, + params: JavaParameters?, runnerSettings: RunnerSettings? ) { if (runnerSettings is DebuggingRunnerData && configuration is RunConfigurationBase<*>) { diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt index 22699ea3222..327af90be68 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt @@ -18,10 +18,11 @@ import com.intellij.openapi.project.ex.ProjectManagerEx import com.intellij.openapi.startup.StartupManager import com.intellij.psi.PsiDocumentManager import com.intellij.psi.impl.PsiDocumentManagerBase -import com.intellij.testFramework.PlatformTestUtil +import com.intellij.testFramework.ExtensionTestUtil import com.intellij.testFramework.runInEdtAndWait import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.idea.parameterInfo.HintType +import java.nio.file.Paths import java.io.PrintWriter import java.io.StringWriter @@ -66,7 +67,7 @@ fun dispatchAllInvocationEvents() { } fun loadProjectWithName(path: String, name: String): Project? = - ProjectManagerEx.getInstanceEx().loadProject(name, path) + ProjectManagerEx.getInstanceEx().loadProject(Paths.get(path), name) fun closeProject(project: Project) { dispatchAllInvocationEvents() @@ -76,7 +77,7 @@ fun closeProject(project: Project) { fun runStartupActivities(project: Project) { with(StartupManager.getInstance(project) as StartupManagerImpl) { - scheduleInitialVfsRefresh() + //scheduleInitialVfsRefresh() runStartupActivities() runPostStartupActivities() } @@ -87,7 +88,7 @@ fun waitForAllEditorsFinallyLoaded(project: Project) { } fun replaceWithCustomHighlighter(parentDisposable: Disposable, fromImplementationClass: String, toImplementationClass: String) { - val pointName = ExtensionPointName.create>(LanguageAnnotators.EP_NAME) + val pointName = ExtensionPointName.create>(LanguageAnnotators.EP_NAME.name) val extensionPoint = pointName.getPoint(null) val point = LanguageExtensionPoint() @@ -100,7 +101,7 @@ fun replaceWithCustomHighlighter(parentDisposable: Disposable, fromImplementatio .toList() // custom highlighter is already registered if filteredExtensions has the same size as extensions if (filteredExtensions.size < extensions.size) { - PlatformTestUtil.maskExtensions(pointName, filteredExtensions + listOf(point), parentDisposable) + ExtensionTestUtil.maskExtensions(pointName, filteredExtensions + listOf(point), parentDisposable) } } diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.193 b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.192 similarity index 91% rename from idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.193 rename to idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.192 index 327af90be68..22699ea3222 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.193 +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.192 @@ -18,11 +18,10 @@ import com.intellij.openapi.project.ex.ProjectManagerEx import com.intellij.openapi.startup.StartupManager import com.intellij.psi.PsiDocumentManager import com.intellij.psi.impl.PsiDocumentManagerBase -import com.intellij.testFramework.ExtensionTestUtil +import com.intellij.testFramework.PlatformTestUtil import com.intellij.testFramework.runInEdtAndWait import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.idea.parameterInfo.HintType -import java.nio.file.Paths import java.io.PrintWriter import java.io.StringWriter @@ -67,7 +66,7 @@ fun dispatchAllInvocationEvents() { } fun loadProjectWithName(path: String, name: String): Project? = - ProjectManagerEx.getInstanceEx().loadProject(Paths.get(path), name) + ProjectManagerEx.getInstanceEx().loadProject(name, path) fun closeProject(project: Project) { dispatchAllInvocationEvents() @@ -77,7 +76,7 @@ fun closeProject(project: Project) { fun runStartupActivities(project: Project) { with(StartupManager.getInstance(project) as StartupManagerImpl) { - //scheduleInitialVfsRefresh() + scheduleInitialVfsRefresh() runStartupActivities() runPostStartupActivities() } @@ -88,7 +87,7 @@ fun waitForAllEditorsFinallyLoaded(project: Project) { } fun replaceWithCustomHighlighter(parentDisposable: Disposable, fromImplementationClass: String, toImplementationClass: String) { - val pointName = ExtensionPointName.create>(LanguageAnnotators.EP_NAME.name) + val pointName = ExtensionPointName.create>(LanguageAnnotators.EP_NAME) val extensionPoint = pointName.getPoint(null) val point = LanguageExtensionPoint() @@ -101,7 +100,7 @@ fun replaceWithCustomHighlighter(parentDisposable: Disposable, fromImplementatio .toList() // custom highlighter is already registered if filteredExtensions has the same size as extensions if (filteredExtensions.size < extensions.size) { - ExtensionTestUtil.maskExtensions(pointName, filteredExtensions + listOf(point), parentDisposable) + PlatformTestUtil.maskExtensions(pointName, filteredExtensions + listOf(point), parentDisposable) } } diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources/META-INF/plugin.xml index c39c0bf94fe..6803208694b 100644 --- a/idea/resources/META-INF/plugin.xml +++ b/idea/resources/META-INF/plugin.xml @@ -13,13 +13,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. @snapshot@ JetBrains - + com.intellij.modules.platform JUnit - org.jetbrains.plugins.gradle - org.jetbrains.plugins.gradle.java + com.intellij.gradle + org.jetbrains.plugins.gradle org.intellij.groovy org.jetbrains.idea.maven TestNG-J @@ -82,10 +82,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. + + - - - - - diff --git a/idea/resources/META-INF/plugin.xml.193 b/idea/resources/META-INF/plugin.xml.192 similarity index 92% rename from idea/resources/META-INF/plugin.xml.193 rename to idea/resources/META-INF/plugin.xml.192 index 6803208694b..c39c0bf94fe 100644 --- a/idea/resources/META-INF/plugin.xml.193 +++ b/idea/resources/META-INF/plugin.xml.192 @@ -13,13 +13,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. @snapshot@ JetBrains - + com.intellij.modules.platform JUnit - com.intellij.gradle - org.jetbrains.plugins.gradle + org.jetbrains.plugins.gradle + org.jetbrains.plugins.gradle.java org.intellij.groovy org.jetbrains.idea.maven TestNG-J @@ -82,7 +82,10 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. - - + + + + + diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt index 3c1f34f18cb..7016ba1f00a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt @@ -83,9 +83,7 @@ abstract class AbstractCompletionBenchmarkAction : AnAction() { generateSequence { this.randomElement(random) }.distinct() internal fun collectSuitableKotlinFiles(project: Project, filePredicate: (KtFile) -> Boolean): MutableList { - val scope = object : DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) { - override fun isSearchOutsideRootModel(): Boolean = false - } + val scope = GlobalSearchScope.allScope(project) fun KtFile.isUsableForBenchmark(): Boolean { val moduleInfo = this.getNullableModuleInfo() ?: return false diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt.193 b/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt.192 similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt.193 rename to idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt.192 index 7016ba1f00a..3c1f34f18cb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt.192 @@ -83,7 +83,9 @@ abstract class AbstractCompletionBenchmarkAction : AnAction() { generateSequence { this.randomElement(random) }.distinct() internal fun collectSuitableKotlinFiles(project: Project, filePredicate: (KtFile) -> Boolean): MutableList { - val scope = GlobalSearchScope.allScope(project) + val scope = object : DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) { + override fun isSearchOutsideRootModel(): Boolean = false + } fun KtFile.isUsableForBenchmark(): Boolean { val moduleInfo = this.getNullableModuleInfo() ?: return false diff --git a/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt b/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt index 5d600cb5665..2b0968a71ae 100644 --- a/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt +++ b/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt @@ -5,8 +5,6 @@ package org.jetbrains.kotlin.idea.migration -import com.intellij.codeInspection.InspectionEP -import com.intellij.codeInspection.InspectionProfileEntry import com.intellij.codeInspection.ex.InspectionManagerEx import com.intellij.codeInspection.ex.InspectionProfileImpl import com.intellij.codeInspection.ex.InspectionToolWrapper @@ -56,7 +54,7 @@ fun createMigrationProfile( fun applicableMigrationTools(migrationInfo: MigrationInfo) = applicableMigrationToolsImpl(migrationInfo) -private fun applicableMigrationToolsImpl(migrationInfo: MigrationInfo?): List> { +private fun applicableMigrationToolsImpl(migrationInfo: MigrationInfo?): List> { val rootProfile = InspectionProfileManager.getInstance().currentProfile return rootProfile.allTools.asSequence() diff --git a/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt.193 b/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt.192 similarity index 93% rename from idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt.193 rename to idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt.192 index 2b0968a71ae..5d600cb5665 100644 --- a/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/migration/kotlinMigrationProfile.kt.192 @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.idea.migration +import com.intellij.codeInspection.InspectionEP +import com.intellij.codeInspection.InspectionProfileEntry import com.intellij.codeInspection.ex.InspectionManagerEx import com.intellij.codeInspection.ex.InspectionProfileImpl import com.intellij.codeInspection.ex.InspectionToolWrapper @@ -54,7 +56,7 @@ fun createMigrationProfile( fun applicableMigrationTools(migrationInfo: MigrationInfo) = applicableMigrationToolsImpl(migrationInfo) -private fun applicableMigrationToolsImpl(migrationInfo: MigrationInfo?): List> { +private fun applicableMigrationToolsImpl(migrationInfo: MigrationInfo?): List> { val rootProfile = InspectionProfileManager.getInstance().currentProfile return rootProfile.allTools.asSequence() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index 342a9ff799f..302548ac3d0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -41,7 +41,6 @@ import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsExcepti import com.intellij.refactoring.changeSignature.ChangeSignatureUtil import com.intellij.refactoring.listeners.RefactoringEventData import com.intellij.refactoring.listeners.RefactoringEventListener -import com.intellij.refactoring.rename.PsiElementRenameHandler import com.intellij.refactoring.ui.ConflictsDialog import com.intellij.refactoring.util.ConflictsUtil import com.intellij.refactoring.util.RefactoringUIUtil @@ -485,7 +484,7 @@ private fun copyTypeParameters( inserter(to, factory.createTypeParameterList()) val targetTypeParamList = to.typeParameterList val newTypeParams = templateTypeParams.map { - factory.createTypeParameter(it.name, it.extendsList.referencedTypes) + factory.createTypeParameter(it.name!!, it.extendsList.referencedTypes) } ChangeSignatureUtil.synchronizeList( targetTypeParamList, @@ -960,20 +959,17 @@ fun checkSuperMethodsWithPopup( append(" of ") append(SymbolPresentationUtil.getSymbolPresentableText(superClass)) } - + val list = JBList(renameBase, renameCurrent) JBPopupFactory.getInstance() - .createPopupChooserBuilder(listOf(renameBase, renameCurrent)) + .createListPopupBuilder(list) .setTitle(title) .setMovable(false) .setResizable(false) .setRequestFocus(true) - .setItemChosenCallback { selected -> - if (selected == renameBase) { - val ableToRename = declaration.project.let { project -> - deepestSuperMethods.all { PsiElementRenameHandler.canRename(project, editor, it) } - } - if (ableToRename) action(deepestSuperMethods + declaration) - } else action(listOf(declaration)) + .setItemChoosenCallback { + val value = list.selectedValue ?: return@setItemChoosenCallback + val chosenElements = if (value == renameBase) deepestSuperMethods + declaration else listOf(declaration) + action(chosenElements) } .createPopup() .showInBestPositionFor(editor) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.192 similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.192 index 302548ac3d0..342a9ff799f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.192 @@ -41,6 +41,7 @@ import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsExcepti import com.intellij.refactoring.changeSignature.ChangeSignatureUtil import com.intellij.refactoring.listeners.RefactoringEventData import com.intellij.refactoring.listeners.RefactoringEventListener +import com.intellij.refactoring.rename.PsiElementRenameHandler import com.intellij.refactoring.ui.ConflictsDialog import com.intellij.refactoring.util.ConflictsUtil import com.intellij.refactoring.util.RefactoringUIUtil @@ -484,7 +485,7 @@ private fun copyTypeParameters( inserter(to, factory.createTypeParameterList()) val targetTypeParamList = to.typeParameterList val newTypeParams = templateTypeParams.map { - factory.createTypeParameter(it.name!!, it.extendsList.referencedTypes) + factory.createTypeParameter(it.name, it.extendsList.referencedTypes) } ChangeSignatureUtil.synchronizeList( targetTypeParamList, @@ -959,17 +960,20 @@ fun checkSuperMethodsWithPopup( append(" of ") append(SymbolPresentationUtil.getSymbolPresentableText(superClass)) } - val list = JBList(renameBase, renameCurrent) + JBPopupFactory.getInstance() - .createListPopupBuilder(list) + .createPopupChooserBuilder(listOf(renameBase, renameCurrent)) .setTitle(title) .setMovable(false) .setResizable(false) .setRequestFocus(true) - .setItemChoosenCallback { - val value = list.selectedValue ?: return@setItemChoosenCallback - val chosenElements = if (value == renameBase) deepestSuperMethods + declaration else listOf(declaration) - action(chosenElements) + .setItemChosenCallback { selected -> + if (selected == renameBase) { + val ableToRename = declaration.project.let { project -> + deepestSuperMethods.all { PsiElementRenameHandler.canRename(project, editor, it) } + } + if (ableToRename) action(deepestSuperMethods + declaration) + } else action(listOf(declaration)) } .createPopup() .showInBestPositionFor(editor) diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt b/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt index 13cf0e40aa7..7140fba5442 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt @@ -10,5 +10,5 @@ import java.util.concurrent.Future object ProgressIndicatorUtils { @JvmStatic fun awaitWithCheckCanceled(future: Future) = - com.intellij.openapi.progress.util.BackgroundTaskUtil.awaitWithCheckCanceled(future) + com.intellij.openapi.progress.util.ProgressIndicatorUtils.awaitWithCheckCanceled(future) } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt.193 b/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt.192 similarity index 80% rename from idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt.193 rename to idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt.192 index 7140fba5442..13cf0e40aa7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/util/ProgressIndicatorUtils.kt.192 @@ -10,5 +10,5 @@ import java.util.concurrent.Future object ProgressIndicatorUtils { @JvmStatic fun awaitWithCheckCanceled(future: Future) = - com.intellij.openapi.progress.util.ProgressIndicatorUtils.awaitWithCheckCanceled(future) + com.intellij.openapi.progress.util.BackgroundTaskUtil.awaitWithCheckCanceled(future) } \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.193 rename to idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail diff --git a/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.192 b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail similarity index 100% rename from idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.193 rename to idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail diff --git a/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.192 b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt.fail.193 b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt.fail similarity index 100% rename from idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt.fail.193 rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt.fail diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt.fail.192 b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt.fail.193 b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt.fail similarity index 100% rename from idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt.fail.193 rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt.fail diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt.fail.192 b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt.fail.193 b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt.fail similarity index 100% rename from idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt.fail.193 rename to idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt.fail diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt.fail.192 b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after index e796ed80335..d3b94674a2e 100644 --- a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after +++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after @@ -4,9 +4,7 @@ plugins { group 'testgroup' version '1.0-SNAPSHOT' repositories { - maven { - url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' - } + maven { url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' } mavenCentral() } dependencies { diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.193 b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.192 similarity index 64% rename from idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.193 rename to idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.192 index d3b94674a2e..e796ed80335 100644 --- a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.193 +++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after.192 @@ -4,7 +4,9 @@ plugins { group 'testgroup' version '1.0-SNAPSHOT' repositories { - maven { url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' } + maven { + url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' + } mavenCentral() } dependencies { diff --git a/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml index 4bb58ee5816..3d9f3e1e5fe 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml +++ b/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml.193 b/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml.192 similarity index 93% rename from idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml.193 rename to idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml.192 index 3d9f3e1e5fe..4bb58ee5816 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml.193 +++ b/idea/testData/hierarchy/calls/callers/kotlinClass/KotlinClass_verification.xml.192 @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml index a217f227f31..b33f78407e0 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml +++ b/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml.193 b/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml.192 similarity index 92% rename from idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml.193 rename to idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml.192 index b33f78407e0..a217f227f31 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml.193 +++ b/idea/testData/hierarchy/calls/callers/kotlinFunction/KotlinFunction_verification.xml.192 @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml index 2fd5633ea81..0bf87cf968d 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml +++ b/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml.193 b/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml.192 similarity index 93% rename from idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml.193 rename to idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml.192 index 0bf87cf968d..2fd5633ea81 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml.193 +++ b/idea/testData/hierarchy/calls/callers/kotlinNestedClass/KotlinNestedClass_verification.xml.192 @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml index 2fd5633ea81..0bf87cf968d 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml +++ b/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml.193 b/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml.192 similarity index 93% rename from idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml.193 rename to idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml.192 index 0bf87cf968d..2fd5633ea81 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml.193 +++ b/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/KotlinNestedInnerClass_verification.xml.192 @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml index bc5d565ec44..84c8e70bcfc 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml +++ b/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml.193 b/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml.192 similarity index 93% rename from idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml.193 rename to idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml.192 index 84c8e70bcfc..bc5d565ec44 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml.193 +++ b/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/KotlinPackageFunction_verification.xml.192 @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml index cc5f0550703..55a4cdc1f0e 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml +++ b/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml.193 b/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml.192 similarity index 93% rename from idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml.193 rename to idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml.192 index 55a4cdc1f0e..cc5f0550703 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml.193 +++ b/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/KotlinPackageProperty_verification.xml.192 @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml b/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml index 5c043b80d32..3a34f6e68fa 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml +++ b/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml.193 b/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml.192 similarity index 92% rename from idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml.193 rename to idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml.192 index 3a34f6e68fa..5c043b80d32 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml.193 +++ b/idea/testData/hierarchy/calls/callers/kotlinProperty/KotlinProperty_verification.xml.192 @@ -1,5 +1,5 @@ - + diff --git a/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml b/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml index bc89a4b1c3c..5939cadee2d 100644 --- a/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml +++ b/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml @@ -1,5 +1,5 @@ - - - - \ No newline at end of file + + + + diff --git a/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.192 b/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.192 new file mode 100644 index 00000000000..bc89a4b1c3c --- /dev/null +++ b/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.192 @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.193 b/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.193 deleted file mode 100644 index 5939cadee2d..00000000000 --- a/idea/testData/hierarchy/calls/callersJava/javaMethod/JavaMethod_verification.xml.193 +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/idea/testData/parameterInfo/withLib1/useJavaFromLib.kt.fail.193 b/idea/testData/parameterInfo/withLib1/useJavaFromLib.kt.fail similarity index 100% rename from idea/testData/parameterInfo/withLib1/useJavaFromLib.kt.fail.193 rename to idea/testData/parameterInfo/withLib1/useJavaFromLib.kt.fail diff --git a/idea/testData/parameterInfo/withLib1/useJavaFromLib.kt.fail.192 b/idea/testData/parameterInfo/withLib1/useJavaFromLib.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/parameterInfo/withLib2/useJavaSAMFromLib.kt.fail.193 b/idea/testData/parameterInfo/withLib2/useJavaSAMFromLib.kt.fail similarity index 100% rename from idea/testData/parameterInfo/withLib2/useJavaSAMFromLib.kt.fail.193 rename to idea/testData/parameterInfo/withLib2/useJavaSAMFromLib.kt.fail diff --git a/idea/testData/parameterInfo/withLib2/useJavaSAMFromLib.kt.fail.192 b/idea/testData/parameterInfo/withLib2/useJavaSAMFromLib.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt.fail.193 b/idea/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt.fail similarity index 100% rename from idea/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt.fail.193 rename to idea/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt.fail diff --git a/idea/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt.fail.192 b/idea/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/resolve/referenceInLib/inLibrarySource.kt.fail.193 b/idea/testData/resolve/referenceInLib/inLibrarySource.kt.fail similarity index 100% rename from idea/testData/resolve/referenceInLib/inLibrarySource.kt.fail.193 rename to idea/testData/resolve/referenceInLib/inLibrarySource.kt.fail diff --git a/idea/testData/resolve/referenceInLib/inLibrarySource.kt.fail.192 b/idea/testData/resolve/referenceInLib/inLibrarySource.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/resolve/referenceInLib/toFunParameter.kt.fail.193 b/idea/testData/resolve/referenceInLib/toFunParameter.kt.fail similarity index 100% rename from idea/testData/resolve/referenceInLib/toFunParameter.kt.fail.193 rename to idea/testData/resolve/referenceInLib/toFunParameter.kt.fail diff --git a/idea/testData/resolve/referenceInLib/toFunParameter.kt.fail.192 b/idea/testData/resolve/referenceInLib/toFunParameter.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/resolve/referenceInLib/toLocalFun.kt.fail.193 b/idea/testData/resolve/referenceInLib/toLocalFun.kt.fail similarity index 100% rename from idea/testData/resolve/referenceInLib/toLocalFun.kt.fail.193 rename to idea/testData/resolve/referenceInLib/toLocalFun.kt.fail diff --git a/idea/testData/resolve/referenceInLib/toLocalFun.kt.fail.192 b/idea/testData/resolve/referenceInLib/toLocalFun.kt.fail.192 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt index 103160cf86d..95bf61aff81 100644 --- a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -abstract class AbstractDataFlowValueRenderingTest : KotlinLightCodeInsightFixtureTestCase() { +abstract class AbstractDataFlowValueRenderingTest: KotlinLightCodeInsightFixtureTestCase() { private fun IdentifierInfo.render(): String? = when (this) { is IdentifierInfo.Expression -> expression.text @@ -34,19 +34,21 @@ abstract class AbstractDataFlowValueRenderingTest : KotlinLightCodeInsightFixtur } private fun DataFlowValue.render() = - // If it is not a stable identifier, there's no point in rendering it - if (!isStable) null - else identifierInfo.render() + // If it is not a stable identifier, there's no point in rendering it + if (!isStable) null + else identifierInfo.render() - override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/dataFlowValueRendering/" + override fun getTestDataPath() : String { + return PluginTestCaseBase.getTestDataPathBase() + "/dataFlowValueRendering/" + } override fun getProjectDescriptor(): LightProjectDescriptor { return LightCodeInsightFixtureTestCase.JAVA_LATEST } - fun doTest(fileName: String) { + fun doTest(path: String) { val fixture = myFixture - fixture.configureByFile(fileName) + fixture.configureByFile(fileName()) val jetFile = fixture.file as KtFile val element = jetFile.findElementAt(fixture.caretOffset)!! @@ -56,6 +58,6 @@ abstract class AbstractDataFlowValueRenderingTest : KotlinLightCodeInsightFixtur val allValues = (info.completeTypeInfo.keySet() + info.completeNullabilityInfo.keySet()).toSet() val actual = allValues.mapNotNull { it.render() }.sorted().joinToString("\n") - KotlinTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual) + KotlinTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(path) + ".txt"), actual) } } diff --git a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt.193 b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt.192 similarity index 82% rename from idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt.193 rename to idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt.192 index 95bf61aff81..103160cf86d 100644 --- a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt.193 +++ b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt.192 @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -abstract class AbstractDataFlowValueRenderingTest: KotlinLightCodeInsightFixtureTestCase() { +abstract class AbstractDataFlowValueRenderingTest : KotlinLightCodeInsightFixtureTestCase() { private fun IdentifierInfo.render(): String? = when (this) { is IdentifierInfo.Expression -> expression.text @@ -34,21 +34,19 @@ abstract class AbstractDataFlowValueRenderingTest: KotlinLightCodeInsightFixture } private fun DataFlowValue.render() = - // If it is not a stable identifier, there's no point in rendering it - if (!isStable) null - else identifierInfo.render() + // If it is not a stable identifier, there's no point in rendering it + if (!isStable) null + else identifierInfo.render() - override fun getTestDataPath() : String { - return PluginTestCaseBase.getTestDataPathBase() + "/dataFlowValueRendering/" - } + override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/dataFlowValueRendering/" override fun getProjectDescriptor(): LightProjectDescriptor { return LightCodeInsightFixtureTestCase.JAVA_LATEST } - fun doTest(path: String) { + fun doTest(fileName: String) { val fixture = myFixture - fixture.configureByFile(fileName()) + fixture.configureByFile(fileName) val jetFile = fixture.file as KtFile val element = jetFile.findElementAt(fixture.caretOffset)!! @@ -58,6 +56,6 @@ abstract class AbstractDataFlowValueRenderingTest: KotlinLightCodeInsightFixture val allValues = (info.completeTypeInfo.keySet() + info.completeNullabilityInfo.keySet()).toSet() val actual = allValues.mapNotNull { it.render() }.sorted().joinToString("\n") - KotlinTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(path) + ".txt"), actual) + KotlinTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual) } } diff --git a/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt b/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt index 374549a00a0..19455d26202 100644 --- a/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt +++ b/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt @@ -15,7 +15,7 @@ import java.io.File abstract class AbstractUpdateKotlinCopyrightTest : KotlinLightCodeInsightFixtureTestCase() { fun doTest(path: String) { - myFixture.configureByFile(path) + myFixture.configureByFile(fileName()) val fileText = myFixture.file.text.trim() val expectedNumberOfComments = InTextDirectivesUtils.getPrefixedInt(fileText, "// COMMENTS: ") ?: run { diff --git a/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt.193 b/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt.192 similarity index 97% rename from idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt.193 rename to idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt.192 index 19455d26202..374549a00a0 100644 --- a/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt.193 +++ b/idea/tests/org/jetbrains/kotlin/copyright/AbstractUpdateKotlinCopyrightTest.kt.192 @@ -15,7 +15,7 @@ import java.io.File abstract class AbstractUpdateKotlinCopyrightTest : KotlinLightCodeInsightFixtureTestCase() { fun doTest(path: String) { - myFixture.configureByFile(fileName()) + myFixture.configureByFile(path) val fileText = myFixture.file.text.trim() val expectedNumberOfComments = InTextDirectivesUtils.getPrefixedInt(fileText, "// COMMENTS: ") ?: run { diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java index 6d83287dfd6..5dd7eaf40e4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.util.io.FileUtilRt; @@ -116,22 +115,22 @@ public abstract class AbstractConfigureProjectByChangingFileTest name.startsWith("$prefix.") && name != mainFile.name } - .forEach { myFixture.configureByFile(FileUtil.toSystemIndependentName(it.path)) } + .forEach { myFixture.configureByFile(it.absolutePath.substringAfter(myFixture.testDataPath)) } - myFixture.configureByFile(fileName) + myFixture.configureByFile(File(fileName).absolutePath.substringAfter(myFixture.testDataPath)) val file = myFixture.file as KtFile @@ -64,7 +64,7 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() { val handlers = ShowParameterInfoHandler.getHandlers(project, KotlinLanguage.INSTANCE)!! val handler = handlers.firstOrNull { it.findElementForParameterInfo(context) != null } - ?: error("Could not find parameter info handler") + ?: error("Could not find parameter info handler") val mockCreateParameterInfoContext = MockCreateParameterInfoContext(file, myFixture) val parameterOwner = handler.findElementForParameterInfo(mockCreateParameterInfoContext) as PsiElement diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt.192 similarity index 93% rename from idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt.193 rename to idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt.192 index f1b74db5f12..68768ef74dd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt.193 +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt.192 @@ -44,9 +44,9 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() { val mainFile = File(FileUtil.toSystemDependentName(fileName)) mainFile.parentFile .listFiles { _, name -> name.startsWith("$prefix.") && name != mainFile.name } - .forEach { myFixture.configureByFile(it.absolutePath.substringAfter(myFixture.testDataPath)) } + .forEach { myFixture.configureByFile(FileUtil.toSystemIndependentName(it.path)) } - myFixture.configureByFile(File(fileName).absolutePath.substringAfter(myFixture.testDataPath)) + myFixture.configureByFile(fileName) val file = myFixture.file as KtFile @@ -64,7 +64,7 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() { val handlers = ShowParameterInfoHandler.getHandlers(project, KotlinLanguage.INSTANCE)!! val handler = handlers.firstOrNull { it.findElementForParameterInfo(context) != null } - ?: error("Could not find parameter info handler") + ?: error("Could not find parameter info handler") val mockCreateParameterInfoContext = MockCreateParameterInfoContext(file, myFixture) val parameterOwner = handler.findElementForParameterInfo(mockCreateParameterInfoContext) as PsiElement diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt b/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt index 6959dea0ab0..2a450ccb34e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt @@ -7,9 +7,7 @@ package org.jetbrains.kotlin.idea.script import com.intellij.openapi.Disposable import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.project.Project -import com.intellij.testFramework.PlatformTestUtil fun addExtensionPointInTest( pointName: ExtensionPointName, @@ -17,10 +15,5 @@ fun addExtensionPointInTest( provider: T, testRootDisposable: Disposable ) { - PlatformTestUtil.registerExtension( - Extensions.getArea(project), - pointName, - provider, - testRootDisposable - ) -} + pointName.getPoint(project).registerExtension(provider, testRootDisposable) +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 b/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.192 similarity index 68% rename from idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 rename to idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.192 index 2a450ccb34e..6959dea0ab0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.193 +++ b/idea/tests/org/jetbrains/kotlin/idea/script/extensionsUtil.kt.192 @@ -7,7 +7,9 @@ package org.jetbrains.kotlin.idea.script import com.intellij.openapi.Disposable import com.intellij.openapi.extensions.ExtensionPointName +import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.project.Project +import com.intellij.testFramework.PlatformTestUtil fun addExtensionPointInTest( pointName: ExtensionPointName, @@ -15,5 +17,10 @@ fun addExtensionPointInTest( provider: T, testRootDisposable: Disposable ) { - pointName.getPoint(project).registerExtension(provider, testRootDisposable) -} \ No newline at end of file + PlatformTestUtil.registerExtension( + Extensions.getArea(project), + pointName, + provider, + testRootDisposable + ) +} diff --git a/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt b/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt index 0aad902b341..c58286d5def 100644 --- a/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt +++ b/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt @@ -15,15 +15,15 @@ import com.intellij.openapi.roots.libraries.PersistentLibraryKind import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile -import com.intellij.testFramework.PlatformTestCase +import com.intellij.testFramework.HeavyPlatformTestCase import org.jetbrains.kotlin.test.testFramework.runWriteAction import java.io.File -fun PlatformTestCase.projectLibrary( - libraryName: String = "TestLibrary", - classesRoot: VirtualFile? = null, - sourcesRoot: VirtualFile? = null, - kind: PersistentLibraryKind<*>? = null +fun HeavyPlatformTestCase.projectLibrary( + libraryName: String = "TestLibrary", + classesRoot: VirtualFile? = null, + sourcesRoot: VirtualFile? = null, + kind: PersistentLibraryKind<*>? = null ): Library { return runWriteAction { val modifiableModel = ProjectLibraryTable.getInstance(project).modifiableModel @@ -32,7 +32,7 @@ fun PlatformTestCase.projectLibrary( } finally { modifiableModel.commit() } - with(library.modifiableModel) { + with (library.modifiableModel) { classesRoot?.let { addRoot(it, OrderRootType.CLASSES) } sourcesRoot?.let { addRoot(it, OrderRootType.SOURCES) } commit() @@ -48,7 +48,7 @@ val File.jarRoot: VirtualFile } fun Module.addDependency( - library: Library, - dependencyScope: DependencyScope = DependencyScope.COMPILE, - exported: Boolean = false + library: Library, + dependencyScope: DependencyScope = DependencyScope.COMPILE, + exported: Boolean = false ) = ModuleRootModificationUtil.addDependency(this, library, dependencyScope, exported) diff --git a/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt.193 b/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt.192 similarity index 79% rename from idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt.193 rename to idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt.192 index c58286d5def..0aad902b341 100644 --- a/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt.193 +++ b/idea/tests/org/jetbrains/kotlin/test/util/ProjectStructureUtils.kt.192 @@ -15,15 +15,15 @@ import com.intellij.openapi.roots.libraries.PersistentLibraryKind import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile -import com.intellij.testFramework.HeavyPlatformTestCase +import com.intellij.testFramework.PlatformTestCase import org.jetbrains.kotlin.test.testFramework.runWriteAction import java.io.File -fun HeavyPlatformTestCase.projectLibrary( - libraryName: String = "TestLibrary", - classesRoot: VirtualFile? = null, - sourcesRoot: VirtualFile? = null, - kind: PersistentLibraryKind<*>? = null +fun PlatformTestCase.projectLibrary( + libraryName: String = "TestLibrary", + classesRoot: VirtualFile? = null, + sourcesRoot: VirtualFile? = null, + kind: PersistentLibraryKind<*>? = null ): Library { return runWriteAction { val modifiableModel = ProjectLibraryTable.getInstance(project).modifiableModel @@ -32,7 +32,7 @@ fun HeavyPlatformTestCase.projectLibrary( } finally { modifiableModel.commit() } - with (library.modifiableModel) { + with(library.modifiableModel) { classesRoot?.let { addRoot(it, OrderRootType.CLASSES) } sourcesRoot?.let { addRoot(it, OrderRootType.SOURCES) } commit() @@ -48,7 +48,7 @@ val File.jarRoot: VirtualFile } fun Module.addDependency( - library: Library, - dependencyScope: DependencyScope = DependencyScope.COMPILE, - exported: Boolean = false + library: Library, + dependencyScope: DependencyScope = DependencyScope.COMPILE, + exported: Boolean = false ) = ModuleRootModificationUtil.addDependency(this, library, dependencyScope, exported) diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt index fb7dde64b25..44f97066eb6 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt @@ -59,7 +59,8 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { } fun setUpJavaCoreEnvironment(): JavaCoreProjectEnvironment { - Extensions.cleanRootArea(DISPOSABLE) + // FIXME: There is no `Extensions.cleanRootArea` in 193 platform + // Extensions.cleanRootArea(DISPOSABLE) val area = Extensions.getRootArea() registerExtensionPoints(area) diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.192 similarity index 98% rename from j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 rename to j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.192 index 44f97066eb6..fb7dde64b25 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.192 @@ -59,8 +59,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { } fun setUpJavaCoreEnvironment(): JavaCoreProjectEnvironment { - // FIXME: There is no `Extensions.cleanRootArea` in 193 platform - // Extensions.cleanRootArea(DISPOSABLE) + Extensions.cleanRootArea(DISPOSABLE) val area = Extensions.getRootArea() registerExtensionPoints(area) diff --git a/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt b/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt index d81f5e60237..a46a7c564a8 100644 --- a/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt +++ b/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt @@ -20,6 +20,7 @@ import com.intellij.testFramework.registerServiceInstance import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.uast.UExpression import org.jetbrains.uast.evaluateString import org.jetbrains.uast.toUElementOfType @@ -32,36 +33,35 @@ class KotlinUastReferencesTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE - @Test fun `test original getter is visible when reference is under renaming`() { + KotlinTestUtils.runTest(this) { + registerReferenceProviders(testRootDisposable) { + registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost -> + arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost)) + }) + } - registerReferenceProviders(testRootDisposable) { - registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost -> - arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost)) - }) - } + myFixture.configureByText( + "KotlinBean.kt", """ + data class KotlinBean(val myField: String) - myFixture.configureByText( - "KotlinBean.kt", """ - data class KotlinBean(val myField: String) + val reference = "myField" - val reference = "myField" + """.trimIndent() + ) - """.trimIndent() - ) + myFixture.renameElementAtCaret("myRenamedField") - myFixture.renameElementAtCaret("myRenamedField") - - myFixture.checkResult( - """ + myFixture.checkResult( + """ data class KotlinBean(val myRenamedField: String) val reference = "myRenamedField" - """.trimIndent() - ) - + """.trimIndent() + ) + } } } @@ -99,25 +99,26 @@ fun registerReferenceProviders(disposable: Disposable, registerContributors: Psi } fun registerReferenceContributor(contributor: PsiReferenceContributor, disposable: Disposable) { - val referenceContributorEp = Extensions.getArea(null).getExtensionPoint(PsiReferenceContributor.EP_NAME.name) - - val contributorEp = object : PsiReferenceContributorEP() { - override fun getInstance(): PsiReferenceContributor = contributor - } - - referenceContributorEp.registerExtension(contributorEp) - - val application = ApplicationManager.getApplication() - - //we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors - val oldReferenceProviderRegistry = - application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry - application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl()) - - Disposer.register(disposable, Disposable { - referenceContributorEp.unregisterExtension(contributorEp) - application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry) - }) + error("PsiReferenceContributorEP is final in 193 platform") +// val referenceContributorEp = Extensions.getArea(null).getExtensionPoint(PsiReferenceContributor.EP_NAME.name) +// +// val contributorEp = object : PsiReferenceContributorEP() { +// override fun getInstance(): PsiReferenceContributor = contributor +// } +// +// referenceContributorEp.registerExtension(contributorEp) +// +// val application = ApplicationManager.getApplication() +// +// //we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors +// val oldReferenceProviderRegistry = +// application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry +// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl()) +// +// Disposer.register(disposable, Disposable { +// referenceContributorEp.unregisterExtension(contributorEp) +// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry) +// }) } diff --git a/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.193 b/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.192 similarity index 63% rename from plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.193 rename to plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.192 index a46a7c564a8..d81f5e60237 100644 --- a/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.193 +++ b/plugins/uast-kotlin/tests/KotlinUastReferencesTest.kt.192 @@ -20,7 +20,6 @@ import com.intellij.testFramework.registerServiceInstance import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.uast.UExpression import org.jetbrains.uast.evaluateString import org.jetbrains.uast.toUElementOfType @@ -33,35 +32,36 @@ class KotlinUastReferencesTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + @Test fun `test original getter is visible when reference is under renaming`() { - KotlinTestUtils.runTest(this) { - registerReferenceProviders(testRootDisposable) { - registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost -> - arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost)) - }) - } - myFixture.configureByText( - "KotlinBean.kt", """ - data class KotlinBean(val myField: String) + registerReferenceProviders(testRootDisposable) { + registerUastReferenceProvider(injectionHostUExpression(), uastInjectionHostReferenceProvider { _, psiLanguageInjectionHost -> + arrayOf(GetterReference("KotlinBean", psiLanguageInjectionHost)) + }) + } - val reference = "myField" + myFixture.configureByText( + "KotlinBean.kt", """ + data class KotlinBean(val myField: String) - """.trimIndent() - ) + val reference = "myField" - myFixture.renameElementAtCaret("myRenamedField") + """.trimIndent() + ) - myFixture.checkResult( - """ + myFixture.renameElementAtCaret("myRenamedField") + + myFixture.checkResult( + """ data class KotlinBean(val myRenamedField: String) val reference = "myRenamedField" - """.trimIndent() - ) - } + """.trimIndent() + ) + } } @@ -99,26 +99,25 @@ fun registerReferenceProviders(disposable: Disposable, registerContributors: Psi } fun registerReferenceContributor(contributor: PsiReferenceContributor, disposable: Disposable) { - error("PsiReferenceContributorEP is final in 193 platform") -// val referenceContributorEp = Extensions.getArea(null).getExtensionPoint(PsiReferenceContributor.EP_NAME.name) -// -// val contributorEp = object : PsiReferenceContributorEP() { -// override fun getInstance(): PsiReferenceContributor = contributor -// } -// -// referenceContributorEp.registerExtension(contributorEp) -// -// val application = ApplicationManager.getApplication() -// -// //we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors -// val oldReferenceProviderRegistry = -// application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry -// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl()) -// -// Disposer.register(disposable, Disposable { -// referenceContributorEp.unregisterExtension(contributorEp) -// application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry) -// }) + val referenceContributorEp = Extensions.getArea(null).getExtensionPoint(PsiReferenceContributor.EP_NAME.name) + + val contributorEp = object : PsiReferenceContributorEP() { + override fun getInstance(): PsiReferenceContributor = contributor + } + + referenceContributorEp.registerExtension(contributorEp) + + val application = ApplicationManager.getApplication() + + //we need a fresh ReferenceProvidersRegistry after updating ReferenceContributors + val oldReferenceProviderRegistry = + application.picoContainer.getComponentInstance(ReferenceProvidersRegistry::class.java) as ReferenceProvidersRegistry + application.registerServiceInstance(ReferenceProvidersRegistry::class.java, ReferenceProvidersRegistryImpl()) + + Disposer.register(disposable, Disposable { + referenceContributorEp.unregisterExtension(contributorEp) + application.registerServiceInstance(ReferenceProvidersRegistry::class.java, oldReferenceProviderRegistry) + }) } diff --git a/tests/mute-platform.csv b/tests/mute-platform.csv index 27fcabcc901..e8d23553838 100644 --- a/tests/mute-platform.csv +++ b/tests/mute-platform.csv @@ -1,13 +1,32 @@ Test key, Issue, State (optional: MUTE or FAIL) org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testClassObjects, ERROR: Access to tree elements not allowed. org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testUsingKotlinPackageDeclarations, ERROR: Access to tree elements not allowed. -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testMobile, KT-35368 -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testMobileShared, KT-35368 -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testNative, KT-35368 -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testShared, KT-35368 -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testSharedWithQualifiedName, KT-35368 +org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryClassUsages, KT-34542, FAIL +org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryNestedClassUsages, KT-34542, FAIL +org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryObjectUsages, KT-34542, FAIL +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testMobileShared, IDEA-225878 +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testNative, IDEA-225878 +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testShared, IDEA-225878 +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testSharedWithQualifiedName, IDEA-225878 +org.jetbrains.kotlin.gradle.ImportAndCheckHighlighting.testMultiplatformLibrary[1: Gradle-4.9, KotlinGradlePlugin-latest stable], KT-35631 +org.jetbrains.kotlin.gradle.ImportAndCheckHighlighting.testMultiplatformLibrary[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable], KT-35631 +org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225 +org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225 +org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testFlush, KT-35938 +org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testMessage, KT-35938 +org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testMessageSplit, KT-35938 +org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testOverflow, KT-35938 +org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run +org.jetbrains.kotlin.idea.caches.resolve.MultiPlatformHighlightingTestGenerated.testMultifileFacade, KT-34689 invalid light class +org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testKotlinAndroidPluginDetection, NPE during import +org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKtsImportTest.testCompositeBuild, FLAKY on windows +org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testTwoClasses, flaky failure +org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValAndClass, flaky failure +org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValOrder, flaky failure +org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Val.testValWithTypeWoInitializer, flaky failure +org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Var.testVarWithTypeWoInitializer, Unprocessed org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Common.StaticMembers.testJavaStaticMethodsFromImports, KT-32919 org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast1, KT-32919 org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast2, KT-32919 @@ -18,5 +37,109 @@ org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.S org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast, KT-32919 org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast2, KT-32919 org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSyntheticExtensions1, KT-32919 -org.jetbrains.kotlin.idea.completion.test.weighers.BasicCompletionWeigherTestGenerated.testPreferFromJdk, KT-35709 Class from JDK is not prioritized -org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.AutoImports.testAmbiguousNamePreferFromJdk, KT-35709 Class from JDK is not prioritized \ No newline at end of file +org.jetbrains.kotlin.idea.completion.test.KotlinSourceInJavaCompletionTestGenerated.testMultiFileFacadeMembers, KT-34689 +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromJSLibrarySourcesTest.testIcon, Unprocessed +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testBuiltinClass, KT-34542 +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testJdkClass, KT-34542 +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testLightClassForLibrarySource, KT-34542 +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testOurKotlinClass, KT-34542 +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testClassObject, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testConstructor, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testEnum, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testExtensionFunction, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testExtensionProperty, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGenericFunctionWithExplicitlyDeclaredTypeArguments, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGenericFunctionWithInferredTypeArguments, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGlobalFunction, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGlobalProperty, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testNamedObject, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testOverloadedFunWithTypeParam, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testProperty, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testSameNameInDifferentSources, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testTypeAlias, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testTypeWithSameShortName, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testClassObject, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testConstructor, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testEnum, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testExtensionFunction, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testExtensionProperty, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGenericFunctionWithExplicitlyDeclaredTypeArguments, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGenericFunctionWithInferredTypeArguments, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGlobalFunction, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGlobalProperty, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testNamedObject, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testOverloadedFunWithTypeParam, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testProperty, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testSameNameInDifferentSources, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testTypeAlias, KT-34542, FAIL +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testTypeWithSameShortName, KT-34542, FAIL +org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testDontAddMarginCharWhenMultilineWithoutMargins, KT-34566 +org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testDontAddTrimCallWhenAlreadyMultilineFirstLine, KT-34566 +org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testEnterBeforeMarginChar, KT-34566 +org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testEnterInsideTextMargin, KT-34566 +org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testInsertCustomMarginInLineStart, KT-34566 +org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.WithTabs.Tabs2.testEnterInsideText, KT-34566 +org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.WithTabs.Tabs4.testEnterInsideText, KT-34566 +org.jetbrains.kotlin.idea.filters.KotlinExceptionFilterTestGenerated.testInlineFunCallInLibrary, Unprocessed +org.jetbrains.kotlin.idea.filters.KotlinExceptionFilterTestGenerated.testInlineFunInnerClassFromLibrary, Unprocessed +org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testCoroutineContextCheck, KT-34659 +org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testDispatchersTypeDetection, KT-34659 +org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testLambdaReceiverType, KT-34659 +org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testNestedFunctionsInsideSuspendLambda, KT-34659 +org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testSimpleCoroutineScope, KT-34659 +org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression, KT-34672, FAIL +org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression2, KT-34672, FAIL +org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression3, KT-34672, FAIL +org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertFunctionTypeParameterToReceiver.testNonFirstParameterPrimaryConstructor, Flaky failure on ConvertFunctionTypeParameterToReceiver rerun +org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertFunctionTypeParameterToReceiver.testNonFirstParameterSecondaryConstructor, Flaky failure on ConvertFunctionTypeParameterToReceiver rerun +org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testInstancesAndMembers, Enum reorder +org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testInstancesOnly, Generated entries reordered +org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testWithNonObjectInheritors, Enum reorder +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testBlankLineBetween, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testLongInit, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testLongInit2, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testPropertyWithAnnotation, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInit, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInit2, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks2, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks3, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithComments, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithComments2, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons2, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons3, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithType, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithType2, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.NestedIfs.testBlockBody, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testFunctionWithOneLineReturn, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testIf, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testNotSingleLineStatement, KT-34408 +org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testWhenEntry, KT-34408 +org.jetbrains.kotlin.idea.navigation.KotlinGotoImplementationMultiModuleTestGenerated.testExpectClassSuperclassFun, Flaky failure +org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib1.testUseJavaFromLib, KT-34542, FAIL +org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib2.testUseJavaSAMFromLib, KT-34542, FAIL +org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib3.testUseJavaSAMFromLib, KT-34542, FAIL +org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.ChangeSignature.Jk.testJkKeepValOnParameterTypeChange, Unprocessed +org.jetbrains.kotlin.idea.quickfix.QuickFixMultiModuleTestGenerated.Other.testConvertActualSealedClassToEnum, Enum reorder +org.jetbrains.kotlin.idea.quickfix.QuickFixMultiModuleTestGenerated.Other.testConvertExpectSealedClassToEnum, Enum reorder +org.jetbrains.kotlin.idea.refactoring.inline.InlineTestGenerated.Function.ExpressionBody.testMultipleInExpression, Unstable order of usages +org.jetbrains.kotlin.idea.refactoring.introduce.ExtractionTestGenerated.IntroduceJavaParameter.testJavaMethodOverridingKotlinFunctionWithUsages, Unprocessed +org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda, final modifier added +org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance, final modifier added +org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testKotlin_moveTopLevelDeclarations_moveFunctionToPackage_MoveFunctionToPackage, Broken in 0dc7c37b62f0cfdfb57ee41a808137196c45a9f5 +org.jetbrains.kotlin.idea.refactoring.pullUp.PullUpTestGenerated.K2K.testAccidentalOverrides, Unprocessed +org.jetbrains.kotlin.idea.refactoring.rename.RenameTestGenerated.testOverloadsWithSameOrigin_OverloadsWithSameOrigin, Bad imports after rename +org.jetbrains.kotlin.idea.refactoring.rename.RenameTestGenerated.testRenameKotlinMultifileFacadeClassWithJvmNameByRef_RenameKotlinMultifileFacadeClassWithJvmName, KT-34689 +org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testBuiltInMember, KT-34825 +org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testDefinedClass, KT-34825 +org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testDefinedClassMember, KT-34825 +org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testDefinedExtension, KT-34825 +org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testFunctions, KT-34825 +org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testStdlib, KT-34825 +org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testVariables, KT-34825 +org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testInLibrarySource, KT-34542, FAIL +org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToFunParameter, KT-34542, FAIL +org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToLocalFun, KT-34542, FAIL +org.jetbrains.kotlin.idea.script.ScriptConfigurationHighlightingTestGenerated.Highlighting.testCustomJavaHome, No Java +org.jetbrains.uast.test.kotlin.KotlinUastReferencesTest.`test original getter is visible when reference is under renaming`, Extensions API changed \ No newline at end of file diff --git a/tests/mute-platform.csv.192 b/tests/mute-platform.csv.192 new file mode 100644 index 00000000000..27fcabcc901 --- /dev/null +++ b/tests/mute-platform.csv.192 @@ -0,0 +1,22 @@ +Test key, Issue, State (optional: MUTE or FAIL) +org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testClassObjects, ERROR: Access to tree elements not allowed. +org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testUsingKotlinPackageDeclarations, ERROR: Access to tree elements not allowed. +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testMobile, KT-35368 +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testMobileShared, KT-35368 +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testNative, KT-35368 +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testShared, KT-35368 +org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testSharedWithQualifiedName, KT-35368 +org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import +org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testKotlinAndroidPluginDetection, NPE during import +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Common.StaticMembers.testJavaStaticMethodsFromImports, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast1, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast2, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testSyntheticJavaProperties1, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testSyntheticJavaProperties2, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testNullableReceiver, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSafeCall, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast2, KT-32919 +org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSyntheticExtensions1, KT-32919 +org.jetbrains.kotlin.idea.completion.test.weighers.BasicCompletionWeigherTestGenerated.testPreferFromJdk, KT-35709 Class from JDK is not prioritized +org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.AutoImports.testAmbiguousNamePreferFromJdk, KT-35709 Class from JDK is not prioritized \ No newline at end of file diff --git a/tests/mute-platform.csv.193 b/tests/mute-platform.csv.193 deleted file mode 100644 index e8d23553838..00000000000 --- a/tests/mute-platform.csv.193 +++ /dev/null @@ -1,145 +0,0 @@ -Test key, Issue, State (optional: MUTE or FAIL) -org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testClassObjects, ERROR: Access to tree elements not allowed. -org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testUsingKotlinPackageDeclarations, ERROR: Access to tree elements not allowed. -org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryClassUsages, KT-34542, FAIL -org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryNestedClassUsages, KT-34542, FAIL -org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryObjectUsages, KT-34542, FAIL -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testMobileShared, IDEA-225878 -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testNative, IDEA-225878 -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testShared, IDEA-225878 -org.jetbrains.kotlin.gradle.GradleMultiplatformWizardTest.testSharedWithQualifiedName, IDEA-225878 -org.jetbrains.kotlin.gradle.ImportAndCheckHighlighting.testMultiplatformLibrary[1: Gradle-4.9, KotlinGradlePlugin-latest stable], KT-35631 -org.jetbrains.kotlin.gradle.ImportAndCheckHighlighting.testMultiplatformLibrary[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable], KT-35631 -org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225 -org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225 -org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testFlush, KT-35938 -org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testMessage, KT-35938 -org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testMessageSplit, KT-35938 -org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandlerTest.testOverflow, KT-35938 -org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run -org.jetbrains.kotlin.idea.caches.resolve.MultiPlatformHighlightingTestGenerated.testMultifileFacade, KT-34689 invalid light class -org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed -org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import -org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testKotlinAndroidPluginDetection, NPE during import -org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKtsImportTest.testCompositeBuild, FLAKY on windows -org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testTwoClasses, flaky failure -org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValAndClass, flaky failure -org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValOrder, flaky failure -org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Val.testValWithTypeWoInitializer, flaky failure -org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Var.testVarWithTypeWoInitializer, Unprocessed -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Common.StaticMembers.testJavaStaticMethodsFromImports, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast1, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testNonPredictableSmartCast2, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testSyntheticJavaProperties1, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.BoldOrGrayed.testSyntheticJavaProperties2, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testNullableReceiver, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSafeCall, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSmartCast2, KT-32919 -org.jetbrains.kotlin.idea.completion.test.JvmBasicCompletionTestGenerated.Java.SyntheticExtensions.testSyntheticExtensions1, KT-32919 -org.jetbrains.kotlin.idea.completion.test.KotlinSourceInJavaCompletionTestGenerated.testMultiFileFacadeMembers, KT-34689 -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromJSLibrarySourcesTest.testIcon, Unprocessed -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testBuiltinClass, KT-34542 -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testJdkClass, KT-34542 -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testLightClassForLibrarySource, KT-34542 -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateFromLibrarySourcesTest.testOurKotlinClass, KT-34542 -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testClassObject, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testConstructor, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testEnum, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testExtensionFunction, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testExtensionProperty, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGenericFunctionWithExplicitlyDeclaredTypeArguments, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGenericFunctionWithInferredTypeArguments, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGlobalFunction, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testGlobalProperty, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testNamedObject, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testOverloadedFunWithTypeParam, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testProperty, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testSameNameInDifferentSources, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testTypeAlias, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestGenerated.testTypeWithSameShortName, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testClassObject, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testConstructor, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testEnum, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testExtensionFunction, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testExtensionProperty, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGenericFunctionWithExplicitlyDeclaredTypeArguments, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGenericFunctionWithInferredTypeArguments, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGlobalFunction, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testGlobalProperty, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testNamedObject, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testOverloadedFunWithTypeParam, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testProperty, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testSameNameInDifferentSources, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testTypeAlias, KT-34542, FAIL -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToLibrarySourceTestWithJSGenerated.testTypeWithSameShortName, KT-34542, FAIL -org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testDontAddMarginCharWhenMultilineWithoutMargins, KT-34566 -org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testDontAddTrimCallWhenAlreadyMultilineFirstLine, KT-34566 -org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testEnterBeforeMarginChar, KT-34566 -org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testEnterInsideTextMargin, KT-34566 -org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.Spaces.testInsertCustomMarginInLineStart, KT-34566 -org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.WithTabs.Tabs2.testEnterInsideText, KT-34566 -org.jetbrains.kotlin.idea.editor.MultiLineStringIndentTestGenerated.WithTabs.Tabs4.testEnterInsideText, KT-34566 -org.jetbrains.kotlin.idea.filters.KotlinExceptionFilterTestGenerated.testInlineFunCallInLibrary, Unprocessed -org.jetbrains.kotlin.idea.filters.KotlinExceptionFilterTestGenerated.testInlineFunInnerClassFromLibrary, Unprocessed -org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testCoroutineContextCheck, KT-34659 -org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testDispatchersTypeDetection, KT-34659 -org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testLambdaReceiverType, KT-34659 -org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testNestedFunctionsInsideSuspendLambda, KT-34659 -org.jetbrains.kotlin.idea.inspections.CoroutineNonBlockingContextDetectionTest.testSimpleCoroutineScope, KT-34659 -org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression, KT-34672, FAIL -org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression2, KT-34672, FAIL -org.jetbrains.kotlin.idea.inspections.LocalInspectionTestGenerated.RedundantRequireNotNullCall.testUsedAsExpression3, KT-34672, FAIL -org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertFunctionTypeParameterToReceiver.testNonFirstParameterPrimaryConstructor, Flaky failure on ConvertFunctionTypeParameterToReceiver rerun -org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertFunctionTypeParameterToReceiver.testNonFirstParameterSecondaryConstructor, Flaky failure on ConvertFunctionTypeParameterToReceiver rerun -org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testInstancesAndMembers, Enum reorder -org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testInstancesOnly, Generated entries reordered -org.jetbrains.kotlin.idea.intentions.IntentionTestGenerated.ConvertSealedClassToEnum.testWithNonObjectInheritors, Enum reorder -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testBlankLineBetween, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testLongInit, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testLongInit2, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testPropertyWithAnnotation, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInit, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInit2, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks2, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithBackticks3, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithComments, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithComments2, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons2, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithSemicolons3, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithType, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.DeclarationAndAssignment.testSimpleInitWithType2, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.NestedIfs.testBlockBody, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testFunctionWithOneLineReturn, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testIf, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testNotSingleLineStatement, KT-34408 -org.jetbrains.kotlin.idea.intentions.declarations.JoinLinesTestGenerated.RemoveBraces.testWhenEntry, KT-34408 -org.jetbrains.kotlin.idea.navigation.KotlinGotoImplementationMultiModuleTestGenerated.testExpectClassSuperclassFun, Flaky failure -org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib1.testUseJavaFromLib, KT-34542, FAIL -org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib2.testUseJavaSAMFromLib, KT-34542, FAIL -org.jetbrains.kotlin.idea.parameterInfo.ParameterInfoTestGenerated.WithLib3.testUseJavaSAMFromLib, KT-34542, FAIL -org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.ChangeSignature.Jk.testJkKeepValOnParameterTypeChange, Unprocessed -org.jetbrains.kotlin.idea.quickfix.QuickFixMultiModuleTestGenerated.Other.testConvertActualSealedClassToEnum, Enum reorder -org.jetbrains.kotlin.idea.quickfix.QuickFixMultiModuleTestGenerated.Other.testConvertExpectSealedClassToEnum, Enum reorder -org.jetbrains.kotlin.idea.refactoring.inline.InlineTestGenerated.Function.ExpressionBody.testMultipleInExpression, Unstable order of usages -org.jetbrains.kotlin.idea.refactoring.introduce.ExtractionTestGenerated.IntroduceJavaParameter.testJavaMethodOverridingKotlinFunctionWithUsages, Unprocessed -org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda, final modifier added -org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance, final modifier added -org.jetbrains.kotlin.idea.refactoring.move.MoveTestGenerated.testKotlin_moveTopLevelDeclarations_moveFunctionToPackage_MoveFunctionToPackage, Broken in 0dc7c37b62f0cfdfb57ee41a808137196c45a9f5 -org.jetbrains.kotlin.idea.refactoring.pullUp.PullUpTestGenerated.K2K.testAccidentalOverrides, Unprocessed -org.jetbrains.kotlin.idea.refactoring.rename.RenameTestGenerated.testOverloadsWithSameOrigin_OverloadsWithSameOrigin, Bad imports after rename -org.jetbrains.kotlin.idea.refactoring.rename.RenameTestGenerated.testRenameKotlinMultifileFacadeClassWithJvmNameByRef_RenameKotlinMultifileFacadeClassWithJvmName, KT-34689 -org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testBuiltInMember, KT-34825 -org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testDefinedClass, KT-34825 -org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testDefinedClassMember, KT-34825 -org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testDefinedExtension, KT-34825 -org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testFunctions, KT-34825 -org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testStdlib, KT-34825 -org.jetbrains.kotlin.idea.repl.IdeReplCompletionTestGenerated.testVariables, KT-34825 -org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testInLibrarySource, KT-34542, FAIL -org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToFunParameter, KT-34542, FAIL -org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToLocalFun, KT-34542, FAIL -org.jetbrains.kotlin.idea.script.ScriptConfigurationHighlightingTestGenerated.Highlighting.testCustomJavaHome, No Java -org.jetbrains.uast.test.kotlin.KotlinUastReferencesTest.`test original getter is visible when reference is under renaming`, Extensions API changed \ No newline at end of file