Skip to content

Commit

Permalink
Prepare for 2023.3: Use var to handle return type differences (#5391)
Browse files Browse the repository at this point in the history
In 2023.2, kotlinFacet.getConfiguration().getSettings() returns
KotlinFacetSetttings, while in 2023.3 it's IKotlinFacetSettings

JetBrains/intellij-community@f0094db
  • Loading branch information
tpasternak authored Sep 27, 2023
1 parent c757ab4 commit 48deab1
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<String> 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();
Expand Down

0 comments on commit 48deab1

Please sign in to comment.