From a9329c5284f47b4fd03e7c922d3f4a9a87947192 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 24 May 2019 18:12:26 +0300 Subject: [PATCH] Minor refactoring in ModuleData tracker --- .../src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index 3f134d98b15..c6324c7dc37 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -105,12 +105,13 @@ class ResolverForProjectImpl( private class ModuleData( val moduleDescriptor: ModuleDescriptorImpl, - val modificationTracker: ModificationTracker?, - val modificationCount: Long? + val modificationTracker: ModificationTracker? ) { + val modificationCount: Long = modificationTracker?.modificationCount ?: Long.MIN_VALUE + fun isOutOfDate(): Boolean { val currentModCount = modificationTracker?.modificationCount - return currentModCount != null && currentModCount > modificationCount!! + return currentModCount != null && currentModCount > modificationCount } } @@ -263,7 +264,7 @@ class ResolverForProjectImpl( setupModuleDescriptor(module, moduleDescriptor) val modificationTracker = (module as? TrackableModuleInfo)?.createModificationTracker() ?: (PsiModificationTracker.SERVICE.getInstance(projectContext.project).outOfCodeBlockModificationTracker.takeIf { invalidateOnOOCB }) - return ModuleData(moduleDescriptor, modificationTracker, modificationTracker?.modificationCount) + return ModuleData(moduleDescriptor, modificationTracker) } }