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

FIR IDE: rename Invalidatable -> ValidityOwner

Browse Source
This commit is contained in:
Ilya Kirillov
2020-06-27 00:20:04 +03:00
parent 226d514788
commit a26063b3f8
22 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSession.kt
+1 -1
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.*
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.*
abstract class KtAnalysisSession(project: Project) : Invalidatable {
abstract class KtAnalysisSession(project: Project) : ValidityOwner {
protected open val validityToken = ReadActionConfinementValidityToken(project)
override fun isValid(): Boolean = validityToken.isValid()
override fun invalidationReason(): String = validityToken.invalidationReason()
idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/KtType.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtTypeParameterSymbol
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name
interface KtType : Invalidatable {
interface KtType : ValidityOwner {
fun isEqualTo(other: KtType): Boolean
fun isSubTypeOf(superType: KtType): Boolean
idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/Invalidatable.kt → idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityOwner.kt
+6 -6
View File
@@ -9,29 +9,29 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
interface Invalidatable {
interface ValidityOwner {
fun isValid(): Boolean
fun invalidationReason(): String
}
@Suppress("NOTHING_TO_INLINE")
inline fun Invalidatable.assertIsValid() {
inline fun ValidityOwner.assertIsValid() {
assert(isValid()) { "Access to invalid $this, invalidation reason is ${invalidationReason()}" }
}
inline fun <R> Invalidatable.withValidityAssertion(action: () -> R): R {
inline fun <R> ValidityOwner.withValidityAssertion(action: () -> R): R {
assertIsValid()
return action()
}
interface InvalidatableByValidityToken : Invalidatable {
val token: Invalidatable
interface ValidityOwnerByValidityToken : ValidityOwner {
val token: ValidityOwner
override fun isValid(): Boolean = token.isValid()
override fun invalidationReason(): String = token.invalidationReason()
}
class ReadActionConfinementValidityToken(project: Project) : Invalidatable {
class ReadActionConfinementValidityToken(project: Project) : ValidityOwner {
private val modificationTracker = KotlinModificationTrackerService.getInstance(project).modificationTracker
private val ownerThread = Thread.currentThread()
private val onCreatedTimeStamp = modificationTracker.modificationCount
idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbol.kt
+2 -2
View File
@@ -6,9 +6,9 @@
package org.jetbrains.kotlin.idea.frontend.api.symbols
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.idea.frontend.api.Invalidatable
import org.jetbrains.kotlin.idea.frontend.api.ValidityOwner
interface KtSymbol : Invalidatable {
interface KtSymbol : ValidityOwner {
val origin: KtSymbolOrigin
val psi: PsiElement?
}
idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtSymbolProvider.kt
+2 -2
View File
@@ -5,11 +5,11 @@
package org.jetbrains.kotlin.idea.frontend.api.symbols
import org.jetbrains.kotlin.idea.frontend.api.Invalidatable
import org.jetbrains.kotlin.idea.frontend.api.ValidityOwner
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.*
abstract class KtSymbolProvider : Invalidatable {
abstract class KtSymbolProvider : ValidityOwner {
open fun getSymbol(psi: KtDeclaration): KtSymbol = when (psi) {
is KtParameter -> getParameterSymbol(psi)
is KtNamedFunction -> getFunctionSymbol(psi)