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

Make Kotlin OOCBM updater for modules internal again

Browse Source 
Replace direct API access with dedicated service.
This commit is contained in:
Pavel Kirpichenkov
2020-07-29 15:46:47 +03:00
parent 9d6bdc6fc4
commit 1ff064d98d
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ResolutionAnchorAwareLibraryModificationTracker.kt
+5 -4
View File
@@ -7,14 +7,15 @@ package org.jetbrains.kotlin.idea.caches.project
import com.intellij.openapi.util.ModificationTracker import com.intellij.openapi.util.ModificationTracker
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionAnchorCacheService import org.jetbrains.kotlin.idea.caches.resolve.ResolutionAnchorCacheService
import org.jetbrains.kotlin.idea.caches.trackers.KotlinCodeBlockModificationListener import org.jetbrains.kotlin.idea.caches.trackers.ResolutionAnchorModificationCountService
class ResolutionAnchorAwareLibraryModificationTracker( class ResolutionAnchorAwareLibraryModificationTracker(
private val libraryInfo: LibraryInfo, private val libraryInfo: LibraryInfo,
) : ModificationTracker { ) : ModificationTracker {
override fun getModificationCount(): Long { override fun getModificationCount(): Long {
val anchorDependencies = ResolutionAnchorCacheService.getInstance(libraryInfo.project).getDependencyResolutionAnchors(libraryInfo) val anchorDependencyModules = ResolutionAnchorCacheService.getInstance(libraryInfo.project)
val updaterForModules = KotlinCodeBlockModificationListener.getInstance(libraryInfo.project).perModuleOutOfCodeBlockTrackerUpdater .getDependencyResolutionAnchors(libraryInfo)
return anchorDependencies.maxOfOrNull { updaterForModules.getModificationCount(it.module) } ?: 0 .map { it.module }
return ResolutionAnchorModificationCountService.getLatestModificationCount(anchorDependencyModules)
} }
} }
idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListenerCompat.kt
+1 -2
View File
@@ -50,8 +50,7 @@ abstract class KotlinCodeBlockModificationListenerCompat(protected val project:
lateinit var kotlinOutOfCodeBlockTracker: ModificationTracker lateinit var kotlinOutOfCodeBlockTracker: ModificationTracker
// TODO: close back exposed API internal val perModuleOutOfCodeBlockTrackerUpdater = KotlinModuleOutOfCodeBlockModificationTracker.Updater(project)
val perModuleOutOfCodeBlockTrackerUpdater = KotlinModuleOutOfCodeBlockModificationTracker.Updater(project)
protected fun init( protected fun init(
treeAspect: TreeAspect, treeAspect: TreeAspect,
idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinModuleOutOfCodeBlockModificationTracker.kt
+2 -4
View File
@@ -68,8 +68,7 @@ class KotlinModuleOutOfCodeBlockModificationTracker private constructor(private
} }
} }
// TODO: close back exposed API internal class Updater(project: Project) {
class Updater(project: Project) {
private val kotlinOfOfCodeBlockTracker by lazy { private val kotlinOfOfCodeBlockTracker by lazy {
KotlinCodeBlockModificationListener.getInstance(project).kotlinOutOfCodeBlockTracker KotlinCodeBlockModificationListener.getInstance(project).kotlinOutOfCodeBlockTracker
} }
@@ -84,8 +83,7 @@ class KotlinModuleOutOfCodeBlockModificationTracker private constructor(private
// perModuleModCount map // perModuleModCount map
private var perModuleChangesHighWatermark: Long? = null private var perModuleChangesHighWatermark: Long? = null
// TODO: close back exposed API internal fun getModificationCount(module: Module): Long {
fun getModificationCount(module: Module): Long {
return perModuleModCount[module] ?: perModuleChangesHighWatermark ?: kotlinOfOfCodeBlockTracker.modificationCount return perModuleModCount[module] ?: perModuleChangesHighWatermark ?: kotlinOfOfCodeBlockTracker.modificationCount
} }
idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/ResolutionAnchorModificationCountService.kt
+21
View File
@@ -0,0 +1,21 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.caches.trackers
import com.intellij.openapi.module.Module
import com.intellij.openapi.util.ModificationTracker
object ResolutionAnchorModificationCountService {
fun getLatestModificationCount(anchorModules: Collection<Module>): Long {
if (anchorModules.isEmpty())
return ModificationTracker.NEVER_CHANGED.modificationCount
val modificationCountUpdater =
KotlinCodeBlockModificationListener.getInstance(anchorModules.first().project).perModuleOutOfCodeBlockTrackerUpdater
return anchorModules.maxOfOrNull { modificationCountUpdater.getModificationCount(it) }
?: ModificationTracker.NEVER_CHANGED.modificationCount
}
}