diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 2d3b4c8368c..da1f8219e70 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -40,9 +40,7 @@ dependencies { compile(project(":compiler:cli")) compile(intellijCoreDep()) { includeJars("intellij-core") } compile(jpsStandalone()) { includeJars("jps-model") } - Platform[192].orHigher { - compile(intellijPluginDep("java")) - } + compile(intellijPluginDep("java")) compile(intellijDep()) { includeIntellijCoreJarDependencies(project) } compile("org.jetbrains.kotlinx:kotlinx.benchmark.runtime-jvm:$benchmarks_version") } diff --git a/build.gradle.kts b/build.gradle.kts index 15c670ec040..43c417fb751 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -168,9 +168,8 @@ extra["versions.junit"] = "4.12" extra["versions.javaslang"] = "2.0.6" extra["versions.ant"] = "1.8.2" extra["versions.android"] = "2.3.1" -val coroutinesVersion = if (Platform[192].orHigher()) "1.3.7" else "1.1.1" -extra["versions.kotlinx-coroutines-core"] = coroutinesVersion -extra["versions.kotlinx-coroutines-jdk8"] = coroutinesVersion +extra["versions.kotlinx-coroutines-core"] = "1.3.7" +extra["versions.kotlinx-coroutines-jdk8"] = "1.3.7" extra["versions.json"] = "20160807" extra["versions.native-platform"] = "0.14" extra["versions.ant-launcher"] = "1.8.0" @@ -868,8 +867,8 @@ tasks { ":compiler:test", ":js:js.tests:test" ) - if (Ide.IJ193.orHigher()) - dependsOn(":kotlin-gradle-plugin-integration-tests:test") + + dependsOn(":kotlin-gradle-plugin-integration-tests:test") if (Ide.AS40.orHigher()) dependsOn(":kotlin-ultimate:ide:android-studio-native:test") diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index ca9641470b3..fd8efcf8ecf 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -34,9 +34,7 @@ dependencies { Platform[201].orLower { testCompile(intellijDep()) { includeJars("groovy-all", rootProject = rootProject) } } - Platform[192].orHigher { - testCompile(intellijPluginDep("java")) { includeJars("jps-builders") } - } + testCompile(intellijPluginDep("java")) { includeJars("jps-builders") } testCompile(jpsStandalone()) { includeJars("jps-model") } testCompile(jpsBuildTest()) } diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index ba115e786e8..117a754fa41 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -57,14 +57,9 @@ dependencies { testCompileOnly(project(it)) } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - Platform[193].orLower { - testCompileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) } - } testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util", "asm-all", rootProject = rootProject) } - Platform[192].orHigher { - testRuntimeOnly(intellijPluginDep("java")) - } + testRuntimeOnly(intellijPluginDep("java")) testRuntime(project(":kotlin-reflect")) testRuntime(androidDxJar()) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 638065c077b..c9c2c34e730 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -102,6 +102,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin import org.jetbrains.kotlin.utils.PathUtil import java.io.File +import java.nio.file.FileSystems import java.util.zip.ZipFile class KotlinCoreEnvironment private constructor( @@ -536,7 +537,11 @@ class KotlinCoreEnvironment private constructor( "(cp:\n ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n ") { it.file }})" ) - registerExtensionPointAndExtensionsEx(pluginRoot, configFilePath, Extensions.getRootArea()) + CoreApplicationEnvironment.registerExtensionPointAndExtensions( + FileSystems.getDefault().getPath(pluginRoot.path), + configFilePath, + Extensions.getRootArea() + ) } @JvmStatic diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 index e2785e46e04..b1fc1f6e4c3 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.as42 @@ -106,6 +106,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin import org.jetbrains.kotlin.utils.PathUtil import java.io.File +import java.nio.file.FileSystems import java.util.zip.ZipFile class KotlinCoreEnvironment private constructor( @@ -534,7 +535,11 @@ class KotlinCoreEnvironment private constructor( "(cp:\n ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n ") { it.file }})" ) - registerExtensionPointAndExtensionsEx(pluginRoot, configFilePath, Extensions.getRootArea()) + CoreApplicationEnvironment.registerExtensionPointAndExtensions( + FileSystems.getDefault().getPath(pluginRoot.path), + configFilePath, + Extensions.getRootArea() + ) } @JvmStatic diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt deleted file mode 100644 index 92159dbf2a1..00000000000 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreApplicationEnvironmentCompat.kt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2010-2020 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.core.CoreApplicationEnvironment -import com.intellij.openapi.extensions.ExtensionsArea -import java.io.File -import java.nio.file.FileSystems - -// FIX ME WHEN BUNCH 193 REMOVED -fun registerExtensionPointAndExtensionsEx(pluginFile: File, fileName: String, area: ExtensionsArea) { - val pluginRoot = FileSystems.getDefault().getPath(pluginFile.path) - @Suppress("MissingRecentApi") - CoreApplicationEnvironment.registerExtensionPointAndExtensions(pluginRoot, fileName, area) -} \ No newline at end of file diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts index 7134dd4ce17..1dfff8ea7b3 100644 --- a/compiler/fir/analysis-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/build.gradle.kts @@ -25,10 +25,8 @@ dependencies { testRuntime(project(":kotlin-reflect")) testRuntime(project(":core:descriptors.runtime")) - Platform[192].orHigher { - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index dd3163d91c0..95b0cd77661 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -30,10 +30,8 @@ dependencies { testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) - Platform[192].orHigher { - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts index c9da377e9a0..afe0d62cb39 100644 --- a/compiler/fir/modularized-tests/build.gradle.kts +++ b/compiler/fir/modularized-tests/build.gradle.kts @@ -17,10 +17,8 @@ dependencies { includeJars("extensions", "idea_rt", "util", "asm-all", "platform-util-ex", rootProject = rootProject) } - Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") } - testRuntimeOnly(intellijPluginDep("java")) - } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api") } + testRuntimeOnly(intellijPluginDep("java")) testRuntimeOnly(intellijDep()) diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts index 1e8e9182803..bcc7084e362 100644 --- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts @@ -37,10 +37,8 @@ dependencies { implementation("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion) implementation("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion) - Platform[192].orHigher { - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts index 975bfb1dd4d..11ff63bdef9 100644 --- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts @@ -27,10 +27,8 @@ dependencies { testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) - Platform[192].orHigher { - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts index 73568a6026e..d06dd37610a 100644 --- a/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts +++ b/compiler/fir/raw-fir/raw-fir.common/build.gradle.kts @@ -16,10 +16,8 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - Platform[192].orHigher { - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts index 342c3d14919..7324a7e7cfd 100644 --- a/compiler/fir/tree/tree-generator/build.gradle.kts +++ b/compiler/fir/tree/tree-generator/build.gradle.kts @@ -23,9 +23,7 @@ dependencies { includeJars("trove4j", rootProject = rootProject) } - Platform[192].orHigher { - runtimeOnly(intellijCoreDep()) { includeJars("jdom") } - } + runtimeOnly(intellijCoreDep()) { includeJars("jdom") } } val writeCopyright by task { diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index 5485cf50c08..29a726a1ceb 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/compiler/light-classes/build.gradle.kts @@ -11,10 +11,8 @@ dependencies { compile(project(":compiler:frontend.java")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - Platform[192].orHigher { - compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") } - } - + compileOnly(intellijDep()) { includeJars("platform-core-ui", "platform-util-ui") } + compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) } } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index be269bb09f0..6bce07458e2 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -92,13 +92,8 @@ dependencies { isTransitive = false } - Platform[192].orHigher { - testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") } - } - - Platform[193].orHigher { - testCompile(intellijDep()) { includeJars("platform-ide-util-io") } - } + testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") } + testCompile(intellijDep()) { includeJars("platform-ide-util-io") } } tasks.withType> { diff --git a/compiler/tests-common/build.gradle.kts.as42 b/compiler/tests-common/build.gradle.kts.as42 deleted file mode 100644 index 60a08cbdcda..00000000000 --- a/compiler/tests-common/build.gradle.kts.as42 +++ /dev/null @@ -1,109 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testCompile(project(":kotlin-scripting-compiler")) - testCompile(project(":core:descriptors")) - testCompile(project(":core:descriptors.jvm")) - testCompile(project(":core:deserialization")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:tests-mutes")) - testCompile(project(":compiler:backend")) - testCompile(project(":compiler:ir.tree.impl")) - testCompile(project(":compiler:fir:tree")) - testCompile(project(":compiler:fir:raw-fir:psi2fir")) - testCompile(project(":compiler:fir:raw-fir:light-tree2fir")) - testCompile(project(":compiler:fir:fir2ir")) - testCompile(project(":compiler:fir:jvm")) - testCompile(project(":compiler:fir:fir2ir:jvm-backend")) - testCompile(project(":compiler:fir:fir-serialization")) - testCompile(project(":compiler:fir:fir-deserialization")) - testCompile(project(":compiler:fir:cones")) - testCompile(project(":compiler:fir:resolve")) - testCompile(project(":compiler:fir:checkers")) - testCompile(project(":compiler:fir:java")) - testCompile(project(":compiler:fir:entrypoint")) - testCompile(project(":compiler:ir.ir2cfg")) - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:frontend.java")) - testCompile(project(":compiler:util")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":compiler:cli")) - testCompile(project(":compiler:cli-js")) - testCompile(project(":compiler:light-classes")) - testCompile(project(":compiler:serialization")) - testCompile(project(":kotlin-preloader")) - testCompile(project(":compiler:cli-common")) - testCompile(project(":daemon-common")) - testCompile(project(":daemon-common-new")) - testCompile(project(":js:js.serializer")) - testCompile(project(":js:js.frontend")) - testCompile(project(":js:js.translator")) - testCompile(project(":native:frontend.native")) - testCompileOnly(project(":plugins:android-extensions-compiler")) - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(projectTests(":compiler:tests-common-jvm6")) - testCompile(project(":kotlin-scripting-compiler-impl")) - testCompile(commonDep("junit:junit")) - testCompile(androidDxJar()) { isTransitive = false } - testCompile(commonDep("com.android.tools:r8")) - testCompileOnly(project(":kotlin-reflect-api")) - testCompileOnly(toolsJar()) - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - Platform[193].orLower { - testCompile(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) } - } - Platform[201].orHigher { - testCompile(intellijDep()) { - includeJars( - "testFramework", - "testFramework.core", - rootProject = rootProject - ) - } - } - testCompile(intellijDep()) { - includeJars( - "jps-model", - "extensions", - "util", - "platform-api", - "platform-impl", - "idea", - "idea_rt", - "guava", - "trove4j", - "asm-all", - "log4j", - "jdom", - "streamex", - "bootstrap", - rootProject = rootProject - ) - isTransitive = false - } - - Platform[192].orHigher { - testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") } - } - - Platform[193].orHigher { - testCompile(intellijDep()) { includeJars("platform-ide-util-io") } - } - if (Platform.P202.orHigher()) { - testCompile(intellijDep()) { - includeJars("intellij-deps-fastutil-8.3.1-1") - isTransitive = false - } - } -} - -sourceSets { - "main" { } - "test" { projectDefault() } -} - -testsJar {} diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 3228d2747db..a6246fcb905 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -13,9 +13,7 @@ dependencies { testRuntime(project(":kotlin-reflect")) testRuntimeOnly(toolsJar()) testRuntime(intellijDep()) - Platform[192].orHigher { - testRuntimeOnly(intellijPluginDep("java")) - } + testRuntimeOnly(intellijPluginDep("java")) if (System.getProperty("idea.active") != null) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) } diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts index 46e0a2c4dd0..f56f635f789 100644 --- a/compiler/tests-spec/build.gradle.kts +++ b/compiler/tests-spec/build.gradle.kts @@ -5,16 +5,14 @@ plugins { dependencies { testCompile(projectTests(":compiler")) - Platform[192].orHigher { - testCompileOnly(intellijDep()) { - includeJars("groovy-all", rootProject = rootProject) - } - testCompile(intellijDep()) { - includeJars("gson", rootProject = rootProject) - } - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntimeOnly(intellijPluginDep("java")) + testCompileOnly(intellijDep()) { + includeJars("groovy-all", rootProject = rootProject) } + testCompile(intellijDep()) { + includeJars("gson", rootProject = rootProject) + } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijPluginDep("java")) compile("org.jsoup:jsoup:1.10.3") if (System.getProperty("idea.active") != null) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) testRuntime(project(":kotlin-reflect")) diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts index a9ca8f234ce..29fb641da9c 100644 --- a/core/descriptors.runtime/build.gradle.kts +++ b/core/descriptors.runtime/build.gradle.kts @@ -14,10 +14,8 @@ dependencies { testCompile(projectTests(":generators:test-generator")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - Platform[192].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } - testRuntimeOnly(jpsStandalone()) { includeJars("jps-model") } - } + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } + testRuntimeOnly(jpsStandalone()) { includeJars("jps-model") } } sourceSets { diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 064bbc21a9e..dd58dafdb0f 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -95,17 +95,14 @@ dependencies { compileOnly(project(":kotlin-daemon-client")) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - testCompileOnly(intellijPluginDep("java")) - testRuntime(intellijPluginDep("java")) - } - Platform[193].orHigher { - implementation(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin")) - Ide.IJ { - implementation(intellijPluginDep("stats-collector")) - } + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) + testRuntime(intellijPluginDep("java")) + + implementation(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin")) + Ide.IJ { + implementation(intellijPluginDep("stats-collector")) } compileOnly(commonDep("org.jetbrains", "markdown")) diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts index 77679d76b69..b81f849c879 100644 --- a/idea/formatter/build.gradle.kts +++ b/idea/formatter/build.gradle.kts @@ -8,9 +8,7 @@ dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) } sourceSets { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt index 63fca1e3dc0..c8afb190af6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt @@ -49,13 +49,13 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() //region Classes - override fun processAllClassNames(processor: StringProcessor): Boolean { + override fun processAllClassNames(processor: Processor): Boolean { if (disableSearch.get()) return true return KotlinClassShortNameIndex.getInstance().processAllKeys(project, processor) && KotlinFileFacadeShortNameIndex.INSTANCE.processAllKeys(project, processor) } - override fun processAllClassNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean { + override fun processAllClassNames(processor: Processor, scope: GlobalSearchScope, filter: IdFilter?): Boolean { if (disableSearch.get()) return true return processAllClassNames(processor) } @@ -150,7 +150,11 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() //region Methods - override fun processAllMethodNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean { + override fun processAllMethodNames( + processor: Processor, + scope: GlobalSearchScope, + filter: IdFilter? + ): Boolean { if (disableSearch.get()) return true return processAllMethodNames(processor) } @@ -162,7 +166,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() } } - private fun processAllMethodNames(processor: StringProcessor): Boolean { + private fun processAllMethodNames(processor: Processor): Boolean { if (disableSearch.get()) return true if (!KotlinFunctionShortNameIndex.getInstance().processAllKeys(project, processor)) { return false @@ -245,7 +249,11 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() } } - override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: PsiMethodProcessor): Boolean { + override fun processMethodsWithName( + name: String, + scope: GlobalSearchScope, + processor: Processor + ): Boolean { if (disableSearch.get()) return true return ContainerUtil.process(getMethodsByName(name, scope), processor) } @@ -253,7 +261,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() //region Fields - override fun processAllFieldNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean { + override fun processAllFieldNames(processor: Processor, scope: GlobalSearchScope, filter: IdFilter?): Boolean { if (disableSearch.get()) return true return processAllFieldNames(processor) } @@ -265,7 +273,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() } } - private fun processAllFieldNames(processor: StringProcessor): Boolean { + private fun processAllFieldNames(processor: Processor): Boolean { if (disableSearch.get()) return true return KotlinPropertyShortNameIndex.getInstance().processAllKeys(project, processor) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt deleted file mode 100644 index a265dd04b7d..00000000000 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.caches - -import com.intellij.psi.PsiMethod -import com.intellij.util.Processor - -// FIX ME WHEN BUNCH 193 REMOVED -typealias StringProcessor = Processor -typealias PsiMethodProcessor = Processor - diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt index 9945894273d..6cca2d0b1d3 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt @@ -6,10 +6,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers import com.intellij.codeInsight.completion.CompletionType -import com.intellij.codeInsight.lookup.LookupElement -import com.intellij.codeInsight.lookup.LookupElementPresentation -import com.intellij.codeInsight.lookup.LookupEvent -import com.intellij.codeInsight.lookup.LookupManager +import com.intellij.codeInsight.lookup.* import com.intellij.codeInsight.lookup.impl.LookupImpl import com.intellij.openapi.project.Project import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture @@ -136,7 +133,7 @@ abstract class CompletionHandlerTestBase : KotlinLightCodeInsightFixtureTestCase if (lookup.currentItem != item) { // do not touch selection if not changed - important for char filter tests lookup.currentItem = item } - lookup.setFocusedFocusDegree() + lookup.lookupFocusDegree = LookupFocusDegree.FOCUSED if (LookupEvent.isSpecialCompletionChar(completionChar)) { lookup.finishLookup(completionChar) } else { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt deleted file mode 100644 index b40f0149539..00000000000 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/compat.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.completion.test.handlers - -import com.intellij.codeInsight.lookup.LookupFocusDegree -import com.intellij.codeInsight.lookup.impl.LookupImpl - -// FIX ME WHEN BUNCH 193 REMOVED -fun LookupImpl.setFocusedFocusDegree() { - this.lookupFocusDegree = LookupFocusDegree.FOCUSED -} \ No newline at end of file diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index ca419c0cd0f..4705c035796 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -31,10 +31,8 @@ dependencies { compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } - + compileOnly(intellijPluginDep("java")) + compileOnly(intellijPluginDep("gradle")) } 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 fac55d36536..83e91491184 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 @@ -24,7 +24,7 @@ import com.intellij.psi.impl.java.stubs.index.JavaShortClassNameIndex import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.PsiShortNamesCache import com.intellij.psi.stubs.StubIndex -import org.jetbrains.kotlin.idea.caches.PsiMethodProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager // Allow searching java classes in jars in script dependencies, this is needed for stuff like completion and autoimport @@ -47,7 +47,11 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project override fun getMethodsByNameIfNotMoreThan(name: String, scope: GlobalSearchScope, maxCount: Int): Array = PsiMethod.EMPTY_ARRAY - override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: PsiMethodProcessor) = true + override fun processMethodsWithName( + name: String, + scope: GlobalSearchScope, + processor: Processor + ) = true override fun getAllFieldNames() = emptyArray() diff --git a/idea/idea-fir-performance-tests/build.gradle.kts b/idea/idea-fir-performance-tests/build.gradle.kts index 40386845a4d..e335a16a91f 100644 --- a/idea/idea-fir-performance-tests/build.gradle.kts +++ b/idea/idea-fir-performance-tests/build.gradle.kts @@ -29,9 +29,7 @@ dependencies { testCompileOnly(intellijDep()) testRuntime(intellijDep()) - Platform[192].orHigher { - compile(intellijPluginDep("java")) - } + compile(intellijPluginDep("java")) } sourceSets { diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts index 1240187e69c..7b49989dfa5 100644 --- a/idea/idea-fir/build.gradle.kts +++ b/idea/idea-fir/build.gradle.kts @@ -25,9 +25,7 @@ dependencies { testCompileOnly(intellijDep()) testRuntime(intellijDep()) - Platform[192].orHigher { - compile(intellijPluginDep("java")) - } + compile(intellijPluginDep("java")) } sourceSets { diff --git a/idea/idea-frontend-api/build.gradle.kts b/idea/idea-frontend-api/build.gradle.kts index 5e8fff7146a..9b3e4650ab9 100644 --- a/idea/idea-frontend-api/build.gradle.kts +++ b/idea/idea-frontend-api/build.gradle.kts @@ -13,14 +13,7 @@ dependencies { compileOnly(project(":compiler:psi")) compileOnly(intellijCoreDep()) compileOnly(intellijDep()) - - Platform[191].orLower { - compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } - } - - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - } + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } } sourceSets { diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts index 89be8d84f88..25a963f34f5 100644 --- a/idea/idea-frontend-fir/build.gradle.kts +++ b/idea/idea-frontend-fir/build.gradle.kts @@ -33,9 +33,7 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) - Platform[192].orHigher { - compile(intellijPluginDep("java")) - } + compile(intellijPluginDep("java")) } sourceSets { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts index 1f4e32b5f30..1e39279bab6 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts @@ -36,9 +36,7 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) - Platform[192].orHigher { - compile(intellijPluginDep("java")) - } + compile(intellijPluginDep("java")) } sourceSets { diff --git a/idea/idea-frontend-independent/build.gradle.kts b/idea/idea-frontend-independent/build.gradle.kts index 62f34e40882..4628368ba5b 100644 --- a/idea/idea-frontend-independent/build.gradle.kts +++ b/idea/idea-frontend-independent/build.gradle.kts @@ -19,14 +19,7 @@ dependencies { compileOnly(intellijCoreDep()) compileOnly(intellijDep()) compileOnly(project(":compiler:light-classes")) - - Platform[191].orLower { - compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } - } - - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - } + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } } sourceSets { diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt index bfcd664d17c..26140a8ab08 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt @@ -14,7 +14,6 @@ import org.jetbrains.kotlin.idea.util.application.getServiceSafe /** * Tested in OutOfBlockModificationTestGenerated */ -// FIX ME WHEN BUNCH 193 REMOVED class KotlinCodeBlockModificationListener(project: Project) : KotlinCodeBlockModificationListenerCompat(project) { init { diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt index 72d1f2efb7d..0521a023f2d 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt @@ -41,7 +41,6 @@ val KOTLIN_CONSOLE_KEY = Key.create("kotlin.console") /** * Tested in OutOfBlockModificationTestGenerated */ -// FIX ME WHEN BUNCH 193 REMOVED abstract class KotlinCodeBlockModificationListenerCompat(protected val project: Project) : PsiTreeChangePreprocessor, Disposable { protected val modificationTrackerImpl: PsiModificationTrackerImpl = PsiModificationTracker.SERVICE.getInstance(project) as PsiModificationTrackerImpl diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt index 391313a0152..d0c56d4b75e 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt @@ -24,6 +24,8 @@ import com.intellij.openapi.actionSystem.DataContext import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiParameter +import com.intellij.usageView.UsageInfo +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.findUsages.KotlinCallableFindUsagesOptions import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory import org.jetbrains.kotlin.idea.util.application.runReadAction @@ -73,7 +75,11 @@ class DelegatingFindMemberUsagesHandler( return kotlinHandler.getFindUsagesOptions(dataContext) } - override fun processElementUsages(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean { + override fun processElementUsages( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Boolean { val (handler, handlerOptions) = runReadAction { getHandlerAndOptions(element, options) } ?: return true return handler.processElementUsages(element, processor, handlerOptions!!) } diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt index c1e1a068a61..6febfcf4000 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -26,6 +26,7 @@ import com.intellij.psi.search.PsiElementProcessor import com.intellij.psi.search.PsiElementProcessorAdapter import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.psi.search.searches.ReferencesSearch +import com.intellij.usageView.UsageInfo import com.intellij.util.FilteredQuery import com.intellij.util.Processor import org.jetbrains.kotlin.idea.asJava.LightClassProvider.Companion.providedToLightClass @@ -66,12 +67,16 @@ class KotlinFindClassUsagesHandler( ) } - override fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher { + override fun createSearcher( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Searcher { return MySearcher(element, processor, options) } private class MySearcher( - element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions + element: PsiElement, processor: Processor, options: FindUsagesOptions ) : Searcher(element, processor, options) { private val kotlinOptions = options as KotlinClassFindUsagesOptions diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt index 3aa8cf235df..51d0d6e4b27 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt @@ -27,6 +27,7 @@ import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchScope import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.psi.search.searches.ReferencesSearch +import com.intellij.usageView.UsageInfo import com.intellij.util.* import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.idea.asJava.LightClassProvider.Companion.providedToLightMethods @@ -101,7 +102,11 @@ abstract class KotlinFindMemberUsagesHandler protected c factory: KotlinFindUsagesHandlerFactory ) : KotlinFindMemberUsagesHandler(propertyDeclaration, elementsToSearch, factory) { - override fun processElementUsages(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean { + override fun processElementUsages( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Boolean { if (ApplicationManager.getApplication().isUnitTestMode || !isPropertyOfDataClass || @@ -199,12 +204,16 @@ abstract class KotlinFindMemberUsagesHandler protected c } } - override fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher { + override fun createSearcher( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Searcher { return MySearcher(element, processor, options) } private inner class MySearcher( - element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions + element: PsiElement, processor: Processor, options: FindUsagesOptions ) : Searcher(element, processor, options) { private val kotlinOptions = options as KotlinCallableFindUsagesOptions diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt index 48691589d79..c7c6a81658e 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt @@ -55,7 +55,11 @@ abstract class KotlinFindUsagesHandler( elementsToSearch.toTypedArray() } - private fun searchTextOccurrences(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean { + private fun searchTextOccurrences( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Boolean { if (!options.isSearchForTextOccurrences) return true val scope = options.searchScope @@ -71,13 +75,17 @@ abstract class KotlinFindUsagesHandler( return true } - override fun processElementUsages(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Boolean { + override fun processElementUsages( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Boolean { return searchReferences(element, processor, options, forHighlight = false) && searchTextOccurrences(element, processor, options) } private fun searchReferences( element: PsiElement, - processor: UsageInfoProcessor, + processor: Processor, options: FindUsagesOptions, forHighlight: Boolean ): Boolean { @@ -86,7 +94,11 @@ abstract class KotlinFindUsagesHandler( return searcher.executeTasks() } - protected abstract fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher + protected abstract fun createSearcher( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Searcher override fun findReferencesToHighlight(target: PsiElement, searchScope: SearchScope): Collection { val results = Collections.synchronizedList(arrayListOf()) @@ -102,7 +114,11 @@ abstract class KotlinFindUsagesHandler( return results } - protected abstract class Searcher(val element: PsiElement, val processor: UsageInfoProcessor, val options: FindUsagesOptions) { + protected abstract class Searcher( + val element: PsiElement, + val processor: Processor, + val options: FindUsagesOptions + ) { private val tasks = ArrayList<() -> Boolean>() /** @@ -128,7 +144,7 @@ abstract class KotlinFindUsagesHandler( companion object { val LOG = Logger.getInstance(KotlinFindUsagesHandler::class.java) - internal fun processUsage(processor: UsageInfoProcessor, ref: PsiReference): Boolean = + internal fun processUsage(processor: Processor, ref: PsiReference): Boolean = processor.processIfNotNull { when { ref is LightMemberReference -> KotlinReferencePreservingUsageInfo(ref) @@ -137,16 +153,19 @@ abstract class KotlinFindUsagesHandler( } } - internal fun processUsage(processor: UsageInfoProcessor, element: PsiElement): Boolean = + internal fun processUsage( + processor: Processor, + element: PsiElement + ): Boolean = processor.processIfNotNull { if (element.isValid) UsageInfo(element) else null } - private fun UsageInfoProcessor.processIfNotNull(callback: () -> UsageInfo?): Boolean { + private fun Processor.processIfNotNull(callback: () -> UsageInfo?): Boolean { ProgressManager.checkCanceled() val usageInfo = runReadAction(callback) return if (usageInfo != null) process(usageInfo) else true } - internal fun createReferenceProcessor(usageInfoProcessor: UsageInfoProcessor): Processor { + internal fun createReferenceProcessor(usageInfoProcessor: Processor): Processor { val uniqueProcessor = CommonProcessors.UniqueProcessor(usageInfoProcessor) return Processor { processUsage(uniqueProcessor, it) } diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt index 73fe570dbcf..1a89b4df058 100644 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt +++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt @@ -21,6 +21,8 @@ import com.intellij.find.findUsages.FindUsagesOptions import com.intellij.openapi.actionSystem.DataContext import com.intellij.psi.PsiElement import com.intellij.psi.search.searches.ReferencesSearch +import com.intellij.usageView.UsageInfo +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinTypeParameterFindUsagesDialog import org.jetbrains.kotlin.psi.KtNamedDeclaration @@ -37,7 +39,11 @@ class KotlinTypeParameterFindUsagesHandler( ) } - override fun createSearcher(element: PsiElement, processor: UsageInfoProcessor, options: FindUsagesOptions): Searcher { + override fun createSearcher( + element: PsiElement, + processor: Processor, + options: FindUsagesOptions + ): Searcher { return object : Searcher(element, processor, options) { override fun buildTaskList(forHighlight: Boolean): Boolean { addTask { diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt deleted file mode 100644 index a8d8434f434..00000000000 --- a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/handlers/compat.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.findUsages.handlers - -import com.intellij.slicer.SliceUsage -import com.intellij.usageView.UsageInfo -import com.intellij.util.Processor - -// FIX ME WHEN BUNCH 193 REMOVED -typealias UsageInfoProcessor = Processor -typealias SliceUsageProcessor = Processor \ No newline at end of file diff --git a/idea/idea-gradle-native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts index 3aa6bc3f859..e00c3030198 100644 --- a/idea/idea-gradle-native/build.gradle.kts +++ b/idea/idea-gradle-native/build.gradle.kts @@ -23,9 +23,7 @@ dependencies { testCompile(projectTests(":idea:idea-gradle")) compileOnly(intellijPluginDep("gradle")) - Platform[193].orHigher { - compileOnly(intellijPluginDep("gradle-java")) - } + compileOnly(intellijPluginDep("gradle-java")) compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijDep()) @@ -36,9 +34,7 @@ dependencies { testCompileOnly(intellijPluginDep("Groovy")) testCompileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) testRuntimeOnly(toolsJar()) testRuntime(project(":kotlin-reflect")) @@ -61,9 +57,7 @@ dependencies { testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) - Platform[193].orHigher { - testRuntime(intellijPluginDep("gradle-java")) - } + testRuntime(intellijPluginDep("gradle-java")) testRuntime(intellijPluginDep("Groovy")) testRuntime(intellijPluginDep("coverage")) if (Ide.IJ()) { diff --git a/idea/idea-gradle-tooling-api/build.gradle.kts b/idea/idea-gradle-tooling-api/build.gradle.kts deleted file mode 100644 index 5be9ff03cf5..00000000000 --- a/idea/idea-gradle-tooling-api/build.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} -jvmTarget = "1.6" - -// FIX ME WHEN BUNCH 193 REMOVED: this module is no longer needed since IDEA 2020.1 -Platform[193].orLower { - dependencies { - compileOnly(intellijPluginDep("gradle")) - } - - sourceSets { - "main" { projectDefault() } - "test" { projectDefault() } - } - - runtimeJar() - - sourcesJar() - - javadocJar() - - apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts") -} - diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 8df45803a49..9e00623f931 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -20,9 +20,7 @@ dependencies { compileOnly(intellijDep()) compileOnly(intellijPluginDep("gradle")) - Platform[193].orHigher { - compileOnly(intellijPluginDep("gradle-java")) - } + compileOnly(intellijPluginDep("gradle-java")) compileOnly(intellijPluginDep("Groovy")) compileOnly(intellijPluginDep("junit")) compileOnly(intellijPluginDep("testng")) @@ -30,19 +28,15 @@ dependencies { compileOnly(project(":kotlin-gradle-statistics")) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - testCompileOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java")) testCompile(projectTests(":idea")) testCompile(projectTests(":idea:idea-test-framework")) testCompile(intellijPluginDep("gradle")) - Platform[193].orHigher { - testCompile(intellijPluginDep("gradle-java")) - } + testCompile(intellijPluginDep("gradle-java")) testCompileOnly(intellijPluginDep("Groovy")) testCompileOnly(intellijDep()) @@ -71,9 +65,7 @@ dependencies { testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) - Platform[193].orHigher { - testRuntime(intellijPluginDep("gradle-java")) - } + testRuntime(intellijPluginDep("gradle-java")) testRuntime(intellijPluginDep("Groovy")) testRuntime(intellijPluginDep("coverage")) if (Ide.IJ()) { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt index dff12e159aa..73addc122f5 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/AbstractProjectResolverExtensionCompat.kt @@ -11,7 +11,6 @@ import com.intellij.openapi.externalSystem.model.project.ProjectData import org.gradle.tooling.model.idea.IdeaModule import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension -// FIX ME WHEN BUNCH 193 REMOVED abstract class AbstractProjectResolverExtensionCompat : AbstractProjectResolverExtension() { override fun createModule(gradleModule: IdeaModule, projectDataNode: DataNode): DataNode? { return super.createModule(gradleModule, projectDataNode)?.also { diff --git a/idea/idea-j2k/build.gradle.kts b/idea/idea-j2k/build.gradle.kts index 44389d0adcb..7919398d1a5 100644 --- a/idea/idea-j2k/build.gradle.kts +++ b/idea/idea-j2k/build.gradle.kts @@ -8,10 +8,7 @@ dependencies { compile(project(":idea:idea-core")) compileOnly(intellijDep()) - - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) } sourceSets { diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts index 6b0eef2a320..dbe59d4276c 100644 --- a/idea/idea-jvm/build.gradle.kts +++ b/idea/idea-jvm/build.gradle.kts @@ -14,9 +14,7 @@ dependencies { compileOnly(intellijDep()) compileOnly(commonDep("com.google.code.findbugs", "jsr305")) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) compileOnly(intellijPluginDep("junit")) compileOnly(intellijPluginDep("testng")) diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java index ee5a24012ca..39b6c0a974b 100644 --- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java +++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.liveTemplates; import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider; -// FIX ME WHEN BUNCH 193 REMOVED public class KotlinLiveTemplatesProvider implements DefaultLiveTemplatesProvider { @Override public String[] getDefaultLiveTemplateFiles() { diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt index 24faeb6e628..d89a18dbac9 100644 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt +++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt @@ -28,7 +28,7 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() { override fun setUp() { super.setUp() myFixture.testDataPath = File(TEST_DATA_BASE_PATH).path + File.separator - setTemplateTestingCompat(module.project, testRootDisposable) + TemplateManagerImpl.setTemplateTesting(testRootDisposable) } fun testSout() { diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt deleted file mode 100644 index d7f1fa72b74..00000000000 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/compat.kt +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.liveTemplates - -import com.intellij.codeInsight.template.impl.TemplateManagerImpl -import com.intellij.openapi.Disposable -import com.intellij.openapi.project.Project - -// FIX ME WHEN BUNCH 193 REMOVED -fun setTemplateTestingCompat(project: Project, disposable: Disposable) { - TemplateManagerImpl.setTemplateTesting(disposable) -} \ No newline at end of file diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 7b0e1cb7509..29e0e161a14 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -18,13 +18,11 @@ dependencies { compile(project(":idea:idea-jps-common")) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - testCompileOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java-ide-customization")) - } - + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java-ide-customization")) + excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) } excludeInAndroidStudio(rootProject) { diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index d37c6fba238..bca2715dd92 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -12,9 +12,7 @@ dependencies { compile(project(":native:frontend.native")) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) testCompileOnly(intellijDep()) testRuntimeOnly(intellijDep()) diff --git a/idea/idea-new-project-wizard/build.gradle.kts b/idea/idea-new-project-wizard/build.gradle.kts index 27dce10a09c..c8b97951cd1 100644 --- a/idea/idea-new-project-wizard/build.gradle.kts +++ b/idea/idea-new-project-wizard/build.gradle.kts @@ -13,9 +13,7 @@ dependencies { compileOnly(intellijCoreDep()) compileOnly(intellijDep()) compileOnly(intellijPluginDep("gradle")) - Platform[193].orHigher { - compileOnly(intellijPluginDep("gradle-java")) - } + compileOnly(intellijPluginDep("gradle-java")) testImplementation(projectTests(":idea")) testImplementation(project(":libraries:tools:new-project-wizard:new-project-wizard-cli")) diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts index 4525af69b9f..b33b5546e5c 100644 --- a/idea/idea-test-framework/build.gradle.kts +++ b/idea/idea-test-framework/build.gradle.kts @@ -15,9 +15,7 @@ dependencies { testCompileOnly(project(":kotlin-reflect-api")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) - Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) - } + testCompileOnly(intellijPluginDep("java")) } sourceSets { diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt index dd15cba1275..7a30408b6e9 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt @@ -9,7 +9,7 @@ import com.intellij.ide.startup.impl.StartupManagerImpl import com.intellij.openapi.project.Project import com.intellij.openapi.startup.StartupManager -// FIX ME WHEN BUNCH 193 REMOVED +// FIX ME WHEN BUNCH 201 REMOVED fun runPostStartupActivitiesOnce(project: Project) { (StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivitiesRegisteredDynamically() } \ No newline at end of file diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202 b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202 index 16f71df5d32..546cf746145 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202 +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/compat.kt.202 @@ -7,6 +7,5 @@ package org.jetbrains.kotlin.idea.test import com.intellij.openapi.project.Project -// FIX ME WHEN BUNCH 193 REMOVED fun runPostStartupActivitiesOnce(project: Project) { } diff --git a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts index e78067d314c..65cdde8e928 100644 --- a/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-core/build.gradle.kts @@ -14,9 +14,7 @@ dependencies { compileOnly(toolsJarApi()) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) compileOnly(intellijPluginDep("stream-debugger")) diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts index e5482a06df3..cb2a956c476 100644 --- a/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts @@ -10,9 +10,7 @@ dependencies { compileOnly(toolsJarApi()) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts index bd8d836bafa..19204e47edf 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts @@ -11,9 +11,7 @@ dependencies { compile(project(":idea:jvm-debugger:jvm-debugger-util")) compileOnly(toolsJarApi()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) compileOnly(intellijDep()) diff --git a/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts index 000cc3c6d66..f0d26ef04c4 100644 --- a/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts @@ -9,9 +9,7 @@ dependencies { compileOnly(toolsJarApi()) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) compileOnly(intellijPluginDep("stream-debugger")) diff --git a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts index fc716e444b7..98ef6deb2b5 100644 --- a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts @@ -20,10 +20,8 @@ dependencies { testCompile(intellijPluginDep("stream-debugger")) - Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "aether-dependency-resolver") } - testRuntime(intellijPluginDep("java")) - } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "aether-dependency-resolver") } + testRuntime(intellijPluginDep("java")) testRuntime(project(":nj2k:nj2k-services")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) diff --git a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts index a81fb8454a5..e6d4a59ae9f 100644 --- a/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-util/build.gradle.kts @@ -13,9 +13,7 @@ dependencies { compileOnly(toolsJarApi()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) compileOnly(intellijDep()) diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts index f716b85ac90..60b4dd929f4 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts +++ b/idea/kotlin-gradle-tooling/build.gradle.kts @@ -12,9 +12,6 @@ dependencies { compileOnly(intellijPluginDep("gradle")) compileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") } - Platform[193].orLower { - compile(project(":idea:idea-gradle-tooling-api")) - } } sourceSets { diff --git a/idea/performanceTests/build.gradle.kts b/idea/performanceTests/build.gradle.kts index ffd90e07e36..991f17e8399 100644 --- a/idea/performanceTests/build.gradle.kts +++ b/idea/performanceTests/build.gradle.kts @@ -22,9 +22,6 @@ dependencies { testRuntimeOnly(project(":nj2k:nj2k-services")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":idea:kotlin-gradle-tooling")) - Platform[193].orLower { - testRuntimeOnly(project(":idea:idea-gradle-tooling-api")) - } testRuntimeOnly(project(":kotlin-gradle-statistics")) testImplementation(intellijPluginDep("gradle")) @@ -40,22 +37,14 @@ dependencies { testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.+") testImplementation("khttp:khttp:1.0.0") + testCompileOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java")) - Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java")) - } - - Platform[193].orHigher { - testImplementation(intellijPluginDep("gradle-java")) - testRuntimeOnly(intellijPluginDep("gradle-java")) - } + testImplementation(intellijPluginDep("gradle-java")) + testRuntimeOnly(intellijPluginDep("gradle-java")) testCompileOnly(intellijDep()) testCompileOnly(project(":nj2k")) - Platform[193].orLower { - testCompileOnly(project(":idea:idea-gradle-tooling-api")) - } testCompileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") } } diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt index 7fa84667cf3..8ae91f075bd 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.initDefaultPro import org.jetbrains.kotlin.idea.perf.util.logMessage import org.jetbrains.kotlin.idea.test.invalidateLibraryCache import org.jetbrains.kotlin.idea.testFramework.* -import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.cleanupCaches import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.close import org.jetbrains.kotlin.idea.testFramework.Fixture.Companion.isAKotlinScriptFile diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt index 556bea9c8b3..1566f37840c 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt @@ -26,10 +26,10 @@ import com.intellij.psi.PsiElementVisitor import com.intellij.psi.impl.search.IndexPatternBuilder import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry import com.intellij.psi.xml.XmlFileNSInfoProvider +import com.intellij.testFramework.TestApplicationManager import com.intellij.xml.XmlSchemaProvider import org.jetbrains.kotlin.idea.framework.KotlinSdkType import org.jetbrains.kotlin.idea.perf.util.TeamCity -import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe import java.io.File diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt index 0fef9997dc0..10b3fd86792 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt @@ -43,7 +43,6 @@ import org.jetbrains.kotlin.idea.perf.util.ProfileTools.Companion.initDefaultPro import org.jetbrains.kotlin.idea.test.GradleProcessOutputInterceptor import org.jetbrains.kotlin.idea.test.invalidateLibraryCache import org.jetbrains.kotlin.idea.testFramework.* -import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe import java.io.File diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt deleted file mode 100644 index b2c9e7ed0ff..00000000000 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/compat.kt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.testFramework - -import com.intellij.openapi.project.Project -import com.intellij.openapi.project.ex.ProjectManagerEx - -// FIX ME WHEN BUNCH 193 REMOVED -fun ProjectManagerEx.forceCloseProjectEx(project: Project, dispose: Boolean): Boolean { - if (!dispose) error("dispose should be true") - return this.forceCloseProject(project) -} - -// FIX ME WHEN BUNCH 193 REMOVED -typealias TestApplicationManager = com.intellij.testFramework.TestApplicationManager \ No newline at end of file diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt index 94fa6c8f5b9..185f5d5167c 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt @@ -23,6 +23,7 @@ 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.TestApplicationManager import com.intellij.testFramework.runInEdtAndWait import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.idea.perf.util.logMessage @@ -84,8 +85,7 @@ fun TestApplicationManager.closeProject(project: Project) { logMessage { "project '$name' is about to be closed" } dispatchAllInvocationEvents() val projectManagerEx = ProjectManagerEx.getInstanceEx() - projectManagerEx.forceCloseProjectEx(project, true) - + projectManagerEx.forceCloseProject(project) logMessage { "project '$name' successfully closed" } } diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202 b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202 index 367b68ab33e..756f62ec7f0 100644 --- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202 +++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt.202 @@ -25,6 +25,7 @@ import com.intellij.platform.PlatformProjectOpenProcessor import com.intellij.psi.PsiDocumentManager import com.intellij.psi.impl.PsiDocumentManagerBase import com.intellij.testFramework.ExtensionTestUtil +import com.intellij.testFramework.TestApplicationManager import com.intellij.testFramework.runInEdtAndWait import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.idea.perf.util.logMessage @@ -85,8 +86,7 @@ fun TestApplicationManager.closeProject(project: Project) { logMessage { "project '$name' is about to be closed" } dispatchAllInvocationEvents() val projectManagerEx = ProjectManagerEx.getInstanceEx() - projectManagerEx.forceCloseProjectEx(project, true) - + projectManagerEx.forceCloseProject(project) logMessage { "project '$name' successfully closed" } } diff --git a/idea/scripting-support/build.gradle.kts b/idea/scripting-support/build.gradle.kts index 1e294281714..219a941a658 100644 --- a/idea/scripting-support/build.gradle.kts +++ b/idea/scripting-support/build.gradle.kts @@ -31,10 +31,8 @@ dependencies { testRuntime(project(":idea:idea-android")) { isTransitive = false } - Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) - testRuntime(intellijPluginDep("java")) - } + testCompileOnly(intellijPluginDep("java")) + testRuntime(intellijPluginDep("java")) testRuntimeOnly(toolsJar()) testRuntime(project(":kotlin-reflect")) diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt index 7a2b417446a..7168a812b1d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt @@ -8,8 +8,10 @@ package org.jetbrains.kotlin.idea.hierarchy.calls import com.intellij.ide.hierarchy.HierarchyNodeDescriptor import com.intellij.ide.hierarchy.HierarchyTreeStructure import com.intellij.ide.hierarchy.call.CallHierarchyNodeDescriptor +import com.intellij.ide.hierarchy.call.CalleeMethodsTreeStructure import com.intellij.ide.util.treeView.NodeDescriptor import com.intellij.psi.PsiElement +import com.intellij.psi.PsiMember import com.intellij.psi.PsiMethod import com.intellij.util.ArrayUtil import org.jetbrains.kotlin.asJava.unwrapped @@ -40,7 +42,7 @@ class KotlinCalleeTreeStructure( override fun buildChildren(nodeDescriptor: HierarchyNodeDescriptor): Array { if (nodeDescriptor is CallHierarchyNodeDescriptor) { val psiMethod = nodeDescriptor.enclosingElement as? PsiMethod ?: return ArrayUtil.EMPTY_OBJECT_ARRAY - return createCalleeMethodsTreeStructure(myProject, psiMethod, scopeType).getChildElements(nodeDescriptor) + return CalleeMethodsTreeStructure(myProject, psiMethod as PsiMember, scopeType).getChildElements(nodeDescriptor) } val element = nodeDescriptor.psiElement as? KtElement ?: return ArrayUtil.EMPTY_OBJECT_ARRAY diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt index 4dc3c9225a0..b979e8e089d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt @@ -9,6 +9,7 @@ import com.intellij.find.findUsages.JavaFindUsagesOptions import com.intellij.ide.hierarchy.HierarchyNodeDescriptor import com.intellij.ide.hierarchy.HierarchyTreeStructure import com.intellij.ide.hierarchy.call.CallHierarchyNodeDescriptor +import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure import com.intellij.ide.util.treeView.NodeDescriptor import com.intellij.psi.PsiElement import com.intellij.psi.PsiMember @@ -67,7 +68,7 @@ class KotlinCallerTreeStructure( ): Collection { if (nodeDescriptor is CallHierarchyNodeDescriptor) { val psiMethod = nodeDescriptor.enclosingElement as? PsiMethod ?: return emptyList() - return createCallerMethodsTreeStructure(myProject, psiMethod, scopeType).getChildElements(nodeDescriptor).toList() + return CallerMethodsTreeStructure(myProject, psiMethod as PsiMember, scopeType).getChildElements(nodeDescriptor).toList() } if (element !is KtDeclaration) return emptyList() diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt deleted file mode 100644 index f107283542f..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2020 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. - */ - -@file:Suppress("TYPEALIAS_EXPANSION_DEPRECATION", "DEPRECATION") - -package org.jetbrains.kotlin.idea.hierarchy.calls - -import com.intellij.ide.hierarchy.call.CalleeMethodsTreeStructure -import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure -import com.intellij.openapi.project.Project -import com.intellij.psi.PsiMember -import com.intellij.psi.PsiMethod - -// FIX ME WHEN BUNCH 193 REMOVED -fun createCallerMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CallerMethodsTreeStructure { - return CallerMethodsTreeStructure(project, method as PsiMember, scopeType) -} - -// FIX ME WHEN BUNCH 193 REMOVED -fun createCalleeMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CalleeMethodsTreeStructure { - return CalleeMethodsTreeStructure(project, method as PsiMember, scopeType) -} diff --git a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt index e4245bab394..ff0eefcaf53 100644 --- a/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/navigationToolbar/AbstractNavBarModelExtensionCompatBase.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.idea.KotlinIconProviderBase import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.psi.KtFile -// FIX ME WHEN BUNCH 193 REMOVED abstract class AbstractNavBarModelExtensionCompatBase : StructureAwareNavBarModelExtension() { protected abstract fun adjustElementImpl(psiElement: PsiElement?): PsiElement? diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt deleted file mode 100644 index eab090985d7..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.projectView - -import com.intellij.ide.util.treeView.AbstractTreeNode - -// FIX ME WHEN BUNCH 193 REMOVED -typealias AbstractTreeNodeAny = AbstractTreeNode<*> \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt index a0363991b55..eafb48b87f7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt @@ -28,8 +28,8 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware { // should be called after ClassesTreeStructureProvider override fun modify( - parent: AbstractTreeNodeAny, - children: Collection, + parent: AbstractTreeNode<*>, + children: Collection>, settings: ViewSettings ): Collection> { val result = ArrayList>() @@ -60,16 +60,16 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware { else -> null } - override fun getData(selected: Collection, dataName: String): Any? = null + override fun getData(selected: Collection>, dataName: String): Any? = null } class KotlinSelectInProjectViewProvider(private val project: Project) : SelectableTreeStructureProvider, DumbAware { - override fun getData(selected: Collection, dataName: String): Any? = null + override fun getData(selected: Collection>, dataName: String): Any? = null override fun modify( - parent: AbstractTreeNodeAny, - children: Collection, + parent: AbstractTreeNode<*>, + children: Collection>, settings: ViewSettings ): Collection> { return ArrayList(children) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt index 547b546f16b..98953f0fa0d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui import com.intellij.openapi.project.Project +import com.intellij.openapi.ui.ComboBox import com.intellij.psi.PsiDocumentManager import com.intellij.refactoring.BaseRefactoringProcessor import com.intellij.refactoring.ui.RefactoringDialog diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt deleted file mode 100644 index 1d4b6a39b3d..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.refactoring.changeSignature.ui - -import com.intellij.openapi.project.Project -import com.intellij.openapi.ui.Messages -import com.intellij.openapi.ui.Messages.OkCancelResult -import org.jetbrains.kotlin.descriptors.DescriptorVisibility -import javax.swing.Icon - -// FIX ME WHEN BUNCH 193 REMOVED - -@OkCancelResult -fun showOkCancelDialog( - project: Project?, - message: String?, - title: String, - icon: Icon? -): Int { - return Messages.showOkCancelDialog( - project, - message, - title, - Messages.getOkButton(), - Messages.getCancelButton(), - icon - ) -} - -typealias ComboBox = com.intellij.openapi.ui.ComboBox diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt index 7bc0b51223e..e6f611c1f05 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt @@ -332,12 +332,15 @@ class KotlinChangeSignatureDialog( if (myMethod.canChangeReturnType() == MethodDescriptor.ReadWriteOption.ReadWrite && myReturnTypeCodeFragment.getTypeInfo(isCovariant = true, forPreview = false, reanalyse = true).type == null ) { - if (showOkCancelDialog( + if (Messages.showOkCancelDialog( myProject, - KotlinBundle.message("message.text.return.type.cannot.be.resolved", - myReturnTypeCodeFragment?.text.toString() - ), + KotlinBundle.message( + "message.text.return.type.cannot.be.resolved", + myReturnTypeCodeFragment?.text.toString() + ), RefactoringBundle.message("changeSignature.refactoring.name"), + Messages.getOkButton(), + Messages.getCancelButton(), Messages.getWarningIcon() ) != Messages.OK ) { @@ -351,13 +354,16 @@ class KotlinChangeSignatureDialog( KotlinBundle.message("text.parameter.0", item.parameter.name) else KotlinBundle.message("text.receiver") - if (showOkCancelDialog( + if (Messages.showOkCancelDialog( myProject, - KotlinBundle.message("message.type.for.cannot.be.resolved", - item.typeCodeFragment.text, - paramText - ), + KotlinBundle.message( + "message.type.for.cannot.be.resolved", + item.typeCodeFragment.text, + paramText + ), RefactoringBundle.message("changeSignature.refactoring.name"), + Messages.getOkButton(), + Messages.getCancelButton(), Messages.getWarningIcon() ) != Messages.OK ) { diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt index 6a3141aaa9d..d44e58a2652 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt @@ -9,6 +9,7 @@ import com.intellij.psi.PsiCall import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.SearchScope import com.intellij.psi.search.searches.ReferencesSearch +import com.intellij.slicer.SliceUsage import com.intellij.usageView.UsageInfo import com.intellij.util.Processor import org.jetbrains.kotlin.builtins.functions.FunctionInvokeDescriptor @@ -22,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor import org.jetbrains.kotlin.idea.findUsages.processAllUsages import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar import org.jetbrains.kotlin.idea.refactoring.changeSignature.toValVar @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions class InflowSlicer( element: KtElement, - processor: SliceUsageProcessor, + processor: Processor, parentUsage: KotlinSliceUsage ) : Slicer(element, processor, parentUsage) { diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt index 8681eafb3f9..ab57af9e49f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceAnalysisMode.kt @@ -5,7 +5,8 @@ package org.jetbrains.kotlin.idea.slicer -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor +import com.intellij.slicer.SliceUsage +import com.intellij.util.Processor import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer @@ -34,7 +35,11 @@ data class KotlinSliceAnalysisMode(val behaviourStack: List, val inli get() = behaviourStack.lastOrNull() interface Behaviour { - fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) + fun processUsages( + element: KtElement, + parent: KotlinSliceUsage, + uniqueProcessor: Processor + ) val slicePresentationPrefix: String val testPresentationPrefix: String diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt index 26922a1cbfe..fec9683dac4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt @@ -27,7 +27,7 @@ import com.intellij.psi.PsiElement import com.intellij.slicer.SliceAnalysisParams import com.intellij.slicer.SliceUsage import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.psi.psiUtil.endOffset @@ -98,7 +98,10 @@ open class KotlinSliceUsage : SliceUsage { override fun canBeLeaf() = element != null && mode == KotlinSliceAnalysisMode.Default - public override fun processUsagesFlownDownTo(element: PsiElement, uniqueProcessor: SliceUsageProcessor) { + public override fun processUsagesFlownDownTo( + element: PsiElement, + uniqueProcessor: Processor + ) { val ktElement = element as? KtElement ?: return val behaviour = mode.currentBehaviour if (behaviour != null) { @@ -108,7 +111,10 @@ open class KotlinSliceUsage : SliceUsage { } } - public override fun processUsagesFlownFromThe(element: PsiElement, uniqueProcessor: SliceUsageProcessor) { + public override fun processUsagesFlownFromThe( + element: PsiElement, + uniqueProcessor: Processor + ) { val ktElement = element as? KtElement ?: return val behaviour = mode.currentBehaviour if (behaviour != null) { diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt index e7c7f962128..16f0e88df76 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt @@ -9,11 +9,14 @@ import com.intellij.slicer.SliceUsage import com.intellij.util.Processor import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor import org.jetbrains.kotlin.psi.KtElement data class LambdaCallsBehaviour(private val sliceProducer: SliceProducer) : KotlinSliceAnalysisMode.Behaviour { - override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) { + override fun processUsages( + element: KtElement, + parent: KotlinSliceUsage, + uniqueProcessor: Processor + ) { val processor = object : Processor { override fun process(sliceUsage: SliceUsage): Boolean { if (sliceUsage is KotlinSliceUsage && sliceUsage.mode.currentBehaviour === this@LambdaCallsBehaviour) { diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt index 8eaff3817cd..07d3f578af5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt @@ -5,12 +5,17 @@ package org.jetbrains.kotlin.idea.slicer +import com.intellij.slicer.SliceUsage +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor import org.jetbrains.kotlin.psi.KtElement data class LambdaParameterInflowBehaviour(val parameterIndex: Int) : KotlinSliceAnalysisMode.Behaviour { - override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) { + override fun processUsages( + element: KtElement, + parent: KotlinSliceUsage, + uniqueProcessor: Processor + ) { InflowSlicer(element, uniqueProcessor, parent).processChildren(parent.forcedExpressionMode) } diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt index 291a4907fc4..7731f7cfeb1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt @@ -5,12 +5,17 @@ package org.jetbrains.kotlin.idea.slicer +import com.intellij.slicer.SliceUsage +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor import org.jetbrains.kotlin.psi.KtElement object LambdaReceiverInflowBehaviour : KotlinSliceAnalysisMode.Behaviour { - override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) { + override fun processUsages( + element: KtElement, + parent: KotlinSliceUsage, + uniqueProcessor: Processor + ) { InflowSlicer(element, uniqueProcessor, parent).processChildren(parent.forcedExpressionMode) } diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt index 1288f09678b..c313be20a9c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaResultInflowBehaviour.kt @@ -5,12 +5,17 @@ package org.jetbrains.kotlin.idea.slicer +import com.intellij.slicer.SliceUsage +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor import org.jetbrains.kotlin.psi.KtElement object LambdaResultInflowBehaviour : KotlinSliceAnalysisMode.Behaviour { - override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) { + override fun processUsages( + element: KtElement, + parent: KotlinSliceUsage, + uniqueProcessor: Processor + ) { InflowSlicer(element, uniqueProcessor, parent).processChildren(parent.forcedExpressionMode) } diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt index 4e766b9fe7c..4e55a049140 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt @@ -11,7 +11,9 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.util.parentOfType +import com.intellij.slicer.SliceUsage import com.intellij.usageView.UsageInfo +import com.intellij.util.Processor import org.jetbrains.kotlin.builtins.isExtensionFunctionType import org.jetbrains.kotlin.builtins.isFunctionType import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue @@ -24,7 +26,6 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachOverridingElement import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReadWriteAccessDetector import org.jetbrains.kotlin.idea.util.actualsForExpected @@ -36,7 +37,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode class OutflowSlicer( element: KtElement, - processor: SliceUsageProcessor, + processor: Processor, parentUsage: KotlinSliceUsage ) : Slicer(element, processor, parentUsage) { diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt index 8addb8ded94..3930d1b225b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.slicer import com.intellij.slicer.SliceUsage import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor +import com.intellij.util.Processor interface SliceProducer { fun produce(usage: UsageInfo, mode: KotlinSliceAnalysisMode, parent: SliceUsage): Collection? @@ -34,7 +34,7 @@ fun SliceProducer.produceAndProcess( sliceUsage: SliceUsage, mode: KotlinSliceAnalysisMode, parentUsage: SliceUsage, - processor: SliceUsageProcessor + processor: Processor ): Boolean { val result = produce(sliceUsage.usageInfo, mode, parentUsage) ?: listOf(sliceUsage) for (usage in result) { diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt index a9c1836964e..b62a7bf5dda 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt @@ -12,7 +12,9 @@ import com.intellij.psi.PsiMethod import com.intellij.psi.search.SearchScope import com.intellij.psi.util.parentOfType import com.intellij.slicer.JavaSliceUsage +import com.intellij.slicer.SliceUsage import com.intellij.usageView.UsageInfo +import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode @@ -29,7 +31,6 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.getDeepestSuperDeclarations import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions -import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor import org.jetbrains.kotlin.idea.findUsages.processAllExactUsages import org.jetbrains.kotlin.idea.findUsages.processAllUsages import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest @@ -54,7 +55,7 @@ import java.util.* abstract class Slicer( protected val element: KtElement, - protected val processor: SliceUsageProcessor, + protected val processor: Processor, protected val parentUsage: KotlinSliceUsage ) { abstract fun processChildren(forcedExpressionMode: Boolean) diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt index 55e9f14df40..100a66eee15 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.kt @@ -25,7 +25,7 @@ abstract class KotlinHierarchyViewTestBase : KotlinLightCodeInsightFixtureTestCa ) { myFixture.configureByFiles(*fileNames) val expectedStructure = loadExpectedStructure() - doHierarchyTestCompat(hierarchyFixture, treeStructureComputable, expectedStructure) + HierarchyViewTestFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure) } @Throws(IOException::class) diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt index 145244d4f52..949752da78d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.codeInsight.postfix -import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat +import com.intellij.codeInsight.template.impl.TemplateManagerImpl import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils @@ -30,7 +30,7 @@ abstract class AbstractPostfixTemplateProviderTest : KotlinLightCodeInsightFixtu myFixture.configureByFile(fileName) val template = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// TEMPLATE:") if (template != null) { - setTemplateTestingCompat(project, testRootDisposable) + TemplateManagerImpl.setTemplateTesting(testRootDisposable) myFixture.type(template.replace("\\t", "\t")) } else { myFixture.type('\t') diff --git a/idea/tests/org/jetbrains/kotlin/idea/compat.kt b/idea/tests/org/jetbrains/kotlin/idea/compat.kt index 7a26ad9faa7..f29b1514ffd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/compat.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/compat.kt @@ -5,22 +5,9 @@ package org.jetbrains.kotlin.idea -import com.intellij.ide.hierarchy.HierarchyTreeStructure import com.intellij.openapi.Disposable import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.openapi.util.Computable import com.intellij.testFramework.ExtensionTestUtil -import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture - -// FIX ME WHEN BUNCH 193 REMOVED -@Suppress("UNUSED_PARAMETER") -fun doHierarchyTestCompat( - hierarchyFixture: HierarchyViewTestFixture, - treeStructureComputable: Computable, - expectedStructure: String, -) { - HierarchyViewTestFixture.doHierarchyTest(treeStructureComputable.compute(), expectedStructure) -} fun maskExtensions( pointName: ExtensionPointName, diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt index 4a839c3369a..c3f30cb6ef0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.hierarchy import com.intellij.ide.hierarchy.* import com.intellij.ide.hierarchy.actions.BrowseHierarchyActionBase +import com.intellij.ide.hierarchy.call.CallerMethodsTreeStructure import com.intellij.ide.hierarchy.type.SubtypesHierarchyTreeStructure import com.intellij.ide.hierarchy.type.SupertypesHierarchyTreeStructure import com.intellij.ide.hierarchy.type.TypeHierarchyTreeStructure @@ -15,10 +16,7 @@ import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.fileEditor.impl.text.TextEditorPsiDataProvider import com.intellij.openapi.util.Computable import com.intellij.openapi.util.io.FileUtil -import com.intellij.psi.PsiClass -import com.intellij.psi.PsiDocumentManager -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiMethod +import com.intellij.psi.* import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException import com.intellij.rt.execution.junit.ComparisonDetailsExtractor import com.intellij.testFramework.LightProjectDescriptor @@ -29,7 +27,6 @@ import junit.framework.TestCase import org.jetbrains.kotlin.idea.KotlinHierarchyViewTestBase import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCalleeTreeStructure import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallerTreeStructure -import org.jetbrains.kotlin.idea.hierarchy.calls.createCallerMethodsTreeStructure import org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideTreeStructure import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtCallableDeclaration @@ -124,10 +121,9 @@ abstract class AbstractHierarchyTest : KotlinHierarchyViewTestBase() { private val callerJavaHierarchyStructure: Computable get() = Computable { - createCallerMethodsTreeStructure( + CallerMethodsTreeStructure( project, - (getElementAtCaret(LanguageCallHierarchy.INSTANCE) as PsiMethod), - HierarchyBrowserBaseEx.SCOPE_PROJECT + (getElementAtCaret(LanguageCallHierarchy.INSTANCE) as PsiMethod) as PsiMember, HierarchyBrowserBaseEx.SCOPE_PROJECT ) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt index 473b9f9f1bc..2bd4fb58780 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt @@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.CharsetToolkit import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiFile +import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl import com.intellij.util.ArrayUtil import com.intellij.util.PathUtil import junit.framework.ComparisonFailure @@ -335,7 +336,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest TestCase.fail("Action '$text' is available (but must not) in test $testFilePath") } - invokeIntentionCompat(action, file, editor) + CodeInsightTestFixtureImpl.invokeIntention(action, file, editor) if (!shouldBeAvailableAfterExecution) { val afterAction = findActionByPattern(pattern, getAvailableActions()) diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt deleted file mode 100644 index 63c5a48cb3f..00000000000 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2010-2020 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.idea.quickfix - -import com.intellij.codeInsight.intention.IntentionAction -import com.intellij.openapi.editor.Editor -import com.intellij.psi.PsiFile -import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl - -// FIX ME WHEN BUNCH 193 REMOVED -fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) { - CodeInsightTestFixtureImpl.invokeIntention(action, file, editor) -} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt index e5c06e8f70e..444f1aab602 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt @@ -15,7 +15,6 @@ import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import com.intellij.testFramework.LightPlatformCodeInsightTestCase import com.intellij.testFramework.fixtures.CodeInsightTestUtil import junit.framework.TestCase -import org.jetbrains.kotlin.idea.liveTemplates.setTemplateTestingCompat import org.jetbrains.kotlin.idea.refactoring.rename.KotlinMemberInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter @@ -202,7 +201,7 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() { val project = editor.project!! - setTemplateTestingCompat(project, testRootDisposable) + TemplateManagerImpl.setTemplateTesting(testRootDisposable) object : WriteCommandAction.Simple(project) { override fun run() { diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index cbb700c369b..1e074a308c8 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -24,10 +24,8 @@ dependencies { testCompileOnly(intellijDep()) - Platform[192].orHigher { - testCompileOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java")) - } + testCompileOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java")) testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index 2bb19dede65..de19db01850 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -44,9 +44,7 @@ dependencies { testRuntime(project(it)) } - Platform[192].orHigher { - testRuntimeOnly(intellijPluginDep("java")) - } + testRuntimeOnly(intellijPluginDep("java")) testRuntimeOnly(toolsJar()) testRuntime(project(":kotlin-reflect")) diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts index 27a5c314945..6cf0f54bf85 100644 --- a/libraries/tools/kotlinp/build.gradle.kts +++ b/libraries/tools/kotlinp/build.gradle.kts @@ -29,9 +29,7 @@ dependencies { testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - Platform[192].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "platform-objectSerializer") } - } + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency", "platform-objectSerializer") } shadows(project(":kotlinx-metadata-jvm", configuration = "runtime")) shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion") diff --git a/license/README.md b/license/README.md index 4823b912053..42a92549719 100644 --- a/license/README.md +++ b/license/README.md @@ -88,11 +88,7 @@ the Kotlin IntelliJ IDEA plugin: - Path: plugins/lint/lint-idea - License: Apache 2 ([license/third_party/aosp_license.txt][aosp]) - Origin: Copyright (C) 2011-15 The Android Open Source Project - - - Path: idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl - - License: Apache 2 ([license/third_party/gradle_license.txt][gradle]) - - Origin: Gradle, Copyright 2002-2017 Gradle, Inc. - + - Path: wasm/ir/src/org/jetbrains/kotlin/wasm/ir/convertors - License: MIT ([license/third_party/asmble_license.txt][asmble]) - Origin: Copyright (C) 2018 Chad Retz @@ -225,7 +221,6 @@ any distributions of the compiler, libraries or plugin: [aosp]: third_party/aosp_license.txt [asm]: third_party/asm_license.txt -[asmble]: third_party/asmble_license.txt [boost]: third_party/boost_LICENSE.txt [closure-compiler]: third_party/closure-compiler_LICENSE.txt [dagger]: third_party/testdata/dagger_license.txt diff --git a/nj2k/build.gradle.kts b/nj2k/build.gradle.kts index e902d3af696..f00dce65ee9 100644 --- a/nj2k/build.gradle.kts +++ b/nj2k/build.gradle.kts @@ -15,11 +15,9 @@ dependencies { compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } compileOnly(intellijDep()) { includeJars("platform-api", "platform-impl", rootProject = rootProject) } - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - testRuntime(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testRuntime(intellijPluginDep("java")) testCompile(project(":idea")) testCompile(projectTests(":j2k")) diff --git a/nj2k/nj2k-services/build.gradle.kts b/nj2k/nj2k-services/build.gradle.kts index b0c61583736..6ae94333cf3 100644 --- a/nj2k/nj2k-services/build.gradle.kts +++ b/nj2k/nj2k-services/build.gradle.kts @@ -14,9 +14,7 @@ dependencies { compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - } + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } } sourceSets { diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts index 184652efdad..b9525cbb3f7 100644 --- a/plugins/allopen/allopen-ide/build.gradle.kts +++ b/plugins/allopen/allopen-ide/build.gradle.kts @@ -44,11 +44,9 @@ dependencies { testCompileOnly(intellijDep()) testRuntimeOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - testCompileOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) + testCompileOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java")) } sourceSets { diff --git a/plugins/fir/fir-plugin-prototype/build.gradle.kts b/plugins/fir/fir-plugin-prototype/build.gradle.kts index aff5b8dac74..c4a1836160e 100644 --- a/plugins/fir/fir-plugin-prototype/build.gradle.kts +++ b/plugins/fir/fir-plugin-prototype/build.gradle.kts @@ -27,10 +27,8 @@ dependencies { testRuntime(project(":kotlin-reflect")) testRuntime(project(":core:descriptors.runtime")) - Platform[192].orHigher { - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index effc013bf75..8af68b8103b 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -16,9 +16,7 @@ dependencies { testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } - Platform[192].orHigher { - testRuntime(intellijPluginDep("java")) - } + testRuntime(intellijPluginDep("java")) compile(project(":compiler:util")) compile(project(":compiler:cli")) diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 1c85f9997d8..3a299066a7e 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -13,9 +13,7 @@ dependencies { compileOnly(project(":idea:idea-core")) compileOnly(project(":idea:idea-gradle")) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) compileOnly(intellijPluginDep("gradle")) compileOnly(intellijPluginDep("android")) } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 15aade51a05..edf760f49a4 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -25,10 +25,7 @@ dependencies { testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:1.0-M1-1.4.0-rc") { isTransitive = false } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - - Platform[192].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } - } + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } } sourceSets { diff --git a/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts index 2ef3944b795..4a8e1af0448 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts @@ -15,9 +15,7 @@ dependencies { compile(project(":idea:idea-maven")) compile(project(":plugins:annotation-based-compiler-plugins-ide-support")) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) } compileOnly(intellijPluginDep("gradle")) diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts index 007cabd6d1d..069251a7016 100644 --- a/plugins/noarg/noarg-ide/build.gradle.kts +++ b/plugins/noarg/noarg-ide/build.gradle.kts @@ -44,12 +44,10 @@ dependencies { testCompileOnly(intellijDep()) testRuntimeOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) + compileOnly(intellijPluginDep("java")) - testCompileOnly(intellijPluginDep("java")) - testRuntimeOnly(intellijPluginDep("java")) - } + testCompileOnly(intellijPluginDep("java")) + testRuntimeOnly(intellijPluginDep("java")) } sourceSets { diff --git a/plugins/parcelize/parcelize-ide/build.gradle.kts b/plugins/parcelize/parcelize-ide/build.gradle.kts index 7db699163ff..1d8da1b19f9 100644 --- a/plugins/parcelize/parcelize-ide/build.gradle.kts +++ b/plugins/parcelize/parcelize-ide/build.gradle.kts @@ -23,9 +23,7 @@ dependencies { compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } } - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - } + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } testCompile(projectTests(":idea")) testCompile(projectTests(":plugins:parcelize:parcelize-compiler")) @@ -39,9 +37,7 @@ dependencies { testRuntime(toolsJar()) - Platform[192].orHigher { - testRuntimeOnly(intellijPluginDep("java")) - } + testRuntimeOnly(intellijPluginDep("java")) } sourceSets { diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index 4c319582997..8f79c1e3ca0 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts @@ -21,10 +21,7 @@ dependencies { testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompile(project(":kotlin-scripting-jvm-host-unshaded")) testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } - - Platform[192].orHigher { - testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } - } + testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") } } sourceSets { diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts index 3cc70972b73..1308b187d42 100644 --- a/plugins/uast-kotlin-idea/build.gradle.kts +++ b/plugins/uast-kotlin-idea/build.gradle.kts @@ -13,9 +13,7 @@ dependencies { compile(project(":idea:idea-core")) compile(project(":plugins:uast-kotlin")) compileOnly(intellijDep()) - Platform[192].orHigher { - compileOnly(intellijPluginDep("java")) - } + compileOnly(intellijPluginDep("java")) } sourceSets { diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index b4581ad99ca..d836daa7676 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -21,12 +21,10 @@ dependencies { compileOnly(intellijDep()) { includeJars("java-api", "java-impl") } } - if (Platform.P192.orHigher()) { - compileOnly(intellijDep()) { includeJars("platform-impl") } - compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } - testRuntime(intellijPluginDep("java")) - } + compileOnly(intellijDep()) { includeJars("platform-impl") } + compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") } + testRuntime(intellijPluginDep("java")) testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common")) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index a120c2d507b..2efc93714ba 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -215,15 +215,7 @@ dependencies { fatJarContents(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") } } - if (Platform.P192.orHigher()) { - fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) } - } else { - fatJarContents(intellijDep()) { includeJars("lz4-1.3.0") } - } - - if (Platform.P183.orHigher() && Platform.P191.orLower()) { - fatJarContents(intellijCoreDep()) { includeJars("java-compatibility-1.0.1") } - } + fatJarContents(intellijDep()) { includeJars("lz4-java", rootProject = rootProject) } fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project) { diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 97db1ba59db..5e5698f7526 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -183,9 +183,7 @@ dependencies { libraries(kotlinStdlib("jdk8")) - Platform[193].orHigher { - libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin")) - } + libraries(commonDep("org.jetbrains.intellij.deps.completion", "completion-ranking-kotlin")) libraryProjects.forEach { libraries(project(it)) { isTransitive = false } @@ -199,13 +197,8 @@ dependencies { gradleToolingModel(project(":noarg-ide-plugin")) { isTransitive = false } gradleToolingModel(project(":allopen-ide-plugin")) { isTransitive = false } - Platform[193].orLower { - gradleToolingModel(project(":idea:idea-gradle-tooling-api")) { isTransitive = false } - } - jpsPlugin(project(":kotlin-jps-plugin")) { isTransitive = false } - (libraries.dependencies + gradleToolingModel.dependencies) .map { if (it is ProjectDependency) it.dependencyProject else it } .forEach(::compile) diff --git a/settings.gradle b/settings.gradle index cb7d390dc18..d9f3ac6a919 100644 --- a/settings.gradle +++ b/settings.gradle @@ -153,7 +153,6 @@ include ":benchmarks", ":idea:idea-jvm", ":idea:idea-maven", ":idea:idea-gradle", - ":idea:idea-gradle-tooling-api", ":idea:idea-git", ":idea:idea-jps-common", ":idea:formatter",