Remove GradleScriptDefaultDependenciesProvider as unused

2018-04-28 14:28:48 +03:00
parent 8453ed1803
commit 3f8245988e
7 changed files with 2 additions and 40 deletions
@@ -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<DefaultScriptDependenciesProvider>(
-        "org.jetbrains.kotlin.defaultScriptDependenciesProvider",
-        DefaultScriptDependenciesProvider::class.java
-    )
-
-}
+)
@@ -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<CharSequence> =
    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 }
@@ -45,9 +45,6 @@
                        interface="org.jetbrains.kotlin.idea.completion.CompletionInformationProvider" />
        <extensionPoint qualifiedName="org.jetbrains.kotlin.moduleBuilder"
                        interface="com.intellij.ide.util.projectWizard.ModuleBuilder"/>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.defaultScriptDependenciesProvider"
-                        interface="org.jetbrains.kotlin.idea.core.script.DefaultScriptDependenciesProvider"
-                        area="IDEA_PROJECT"/>
        <extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler"
                        interface="com.intellij.refactoring.rename.RenameHandler"/>
    </extensionPoints>
@@ -44,9 +44,6 @@
                        interface="org.jetbrains.kotlin.idea.completion.CompletionInformationProvider" />
        <extensionPoint qualifiedName="org.jetbrains.kotlin.moduleBuilder"
                        interface="com.intellij.ide.util.projectWizard.ModuleBuilder"/>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.defaultScriptDependenciesProvider"
-                        interface="org.jetbrains.kotlin.idea.core.script.DefaultScriptDependenciesProvider"
-                        area="IDEA_PROJECT"/>
        <extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler"
                        interface="com.intellij.refactoring.rename.RenameHandler"/>
    </extensionPoints>
@@ -59,7 +59,6 @@
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.allopen.ide.AllOpenGradleProjectImportHandler"/>
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.noarg.ide.NoArgGradleProjectImportHandler"/>
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.samWithReceiver.ide.SamWithReceiverGradleProjectImportHandler"/>
-        <defaultScriptDependenciesProvider implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptDefaultDependenciesProvider"/>

        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleModuleConfigurator"/>
        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsGradleModuleConfigurator"/>
@@ -67,7 +67,6 @@
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.allopen.ide.AllOpenGradleProjectImportHandler"/>
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.noarg.ide.NoArgGradleProjectImportHandler"/>
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.samWithReceiver.ide.SamWithReceiverGradleProjectImportHandler"/>
-        <defaultScriptDependenciesProvider implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptDefaultDependenciesProvider"/>

        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleModuleConfigurator"/>
        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsGradleModuleConfigurator"/>
@@ -70,7 +70,6 @@
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.allopen.ide.AllOpenGradleProjectImportHandler"/>
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.noarg.ide.NoArgGradleProjectImportHandler"/>
        <gradleProjectImportHandler implementation="org.jetbrains.kotlin.samWithReceiver.ide.SamWithReceiverGradleProjectImportHandler"/>
-        <defaultScriptDependenciesProvider implementation="org.jetbrains.kotlin.idea.core.script.GradleScriptDefaultDependenciesProvider"/>

        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinGradleModuleConfigurator"/>
        <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsGradleModuleConfigurator"/>