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

[K1] Rename analysis flag expectActualLinker

Browse Source 
Rename analysis flag `expectActualLinker` to `skipExpectedActualDeclarationChecker`
to better reflect its semantics. This flag isn't used on IDE plugin side, so no
additional changes in `intellij` repo are needed.

^KT-61136
This commit is contained in:
Dmitriy Dolovov
2023-09-13 18:24:41 +02:00
committed by Space Team
parent 1af7649ee9
commit 98b3bdb175
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
+1 -1
View File
@@ -807,7 +807,7 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
) )
} }
put(AnalysisFlags.optIn, useExperimentalFqNames + optIn?.toList().orEmpty()) put(AnalysisFlags.optIn, useExperimentalFqNames + optIn?.toList().orEmpty())
put(AnalysisFlags.expectActualLinker, expectActualLinker) put(AnalysisFlags.skipExpectedActualDeclarationChecker, expectActualLinker)
put(AnalysisFlags.explicitApiVersion, apiVersion != null) put(AnalysisFlags.explicitApiVersion, apiVersion != null)
put(AnalysisFlags.allowResultReturnType, allowResultReturnType) put(AnalysisFlags.allowResultReturnType, allowResultReturnType)
ExplicitApiMode.fromString(explicitApi)?.also { put(AnalysisFlags.explicitApiMode, it) } ?: collector.report( ExplicitApiMode.fromString(explicitApi)?.also { put(AnalysisFlags.explicitApiMode, it) } ?: collector.report(
compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt
+1 -1
View File
@@ -19,7 +19,7 @@ object AnalysisFlags {
val multiPlatformDoNotCheckActual by AnalysisFlag.Delegates.Boolean val multiPlatformDoNotCheckActual by AnalysisFlag.Delegates.Boolean
@JvmStatic @JvmStatic
val expectActualLinker by AnalysisFlag.Delegates.Boolean val skipExpectedActualDeclarationChecker by AnalysisFlag.Delegates.Boolean
@JvmStatic @JvmStatic
val optIn by AnalysisFlag.Delegates.ListOfStrings val optIn by AnalysisFlag.Delegates.ListOfStrings
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt
+1 -1
View File
@@ -55,7 +55,7 @@ class ExpectedActualDeclarationChecker(
override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) { override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) {
if (!context.languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects)) return if (!context.languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects)) return
// TODO: we need a klib based MPP aware ModuleStructureOracle. Just disable the checks for now. // TODO: we need a klib based MPP aware ModuleStructureOracle. Just disable the checks for now.
if (context.languageVersionSettings.getFlag(AnalysisFlags.expectActualLinker)) return if (context.languageVersionSettings.getFlag(AnalysisFlags.skipExpectedActualDeclarationChecker)) return
// Note that this check is necessary, because for default accessors KtProperty is passed for KtDeclaration, so this // Note that this check is necessary, because for default accessors KtProperty is passed for KtDeclaration, so this
// case won't be covered by the next check (also, it accidentally fixes KT-28385) // case won't be covered by the next check (also, it accidentally fixes KT-28385)