azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of forced index rebuild on version change

Browse Source 
#KT-17367 Fixed
This commit is contained in:
Dmitry Jemerov
2017-12-13 16:31:16 +01:00
parent 52ccd67ec1
commit ba21bae653
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
-17
View File
@@ -24,9 +24,7 @@ import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFileVisitor import com.intellij.openapi.vfs.VirtualFileVisitor
import com.intellij.openapi.vfs.newvfs.NewVirtualFile import com.intellij.openapi.vfs.newvfs.NewVirtualFile
import com.intellij.util.indexing.FileBasedIndex
import org.jetbrains.kotlin.idea.KotlinPluginUtil import org.jetbrains.kotlin.idea.KotlinPluginUtil
import org.jetbrains.kotlin.idea.vfilefinder.*
import java.io.File import java.io.File
private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version" private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version"
@@ -49,17 +47,6 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
requestFullJarUpdate(libraryJarDescriptor.getPathInPlugin()) requestFullJarUpdate(libraryJarDescriptor.getPathInPlugin())
} }
// Force update indices for files under config directory
val fileBasedIndex = FileBasedIndex.getInstance()
fileBasedIndex.requestRebuild(KotlinJvmMetadataVersionIndex.name)
fileBasedIndex.requestRebuild(KotlinJsMetadataVersionIndex.name)
fileBasedIndex.requestRebuild(KotlinClassFileIndex.KEY)
fileBasedIndex.requestRebuild(KotlinJavaScriptMetaFileIndex.KEY)
fileBasedIndex.requestRebuild(KotlinMetadataFileIndex.KEY)
fileBasedIndex.requestRebuild(KotlinMetadataFilePackageIndex.KEY)
fileBasedIndex.requestRebuild(KotlinModuleMappingIndex.KEY)
fileBasedIndex.requestRebuild(KotlinPackageSourcesMemberNamesIndex.KEY)
PropertiesComponent.getInstance()?.setValue(INSTALLED_KOTLIN_VERSION, KotlinPluginUtil.getPluginVersion()) PropertiesComponent.getInstance()?.setValue(INSTALLED_KOTLIN_VERSION, KotlinPluginUtil.getPluginVersion())
} }
} }
@@ -78,9 +65,5 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
val jarFile = JarFileSystem.getInstance().getJarRootForLocalFile(localVirtualFile) ?: return val jarFile = JarFileSystem.getInstance().getJarRootForLocalFile(localVirtualFile) ?: return
VfsUtilCore.visitChildrenRecursively(jarFile, object : VirtualFileVisitor<Any?>() {}) VfsUtilCore.visitChildrenRecursively(jarFile, object : VirtualFileVisitor<Any?>() {})
((jarFile as NewVirtualFile)).markDirtyRecursively() ((jarFile as NewVirtualFile)).markDirtyRecursively()
// Synchronous refresh lead to deadlocks during components initialization KT-4584
// jarFile.refresh(true, true)
// VfsUtil.markDirtyAndRefresh(true, false, true, localVirtualFile)
} }
} }