From f310bd3324f6fbf9d4472c11d9a683a59b6795da Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Wed, 10 Jul 2019 16:41:06 +0300
Subject: [PATCH] RemoveRedundantQualifierNameInspection: apply on idea module

---
 .../idea/decompiler/navigation/SourceNavigationHelper.kt      | 4 ++--
 .../idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.kt
index f5cc71c17d7..37898924850 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.kt
@@ -269,8 +269,8 @@ object SourceNavigationHelper {
         if (DumbService.isDumb(from.project)) return from
 
         when (navigationKind) {
-            SourceNavigationHelper.NavigationKind.CLASS_FILES_TO_SOURCES -> if (!from.containingKtFile.isCompiled) return from
-            SourceNavigationHelper.NavigationKind.SOURCES_TO_CLASS_FILES -> {
+            NavigationKind.CLASS_FILES_TO_SOURCES -> if (!from.containingKtFile.isCompiled) return from
+            NavigationKind.SOURCES_TO_CLASS_FILES -> {
                 val file = from.containingFile
                 if (file is KtFile && file.isCompiled) return from
                 if (!ProjectRootsUtil.isInContent(
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
index 46e499e3278..e0d72049fa9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
@@ -242,7 +242,7 @@ internal fun ElementAndTextList.convertCodeToKotlin(project: Project, targetModu
     val inputElements = this.toList().filterIsInstance<PsiElement>()
     val (results, _, converterContext) =
             ProgressManager.getInstance().runProcessWithProgressSynchronously(
-                    ThrowableComputable<org.jetbrains.kotlin.j2k.Result, Exception> {
+                    ThrowableComputable<Result, Exception> {
                         runReadAction { converter.elementsToKotlin(inputElements) }
                     },
                     JavaToKotlinAction.title,