From 48deab1129e5010821e40a21302eaa63026aea33 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Wed, 27 Sep 2023 09:23:41 +0200 Subject: [PATCH] Prepare for 2023.3: Use var to handle return type differences (#5391) In 2023.2, kotlinFacet.getConfiguration().getSettings() returns KotlinFacetSetttings, while in 2023.3 it's IKotlinFacetSettings https://github.com/JetBrains/intellij-community/commit/f0094db89cfcafd03584cb4f78752dc13103cacb --- .../google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java b/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java index b91901aef34..3af9e772ac0 100644 --- a/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java +++ b/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java @@ -58,7 +58,6 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.kotlin.config.CompilerSettings; -import org.jetbrains.kotlin.config.KotlinFacetSettings; import org.jetbrains.kotlin.config.LanguageVersion; import org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder; import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCommonCompilerArgumentsHolder; @@ -246,7 +245,7 @@ public void updateProjectStructure( * @param newPluginOptions new plugin options to be updated to KotlinFacet settings */ private static void updatePluginOptions(KotlinFacet kotlinFacet, List newPluginOptions) { - KotlinFacetSettings facetSettings = kotlinFacet.getConfiguration().getSettings(); + var facetSettings = kotlinFacet.getConfiguration().getSettings(); // TODO: Unify this part with {@link // org.jetbrains.kotlin.android.sync.ng.KotlinSyncModels#setupKotlinAndroidExtensionAsFacetPluginOptions}? CommonCompilerArguments commonArguments = facetSettings.getCompilerArguments();