From bca3e1b95bb12586a6d2d997474bb599b777f0a5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 17 Jul 2018 12:48:43 +0200 Subject: [PATCH] Restore getDefaultImports for compatibility with an external plugin (see ce34deb9afad574fb118366629cbee26a200ed40) --- .../org/jetbrains/kotlin/resolve/TargetPlatform.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt index b0168da52d8..00a61c47b97 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt @@ -6,8 +6,7 @@ package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.builtins.PlatformToKotlinClassMap -import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.config.LanguageVersionSettings +import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.container.StorageComponentContainer import org.jetbrains.kotlin.container.composeContainer import org.jetbrains.kotlin.container.useInstance @@ -72,6 +71,17 @@ abstract class TargetPlatform(val platformName: String) { abstract val multiTargetPlatform: MultiTargetPlatform + // This function is used in "cat.helm.clean:0.1.1-SNAPSHOT": https://plugins.jetbrains.com/plugin/index?xmlId=cat.helm.clean + @Suppress("DeprecatedCallableAddReplaceWith") + @Deprecated("Use getDefaultImports(LanguageVersionSettings, Boolean) instead.", level = DeprecationLevel.ERROR) + fun getDefaultImports(includeKotlinComparisons: Boolean): List { + return getDefaultImports( + if (includeKotlinComparisons) LanguageVersionSettingsImpl.DEFAULT + else LanguageVersionSettingsImpl(LanguageVersion.KOTLIN_1_0, ApiVersion.KOTLIN_1_0), + true + ) + } + object Common : TargetPlatform("Default") { override fun computePlatformSpecificDefaultImports(storageManager: StorageManager, result: MutableList) {}