Skip to content

Commit 9118eff

Browse files
dimonchik0036Space Team
authored andcommitted
[psi] api: replace @IntellijInternalApi with @KtImplementationDetail
`@IntellijInternalApi` was used as a workaround before `@KtImplementationDetail` ^KT-78613
1 parent 1428c57 commit 9118eff

File tree

5 files changed

+9
-20
lines changed

5 files changed

+9
-20
lines changed

analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/clsStubBuilding.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package org.jetbrains.kotlin.analysis.decompiler.stub
77

8-
import com.intellij.openapi.util.IntellijInternalApi
98
import com.intellij.psi.PsiElement
109
import com.intellij.psi.stubs.StubElement
1110
import com.intellij.util.io.StringRef
@@ -211,7 +210,7 @@ fun createModifierListStub(
211210

212211
val regularMask = ModifierMaskUtils.computeMask { it in modifiers }
213212

214-
@OptIn(IntellijInternalApi::class)
213+
@OptIn(KtImplementationDetail::class)
215214
val specialMask = ModifierMaskUtils.computeMaskForSpecialFlags { flag ->
216215
when (flag) {
217216
KotlinModifierListStub.SpecialFlag.MustUseReturnValue -> mustUseReturnValue

analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirMemberDeserializer.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package org.jetbrains.kotlin.analysis.low.level.api.fir.stubBased.deserialization
77

8-
import com.intellij.openapi.util.IntellijInternalApi
98
import org.jetbrains.kotlin.*
109
import org.jetbrains.kotlin.descriptors.EffectiveVisibility
1110
import org.jetbrains.kotlin.descriptors.Modality
@@ -671,7 +670,7 @@ internal class StubBasedFirMemberDeserializer(
671670
}
672671
}
673672

674-
@OptIn(IntellijInternalApi::class)
673+
@OptIn(KtImplementationDetail::class)
675674
private fun FirDeclarationStatusImpl.setSpecialFlags(modifierList: KtModifierList?) {
676675
if (modifierList == null) return
677676
val modifierListStub = modifierList.greenStub ?: loadStubByElement(modifierList) ?: return

compiler/psi/psi-api/api/psi-api.api

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4050,14 +4050,6 @@ public abstract interface class org/jetbrains/kotlin/psi/stubs/KotlinImportDirec
40504050

40514051
public abstract interface class org/jetbrains/kotlin/psi/stubs/KotlinModifierListStub : com/intellij/psi/stubs/StubElement {
40524052
public abstract fun hasModifier (Lorg/jetbrains/kotlin/lexer/KtModifierKeywordToken;)Z
4053-
public abstract fun hasSpecialFlag (Lorg/jetbrains/kotlin/psi/stubs/KotlinModifierListStub$SpecialFlag;)Z
4054-
}
4055-
4056-
public final class org/jetbrains/kotlin/psi/stubs/KotlinModifierListStub$SpecialFlag : java/lang/Enum {
4057-
public static final field MustUseReturnValue Lorg/jetbrains/kotlin/psi/stubs/KotlinModifierListStub$SpecialFlag;
4058-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
4059-
public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/psi/stubs/KotlinModifierListStub$SpecialFlag;
4060-
public static fun values ()[Lorg/jetbrains/kotlin/psi/stubs/KotlinModifierListStub$SpecialFlag;
40614053
}
40624054

40634055
public abstract interface class org/jetbrains/kotlin/psi/stubs/KotlinNameReferenceExpressionStub : com/intellij/psi/stubs/StubElement {

compiler/psi/psi-api/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package org.jetbrains.kotlin.psi.stubs
77

8-
import com.intellij.openapi.util.IntellijInternalApi
98
import com.intellij.psi.PsiNamedElement
109
import com.intellij.psi.stubs.NamedStub
1110
import com.intellij.psi.stubs.PsiFileStub
@@ -106,11 +105,11 @@ interface KotlinModifierListStub : StubElement<KtDeclarationModifierList> {
106105
/**
107106
* Whether the modifier list has a [SpecialFlag].
108107
*/
109-
@IntellijInternalApi
108+
@KtImplementationDetail
110109
fun hasSpecialFlag(flag: SpecialFlag): Boolean
111110

112111
/** Represents special flags that are common for many declarations */
113-
@IntellijInternalApi
112+
@KtImplementationDetail
114113
enum class SpecialFlag {
115114
/**
116115
* Whether the return type of the modifier list owner must be checked.

compiler/psi/psi-impl/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
package org.jetbrains.kotlin.psi.stubs.impl
77

8-
import com.intellij.openapi.util.IntellijInternalApi
98
import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
109
import org.jetbrains.kotlin.lexer.KtTokens.MODIFIER_KEYWORDS_ARRAY
10+
import org.jetbrains.kotlin.psi.KtImplementationDetail
1111
import org.jetbrains.kotlin.psi.KtModifierList
1212
import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub
1313

1414
object ModifierMaskUtils {
1515
init {
16-
@OptIn(IntellijInternalApi::class)
16+
@OptIn(KtImplementationDetail::class)
1717
assert(MODIFIER_KEYWORDS_ARRAY.size + KotlinModifierListStub.SpecialFlag.entries.size <= 64) {
1818
"Current implementation depends on the ability to represent modifier list as bit mask"
1919
}
@@ -34,7 +34,7 @@ object ModifierMaskUtils {
3434
return mask
3535
}
3636

37-
@IntellijInternalApi
37+
@KtImplementationDetail
3838
fun computeMaskForSpecialFlags(hasModifier: (KotlinModifierListStub.SpecialFlag) -> Boolean): Long {
3939
val specialFlagOffset = MODIFIER_KEYWORDS_ARRAY.size
4040
var mask = 0L
@@ -55,7 +55,7 @@ object ModifierMaskUtils {
5555
}
5656

5757
@JvmStatic
58-
@IntellijInternalApi
58+
@KtImplementationDetail
5959
fun maskHasSpecialFlag(mask: Long, flag: KotlinModifierListStub.SpecialFlag): Boolean {
6060
val specialFlagOffset = MODIFIER_KEYWORDS_ARRAY.size
6161
return maskHas(mask, specialFlagOffset + flag.ordinal)
@@ -84,7 +84,7 @@ object ModifierMaskUtils {
8484
}
8585
}
8686

87-
@OptIn(IntellijInternalApi::class)
87+
@OptIn(KtImplementationDetail::class)
8888
for (specialFlag in KotlinModifierListStub.SpecialFlag.entries) {
8989
if (maskHasSpecialFlag(mask, specialFlag)) {
9090
renderFlag(specialFlag.name)

0 commit comments

Comments
 (0)