From b3a619bcc384dd87bdcb04c72a26f142edea0fed Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 13 Mar 2018 15:25:18 +0300 Subject: [PATCH] Revert "Provide custom ConstantAffectionResolver in JPS" This reverts commit 1a7737494b5cfbf9fccd94ae266abd3f905df044. The API in Intellij was changed, now the issue can be fixed only in 182.* branches. Original commit: 0deec7983db948f3752310f49fe467056f453563 --- jps/jps-plugin/build.gradle.kts | 1 - .../build.gradle.kts | 22 ----------- .../builders/java/ConstantSearchProvider.java | 23 ------------ ...s.jps.builders.java.ConstantSearchProvider | 1 - .../jps/build/KotlinConstantSearchProvider.kt | 37 ------------------- 5 files changed, 84 deletions(-) delete mode 100644 jps/jps-plugin/jps-services-declarations/build.gradle.kts delete mode 100644 jps/jps-plugin/jps-services-declarations/src/org/jetbrains/jps/builders/java/ConstantSearchProvider.java delete mode 100644 jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.ConstantSearchProvider delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinConstantSearchProvider.kt diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index 733b570e002..a0147cf66bd 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/jps-plugin/build.gradle.kts @@ -4,7 +4,6 @@ apply { plugin("jps-compatible") } val compilerModules: Array by rootProject.extra dependencies { - compileOnly(project(":jps-plugin:jps-services-declarations")) compile(project(":kotlin-build-common")) compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) diff --git a/jps/jps-plugin/jps-services-declarations/build.gradle.kts b/jps/jps-plugin/jps-services-declarations/build.gradle.kts deleted file mode 100644 index dcf3d7b0a7e..00000000000 --- a/jps/jps-plugin/jps-services-declarations/build.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -/** - * A hacky module to provide Intellij services declarations, - * so Kotlin plugin can be compiled even when service API - * is not present in all Intellij builds we support. - */ - -plugins { java } -apply { plugin("jps-compatible") } - -dependencies { - compileOnly(intellijDep()) { includeJars("annotations", "util") } - compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders") } -} - -sourceSets { - "main" { projectDefault() } -} diff --git a/jps/jps-plugin/jps-services-declarations/src/org/jetbrains/jps/builders/java/ConstantSearchProvider.java b/jps/jps-plugin/jps-services-declarations/src/org/jetbrains/jps/builders/java/ConstantSearchProvider.java deleted file mode 100644 index f09105ad5cd..00000000000 --- a/jps/jps-plugin/jps-services-declarations/src/org/jetbrains/jps/builders/java/ConstantSearchProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. 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.jps.builders.java; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.builders.java.dependencyView.Callbacks; -import org.jetbrains.jps.incremental.CompileContext; - -/** - * A "copy" of Intellij service unavailable in current builds, - * so our plugin can be compiled against it (API is not yet merged in Intellij, - * even then it would be available only in 182.* builds). - * - * // todo: remove when compatibility layers will be finished - */ -@SuppressWarnings("unused") -public interface ConstantSearchProvider { - @NotNull - Callbacks.ConstantAffectionResolver getConstantSearch(@NotNull CompileContext context); -} diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.ConstantSearchProvider b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.ConstantSearchProvider deleted file mode 100644 index 2c3c50a7060..00000000000 --- a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.builders.java.ConstantSearchProvider +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.jps.build.KotlinConstantSearchProvider \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinConstantSearchProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinConstantSearchProvider.kt deleted file mode 100644 index ddd34a6252e..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinConstantSearchProvider.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2018 JetBrains s.r.o. 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.jps.build - -import com.intellij.util.concurrency.FixedFuture -import org.jetbrains.jps.builders.java.ConstantSearchProvider -import org.jetbrains.jps.builders.java.dependencyView.Callbacks -import org.jetbrains.jps.incremental.CompileContext -import org.jetbrains.kotlin.incremental.LookupSymbol -import org.jetbrains.kotlin.jps.incremental.withLookupStorage -import java.io.File -import java.util.concurrent.Future - -class KotlinConstantSearchProvider : ConstantSearchProvider { - override fun getConstantSearch(context: CompileContext): Callbacks.ConstantAffectionResolver = - KotlinLookupConstantSearch(context) -} - -class KotlinLookupConstantSearch(context: CompileContext) : Callbacks.ConstantAffectionResolver { - private val dataManager = context.projectDescriptor.dataManager - - override fun request( - ownerClassName: String, - fieldName: String, - accessFlags: Int, - fieldRemoved: Boolean, - accessChanged: Boolean - ): Future { - val paths = dataManager.withLookupStorage { storage -> - storage.get(LookupSymbol(name = fieldName, scope = ownerClassName)) - } - return FixedFuture(Callbacks.ConstantAffection(paths.map(::File))) - } -} \ No newline at end of file