From 76674906e5739d1bf492ee2fb08e5aed5556ac5d Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 4 May 2020 14:39:45 +0300 Subject: [PATCH] Revert "Add option to enable new inference only for IDE analysis" This reverts commit 36580d46daae39e32bdc8ba99f726fb4057c190c. #KT-37378 Fixed Original commit: c01a171d4cdb8e2cdcdcf62cb99777d8d39aa54b --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 35 ------------------- .../kotlinProject.iml | 12 ------- .../kotlinProject.ipr | 17 --------- .../src/test1.kt | 5 --- .../errors.txt | 1 - .../kotlinProject.iml | 12 ------- .../kotlinProject.ipr | 14 -------- .../src/test1.kt | 5 --- 8 files changed, 101 deletions(-) delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2cd0d298d76..5262f188e42 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -58,7 +58,6 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY -import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.withIC import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTestBase.LibraryDependency.* @@ -626,40 +625,6 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { result.assertSuccessful() } - /* - * Here we're checking that enabling inference in IDE doesn't affect compilation via JPS - * - * the following two tests are connected: - * - testKotlinProjectWithEnabledNewInferenceInIDE checks that project is compiled when new inference is enabled only in IDE - * - this is done via project component - * - testKotlinProjectWithErrorsBecauseOfNewInference checks that project isn't compiled when new inference is enabled in the compiler - * - * So, if the former will fail => option affects JPS compilation, it's bad. Also, if the latter test fails => test is useless as it's - * compiled with new and old inference. - * - */ - fun testKotlinProjectWithEnabledNewInferenceInIDE() { - initProject(JVM_MOCK_RUNTIME) - val module = myProject.modules.single() - val args = module.kotlinCompilerArguments - args.languageVersion = LanguageVersion.KOTLIN_1_3.versionString - myProject.kotlinCommonCompilerArguments = args - - buildAllModules().assertSuccessful() - } - - fun testKotlinProjectWithErrorsBecauseOfNewInference() { - initProject(JVM_MOCK_RUNTIME) - val module = myProject.modules.single() - val args = module.kotlinCompilerArguments - args.newInference = true - myProject.kotlinCommonCompilerArguments = args - - val result = buildAllModules() - result.assertFailed() - result.checkErrors() - } - private fun createKotlinJavaScriptLibraryArchive() { val jarFile = File(workDir, KOTLIN_JS_LIBRARY_JAR) try { diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml deleted file mode 100644 index a0cbe548242..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr deleted file mode 100644 index f04957c330e..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt deleted file mode 100644 index 5f41546490a..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() { - ByteArray(42) { - when (Any()) {} - } -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt deleted file mode 100644 index df2e59d5fe9..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt +++ /dev/null @@ -1 +0,0 @@ -Type mismatch: inferred type is Unit but Byte was expected at line 3, column 9 diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml deleted file mode 100644 index a0cbe548242..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr deleted file mode 100644 index 90747786771..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt deleted file mode 100644 index 5f41546490a..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() { - ByteArray(42) { - when (Any()) {} - } -} \ No newline at end of file