[FIR] Throws by star import wins builtin Throws, ^KT-52407 Fixed, ^KT-52517 Fixed

2022-05-24 21:46:37 +03:00
parent 5fdf365ac4
commit 792aa24a04
9 changed files with 71 additions and 3 deletions
@@ -16,7 +16,7 @@ enum class DefaultImportPriority {
            languageVersionSettings: LanguageVersionSettings
        ): List<ImportPath>? =
            platformDependentAnalyzerServices?.getDefaultImports(languageVersionSettings, includeLowPriorityImports = false)?.let {
-                it + ImportPath.fromString("kotlin.Throws")
+                it
            }
    },
    LOW {
@@ -25,6 +25,14 @@ enum class DefaultImportPriority {
            languageVersionSettings: LanguageVersionSettings
        ): List<ImportPath>? =
            platformDependentAnalyzerServices?.defaultLowPriorityImports
+    },
+    KOTLIN_THROWS {
+        override fun getAllDefaultImports(
+            platformDependentAnalyzerServices: PlatformDependentAnalyzerServices?,
+            languageVersionSettings: LanguageVersionSettings
+        ): List<ImportPath> {
+            return listOf(ImportPath.fromString("kotlin.Throws"))
+        }
    };

    abstract fun getAllDefaultImports(