From fb0d946e501ebf4dcc92bdacae84106be49cd26e Mon Sep 17 00:00:00 2001 From: Mark Punzalan Date: Thu, 19 Aug 2021 18:30:16 +0000 Subject: [PATCH] HL API: Make all symbol marker classes inherit from KtSymbol. --- .../frontend/api/symbols/markers/KtPossibleMemberSymbol.kt | 3 ++- .../idea/frontend/api/symbols/markers/KtSymbolWithModality.kt | 3 ++- .../frontend/api/symbols/markers/KtSymbolWithVisibility.kt | 3 ++- .../kotlin/idea/frontend/api/symbols/markers/markers.kt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtPossibleMemberSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtPossibleMemberSymbol.kt index 04263d64d2f..79769d1d85f 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtPossibleMemberSymbol.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtPossibleMemberSymbol.kt @@ -5,8 +5,9 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols.markers +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.frontend.api.types.KtType -public interface KtPossibleMemberSymbol { +public interface KtPossibleMemberSymbol : KtSymbol { public val dispatchType: KtType? } diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt index 9386da0d82b..995218ffc76 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithModality.kt @@ -6,7 +6,8 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols.markers import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -public interface KtSymbolWithModality { +public interface KtSymbolWithModality : KtSymbol { public val modality: Modality } diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt index 64e292c5704..5ccaa54a53d 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtSymbolWithVisibility.kt @@ -7,8 +7,9 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols.markers import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -public interface KtSymbolWithVisibility { +public interface KtSymbolWithVisibility : KtSymbol { public val visibility: Visibility } diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/markers.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/markers.kt index aeb06caf966..8a306723e88 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/markers.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/markers.kt @@ -18,6 +18,6 @@ public interface KtNamedSymbol : KtPossiblyNamedSymbol { override val name: Name } -public interface KtSymbolWithTypeParameters { +public interface KtSymbolWithTypeParameters : KtSymbol { public val typeParameters: List } \ No newline at end of file