From 606dc2f723970eb58f0539b3d1bc548baac448d6 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 3 Aug 2020 15:48:40 +0300
Subject: [PATCH] Fix binary compatibility problems in ImportInsertHelper &
 ShortenReferences

---
 .../jetbrains/kotlin/idea/util/ImportInsertHelper.kt | 12 ++++++++++++
 .../jetbrains/kotlin/idea/core/ShortenReferences.kt  |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
index 95ba30b4504..4eb2ef4a196 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
@@ -29,6 +29,18 @@ abstract class ImportInsertHelper {
         forceAllUnderImport: Boolean = false
     ): ImportDescriptorResult
 
+    fun importDescriptor(
+        file: KtFile,
+        descriptor: DeclarationDescriptor,
+        forceAllUnderImport: Boolean = false
+    ): ImportDescriptorResult = importDescriptor(
+        file,
+        descriptor,
+        ActionRunningMode.RUN_IN_CURRENT_THREAD,
+        forceAllUnderImport
+    )
+
+
     companion object {
         @JvmStatic
         fun getInstance(project: Project): ImportInsertHelper =
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
index 0298809f001..9fc6a07ed6f 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
@@ -95,7 +95,6 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
         }
     }
 
-    @JvmOverloads
     fun process(
         element: KtElement,
         elementFilter: (PsiElement) -> FilterResult = { FilterResult.PROCESS },
@@ -104,6 +103,14 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
         return process(listOf(element), elementFilter, actionRunningMode).single()
     }
 
+    @JvmOverloads
+    fun process(
+        element: KtElement,
+        elementFilter: (PsiElement) -> FilterResult = { FilterResult.PROCESS },
+    ): KtElement {
+        return process(element, elementFilter, ActionRunningMode.RUN_IN_CURRENT_THREAD)
+    }
+
     @JvmOverloads
     fun process(
         file: KtFile,