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

Minor refactoring in ModuleData tracker

Browse Source
This commit is contained in:
Nikolay Krasko
2019-05-24 18:12:26 +03:00
parent e72388895b
commit a9329c5284
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+5 -4
View File
@@ -105,12 +105,13 @@ class ResolverForProjectImpl<M : ModuleInfo>(
private class ModuleData( private class ModuleData(
val moduleDescriptor: ModuleDescriptorImpl, val moduleDescriptor: ModuleDescriptorImpl,
val modificationTracker: ModificationTracker?, val modificationTracker: ModificationTracker?
val modificationCount: Long?
) { ) {
val modificationCount: Long = modificationTracker?.modificationCount ?: Long.MIN_VALUE
fun isOutOfDate(): Boolean { fun isOutOfDate(): Boolean {
val currentModCount = modificationTracker?.modificationCount val currentModCount = modificationTracker?.modificationCount
return currentModCount != null && currentModCount > modificationCount!! return currentModCount != null && currentModCount > modificationCount
} }
} }
@@ -263,7 +264,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
setupModuleDescriptor(module, moduleDescriptor) setupModuleDescriptor(module, moduleDescriptor)
val modificationTracker = (module as? TrackableModuleInfo)?.createModificationTracker() val modificationTracker = (module as? TrackableModuleInfo)?.createModificationTracker()
?: (PsiModificationTracker.SERVICE.getInstance(projectContext.project).outOfCodeBlockModificationTracker.takeIf { invalidateOnOOCB }) ?: (PsiModificationTracker.SERVICE.getInstance(projectContext.project).outOfCodeBlockModificationTracker.takeIf { invalidateOnOOCB })
return ModuleData(moduleDescriptor, modificationTracker, modificationTracker?.modificationCount) return ModuleData(moduleDescriptor, modificationTracker)
} }
} }