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

[FIR] Add EXPECT_ACTUAL_MODIFIER positioning strategy

Browse Source
This commit is contained in:
Ivan Kochurkin
2023-05-10 23:39:46 +02:00
committed by Space Team
parent d8ed7a2820
commit 16ed06d4e9
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt
+3
View File
@@ -458,6 +458,9 @@ object LightTreePositioningStrategies {
val EXTERNAL_MODIFIER: LightTreePositioningStrategy =
ModifierSetBasedLightTreePositioningStrategy(KtTokens.EXTERNAL_KEYWORD)
val EXPECT_ACTUAL_MODIFIER: LightTreePositioningStrategy =
ModifierSetBasedLightTreePositioningStrategy(KtTokens.EXPECT_KEYWORD, KtTokens.ACTUAL_KEYWORD)
val OBJECT_KEYWORD: LightTreePositioningStrategy = keywordStrategy { objectKeyword(it) }
val FIELD_KEYWORD: LightTreePositioningStrategy = keywordStrategy { fieldKeyword(it) }
compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+4
View File
@@ -313,6 +313,10 @@ object PositioningStrategies {
val EXTERNAL_MODIFIER: PositioningStrategy<KtModifierListOwner> =
ModifierSetBasedPositioningStrategy(KtTokens.EXTERNAL_KEYWORD)
@JvmField
val EXPECT_ACTUAL_MODIFIER: PositioningStrategy<KtModifierListOwner> =
ModifierSetBasedPositioningStrategy(KtTokens.EXPECT_KEYWORD, KtTokens.ACTUAL_KEYWORD)
@JvmField
val OBJECT_KEYWORD: PositioningStrategy<KtObjectDeclaration> = object : PositioningStrategy<KtObjectDeclaration>() {
override fun mark(element: KtObjectDeclaration): List<TextRange> {
compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/SourceElementPositioningStrategies.kt
+5
View File
@@ -123,6 +123,11 @@ object SourceElementPositioningStrategies {
PositioningStrategies.DATA_MODIFIER
)
val EXPECT_ACTUAL_MODIFIER = SourceElementPositioningStrategy(
LightTreePositioningStrategies.EXPECT_ACTUAL_MODIFIER,
PositioningStrategies.EXPECT_ACTUAL_MODIFIER
)
val OBJECT_KEYWORD = SourceElementPositioningStrategy(
LightTreePositioningStrategies.OBJECT_KEYWORD,
PositioningStrategies.OBJECT_KEYWORD