From fe8e02f4cf08aabf6fe0bfc271cd479b2af08763 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 3 Apr 2017 17:46:30 +0200 Subject: [PATCH] Use LibraryJarDescriptor for refreshing jars on plugin update --- .../idea/versions/KotlinUpdatePluginComponent.kt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt index 9281c001cb1..ce9bf0e29cd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt @@ -27,7 +27,6 @@ import com.intellij.openapi.vfs.newvfs.NewVirtualFile import com.intellij.util.indexing.FileBasedIndex import org.jetbrains.kotlin.idea.KotlinPluginUtil import org.jetbrains.kotlin.idea.vfilefinder.* -import org.jetbrains.kotlin.utils.PathUtil import java.io.File private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version" @@ -45,16 +44,10 @@ class KotlinUpdatePluginComponent : ApplicationComponent { val installedKotlinVersion = PropertiesComponent.getInstance()?.getValue(INSTALLED_KOTLIN_VERSION) if (installedKotlinVersion == null || KotlinPluginUtil.getPluginVersion() != installedKotlinVersion) { - val ideaPluginPaths = PathUtil.getKotlinPathsForIdeaPlugin() - // Force refresh jar handlers - requestFullJarUpdate(ideaPluginPaths.stdlibPath) - requestFullJarUpdate(ideaPluginPaths.reflectPath) - requestFullJarUpdate(ideaPluginPaths.scriptRuntimePath) - requestFullJarUpdate(ideaPluginPaths.stdlibSourcesPath) - - requestFullJarUpdate(ideaPluginPaths.jsStdLibJarPath) - requestFullJarUpdate(ideaPluginPaths.jsStdLibSrcJarPath) + for (libraryJarDescriptor in LibraryJarDescriptor.values()) { + requestFullJarUpdate(libraryJarDescriptor.getPathInPlugin()) + } // Force update indices for files under config directory val fileBasedIndex = FileBasedIndex.getInstance()