forked from JetBrains/kotlin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Optimize PluginDeclarationProviderFactory.getStubBasedPackageMemberDe…
…clarationProvider Add cache for fast package exists check in specific module #KT-16850 fixed
- Loading branch information
Showing
12 changed files
with
222 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| /* | ||
| * Copyright 2010-2017 JetBrains s.r.o. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jetbrains.kotlin.idea.caches | ||
|
|
||
| import com.intellij.openapi.components.ServiceManager | ||
| import com.intellij.openapi.project.Project | ||
| import com.intellij.openapi.util.Key | ||
| import com.intellij.openapi.util.Ref | ||
| import com.intellij.openapi.vfs.VirtualFile | ||
| import com.intellij.openapi.vfs.VirtualFileManager | ||
| import com.intellij.openapi.vfs.newvfs.BulkFileListener | ||
| import com.intellij.openapi.vfs.newvfs.events.* | ||
| import com.intellij.psi.impl.PsiTreeChangeEventImpl | ||
| import com.intellij.psi.impl.PsiTreeChangePreprocessor | ||
| import com.intellij.psi.search.GlobalSearchScope | ||
| import com.intellij.util.containers.ContainerUtil | ||
| import org.jetbrains.kotlin.analyzer.ModuleInfo | ||
| import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo | ||
| import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfoByVirtualFile | ||
| import org.jetbrains.kotlin.idea.caches.resolve.getNullableModuleInfo | ||
| import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil | ||
| import org.jetbrains.kotlin.name.FqName | ||
| import org.jetbrains.kotlin.psi.KtFile | ||
| import org.jetbrains.kotlin.psi.KtPackageDirective | ||
| import org.jetbrains.kotlin.psi.psiUtil.getParentOfType | ||
| import java.util.concurrent.ConcurrentMap | ||
|
|
||
| class KotlinPackageContentModificationListener( | ||
| private val project: Project | ||
| ) { | ||
| init { | ||
| val connection = project.messageBus.connect() | ||
|
|
||
| val scope = GlobalSearchScope.projectScope(project) | ||
|
|
||
| connection.subscribe(VirtualFileManager.VFS_CHANGES, object : BulkFileListener.Adapter() { | ||
| override fun before(events: MutableList<out VFileEvent>) = onEvents(events) { it is VFileDeleteEvent || it is VFileMoveEvent } | ||
| override fun after(events: List<VFileEvent>) = onEvents(events) { it is VFileMoveEvent || it is VFileCreateEvent || it is VFileCopyEvent } | ||
|
|
||
| fun onEvents(events: List<VFileEvent>, filter: (VFileEvent) -> Boolean) = events.asSequence() | ||
| .filter(filter) | ||
| .map { it.file } | ||
| .filterNotNull() | ||
| .filter { it in scope } | ||
| .forEach { file -> | ||
| PerModulePackageCacheService.notifyPackageChange(file, project) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| class KotlinPackageStatementPsiTreeChangePreprocessor : PsiTreeChangePreprocessor { | ||
| override fun treeChanged(event: PsiTreeChangeEventImpl) { | ||
| val file = event.file as? KtFile ?: return | ||
|
|
||
| when (event.code) { | ||
| PsiTreeChangeEventImpl.PsiEventType.CHILD_ADDED, PsiTreeChangeEventImpl.PsiEventType.CHILD_MOVED, PsiTreeChangeEventImpl.PsiEventType.CHILD_REPLACED, PsiTreeChangeEventImpl.PsiEventType.CHILD_REMOVED -> { | ||
| val child = event.child ?: return | ||
| if (child.getParentOfType<KtPackageDirective>(false) != null) | ||
| PerModulePackageCacheService.notifyPackageChange(file) | ||
| } | ||
| else -> { | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class PerModulePackageCacheService { | ||
|
|
||
| val cache = ContainerUtil.createConcurrentWeakMap<ModuleInfo, Ref<ConcurrentMap<FqName, Boolean>>>() | ||
|
|
||
| companion object { | ||
|
|
||
| val PER_MODULE_PACKAGE_CACHE = Key.create<ConcurrentMap<ModuleInfo, Ref<ConcurrentMap<FqName, Boolean>>>>("per_module_package_cache") | ||
|
|
||
| internal fun notifyPackageChange(file: KtFile): Unit { | ||
| (file.getNullableModuleInfo() as? ModuleSourceInfo)?.let { onChangeInModuleSource(it, file.project) } | ||
| } | ||
|
|
||
| internal fun onChangeInModuleSource(moduleSourceInfo: ModuleSourceInfo, project: Project) = with(getInstance(project)) { | ||
| cache[moduleSourceInfo]?.set(null) | ||
| } | ||
|
|
||
| internal fun notifyPackageChange(file: VirtualFile, project: Project): Unit { | ||
| (getModuleInfoByVirtualFile(project, file) as? ModuleSourceInfo)?.let { onChangeInModuleSource(it, project) } | ||
| } | ||
|
|
||
| fun getInstance(project: Project): PerModulePackageCacheService = ServiceManager.getService(project, PerModulePackageCacheService::class.java) | ||
|
|
||
| fun packageExists(packageFqName: FqName, moduleInfo: ModuleSourceInfo, project: Project): Boolean = with(getInstance(project)) { | ||
| val module = moduleInfo.module | ||
|
|
||
| // Module own cache is a view on global cache. Since global cache based on WeakReferences when module | ||
| // gets disposed this soft map will be disposed too, leading to drop soft refs on ModuleInfo's, and then to | ||
| // disposing global cache entry | ||
| val moduleOwnCache = module.getUserData(PerModulePackageCacheService.PER_MODULE_PACKAGE_CACHE) ?: run { | ||
| ContainerUtil.createConcurrentSoftMap<ModuleInfo, Ref<ConcurrentMap<FqName, Boolean>>>() | ||
| .apply { module.putUserData(PerModulePackageCacheService.PER_MODULE_PACKAGE_CACHE, this) } | ||
| } | ||
| val cached = moduleOwnCache.getOrPut(moduleInfo) { cache.getOrPut(moduleInfo) { Ref() } } | ||
| .apply { if (isNull) set(ContainerUtil.createConcurrentSoftMap<FqName, Boolean>()) } | ||
| .get() | ||
|
|
||
|
|
||
| return cached.getOrPut(packageFqName) { | ||
| PackageIndexUtil.packageExists(packageFqName, moduleInfo.contentScope(), project) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/CachedValueHelpers.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright 2010-2017 JetBrains s.r.o. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jetbrains.kotlin.idea.core.util | ||
|
|
||
| import com.intellij.openapi.project.Project | ||
| import com.intellij.psi.util.CachedValue | ||
| import com.intellij.psi.util.CachedValueProvider | ||
| import com.intellij.psi.util.CachedValuesManager | ||
| import kotlin.reflect.KProperty | ||
|
|
||
| operator fun <T> CachedValue<T>.getValue(o: Any, property: KProperty<*>): T = value | ||
|
|
||
| fun <T> CachedValue(project: Project, trackValue: Boolean = false, provider: () -> CachedValueProvider.Result<T>) = | ||
| CachedValuesManager.getManager(project).createCachedValue(provider, trackValue) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters