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

Minor: drop unnecessary wrapper for utility function

Browse Source 
^KT-39734
This commit is contained in:
Pavel Kirpichenkov
2020-08-01 12:29:44 +03:00
parent 1ff064d98d
commit 54811613f4
3 changed files with 21 additions and 23 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
+2 -2
View File
@@ -7,7 +7,7 @@ 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.ResolutionAnchorModificationCountService import org.jetbrains.kotlin.idea.caches.trackers.getLatestModificationCount
class ResolutionAnchorAwareLibraryModificationTracker( class ResolutionAnchorAwareLibraryModificationTracker(
private val libraryInfo: LibraryInfo, private val libraryInfo: LibraryInfo,
@@ -16,6 +16,6 @@ class ResolutionAnchorAwareLibraryModificationTracker(
val anchorDependencyModules = ResolutionAnchorCacheService.getInstance(libraryInfo.project) val anchorDependencyModules = ResolutionAnchorCacheService.getInstance(libraryInfo.project)
.getDependencyResolutionAnchors(libraryInfo) .getDependencyResolutionAnchors(libraryInfo)
.map { it.module } .map { it.module }
return ResolutionAnchorModificationCountService.getLatestModificationCount(anchorDependencyModules) return getLatestModificationCount(anchorDependencyModules)
} }
} }
idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/ResolutionAnchorModificationCountService.kt
-21
View File
@@ -1,21 +0,0 @@
/*
* 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
}
}
idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/caches/trackers/modificationTrackerUtil.kt
+19
View File
@@ -0,0 +1,19 @@
/*
* 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
fun getLatestModificationCount(modules: Collection<Module>): Long {
if (modules.isEmpty())
return ModificationTracker.NEVER_CHANGED.modificationCount
val modificationCountUpdater =
KotlinCodeBlockModificationListener.getInstance(modules.first().project).perModuleOutOfCodeBlockTrackerUpdater
return modules.maxOfOrNull { modificationCountUpdater.getModificationCount(it) }
?: ModificationTracker.NEVER_CHANGED.modificationCount
}