From 810d62bbaf2ff7c8afa4b3081ec842c939563da5 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 14 Sep 2017 18:03:50 +0300 Subject: [PATCH] Add expect & actual to MODIFIERS_TO_REPLACE table --- .../src/org/jetbrains/kotlin/psi/addRemoveModifier.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt index cbec032d2da..c62c72cfc06 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt @@ -129,8 +129,10 @@ private val MODIFIERS_TO_REPLACE = mapOf( PROTECTED_KEYWORD to listOf(PUBLIC_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD), PRIVATE_KEYWORD to listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, INTERNAL_KEYWORD), INTERNAL_KEYWORD to listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD), - HEADER_KEYWORD to listOf(IMPL_KEYWORD), - IMPL_KEYWORD to listOf(HEADER_KEYWORD) + HEADER_KEYWORD to listOf(IMPL_KEYWORD, ACTUAL_KEYWORD), + IMPL_KEYWORD to listOf(HEADER_KEYWORD, EXPECT_KEYWORD), + EXPECT_KEYWORD to listOf(IMPL_KEYWORD, ACTUAL_KEYWORD), + ACTUAL_KEYWORD to listOf(HEADER_KEYWORD, EXPECT_KEYWORD) ) private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD,