From 3f8245988e54db6a79ca2f70a9cd1ae56bf997d3 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Sat, 28 Apr 2018 14:28:48 +0300 Subject: [PATCH] Remove GradleScriptDefaultDependenciesProvider as unused --- .../core/script/ScriptDependenciesUpdater.kt | 13 +----------- .../script/GradleScriptTemplateProvider.kt | 20 +------------------ idea/src/META-INF/extensions/compiler.xml | 3 --- idea/src/META-INF/extensions/compiler.xml.172 | 3 --- idea/src/META-INF/gradle-java.xml.182 | 1 - idea/src/META-INF/gradle.xml | 1 - idea/src/META-INF/gradle.xml.172 | 1 - 7 files changed, 2 insertions(+), 40 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt index ad8982e5557..d839be38bdd 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt @@ -38,7 +38,6 @@ import kotlinx.coroutines.experimental.CoroutineDispatcher import kotlinx.coroutines.experimental.asCoroutineDispatcher import kotlinx.coroutines.experimental.launch import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor import org.jetbrains.kotlin.idea.core.util.EDT import org.jetbrains.kotlin.idea.core.util.cancelOnDisposal import org.jetbrains.kotlin.idea.util.application.runWriteAction @@ -301,14 +300,4 @@ private object TimeStamps { var Application.isScriptDependenciesUpdaterDisabled by NotNullableUserDataProperty( Key.create("SCRIPT_DEPENDENCIES_UPDATER_DISABLED"), false -) - -interface DefaultScriptDependenciesProvider { - fun defaultDependenciesFor(scriptFile: VirtualFile): ScriptDependencies? - - companion object : ProjectExtensionDescriptor( - "org.jetbrains.kotlin.defaultScriptDependenciesProvider", - DefaultScriptDependenciesProvider::class.java - ) - -} \ No newline at end of file +) \ No newline at end of file diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt index b5863e220f8..465b6fb5239 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt @@ -24,7 +24,6 @@ import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskType import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.fileTypes.LanguageFileType import com.intellij.openapi.project.Project -import com.intellij.openapi.vfs.VirtualFile import org.gradle.tooling.ProjectConnection import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID @@ -49,7 +48,6 @@ import kotlin.script.dependencies.Environment import kotlin.script.dependencies.ScriptContents import kotlin.script.experimental.dependencies.DependenciesResolver import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult -import kotlin.script.experimental.dependencies.ScriptDependencies import kotlin.script.experimental.dependencies.ScriptReport import kotlin.script.experimental.location.ScriptExpectedLocation import kotlin.script.templates.standard.ScriptTemplateWithArgs @@ -340,20 +338,4 @@ class TopLevelSectionTokensEnumerator(script: CharSequence, identifier: String) fun topLevelSectionCodeTextTokens(script: CharSequence, sectionIdentifier: String): Sequence = TopLevelSectionTokensEnumerator(script, sectionIdentifier).asSequence() .filter { it.tokenType !in KtTokens.WHITE_SPACE_OR_COMMENT_BIT_SET } - .map { it.tokenSequence } - - -private const val KOTLIN_BUILD_FILE_SUFFIX = ".gradle.kts" - -class GradleScriptDefaultDependenciesProvider( - private val scriptDependenciesCache: ScriptDependenciesCache -) : DefaultScriptDependenciesProvider { - override fun defaultDependenciesFor(scriptFile: VirtualFile): ScriptDependencies? { - if (!scriptFile.name.endsWith(KOTLIN_BUILD_FILE_SUFFIX)) return null - - return previouslyAnalyzedScriptsCombinedDependencies().takeUnless { it.classpath.isEmpty() } - } - - private fun previouslyAnalyzedScriptsCombinedDependencies() = - scriptDependenciesCache.combineDependencies { it.name.endsWith(KOTLIN_BUILD_FILE_SUFFIX) } -} + .map { it.tokenSequence } \ No newline at end of file diff --git a/idea/src/META-INF/extensions/compiler.xml b/idea/src/META-INF/extensions/compiler.xml index eeb7a5a2dd5..bead639f672 100644 --- a/idea/src/META-INF/extensions/compiler.xml +++ b/idea/src/META-INF/extensions/compiler.xml @@ -45,9 +45,6 @@ interface="org.jetbrains.kotlin.idea.completion.CompletionInformationProvider" /> - diff --git a/idea/src/META-INF/extensions/compiler.xml.172 b/idea/src/META-INF/extensions/compiler.xml.172 index ea712eaa9ef..563d9170175 100644 --- a/idea/src/META-INF/extensions/compiler.xml.172 +++ b/idea/src/META-INF/extensions/compiler.xml.172 @@ -44,9 +44,6 @@ interface="org.jetbrains.kotlin.idea.completion.CompletionInformationProvider" /> - diff --git a/idea/src/META-INF/gradle-java.xml.182 b/idea/src/META-INF/gradle-java.xml.182 index 6aaad114ccb..be87b9e4854 100644 --- a/idea/src/META-INF/gradle-java.xml.182 +++ b/idea/src/META-INF/gradle-java.xml.182 @@ -59,7 +59,6 @@ - diff --git a/idea/src/META-INF/gradle.xml b/idea/src/META-INF/gradle.xml index 1e77e9bac88..f79cdc114cb 100644 --- a/idea/src/META-INF/gradle.xml +++ b/idea/src/META-INF/gradle.xml @@ -67,7 +67,6 @@ - diff --git a/idea/src/META-INF/gradle.xml.172 b/idea/src/META-INF/gradle.xml.172 index a546e5d0c26..077b62ee12d 100644 --- a/idea/src/META-INF/gradle.xml.172 +++ b/idea/src/META-INF/gradle.xml.172 @@ -70,7 +70,6 @@ -