From eaa28fd4edefc7b4b49f3608bf636aaf3de8d6ab Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Thu, 22 Aug 2019 19:39:23 +0700
Subject: [PATCH] CreateExpect: fix build for a33

---
 .../idea/quickfix/expectactual/CreateExpectedFix.kt    |  6 ++----
 .../kotlin/idea/quickfix/expectactual/escapeXML.kt     | 10 ++++++++++
 .../kotlin/idea/quickfix/expectactual/escapeXML.kt.182 | 10 ++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt.182

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
index bf8392a6f6f..39f88031e7a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
@@ -12,7 +12,6 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.showOkNoDialog
-import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -40,7 +39,6 @@ import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
 import org.jetbrains.kotlin.psi.psiUtil.getSuperNames
 import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-import java.util.*
 
 sealed class CreateExpectedFix<D : KtNamedDeclaration>(
     declaration: D,
@@ -177,7 +175,7 @@ private tailrec fun TypeAccessibilityChecker.findAndApplyExistingClasses(element
 
 private fun showUnknownTypesDialog(project: Project, declarationsWithNonExistentClasses: Collection<KtNamedDeclaration>): Boolean {
     if (declarationsWithNonExistentClasses.isEmpty()) return true
-    val message = StringUtil.escapeXmlEntities(
+    val message = escapeXml(
         declarationsWithNonExistentClasses.joinToString(
             prefix = "These declarations cannot be transformed:\n",
             separator = "\n",
@@ -198,7 +196,7 @@ private fun showUnknownTypesError(element: KtNamedDeclaration) {
         showErrorHint(
             element.project,
             editor,
-            "You cannot create the expect declaration from:\n${StringUtil.escapeXmlEntities(getExpressionShortText(element))}",
+            "You cannot create the expect declaration from:\n${escapeXml(getExpressionShortText(element))}",
             "Unknown types"
         )
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt
new file mode 100644
index 00000000000..31257ed0fc4
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.quickfix.expectactual
+
+import com.intellij.openapi.util.text.StringUtil
+
+fun escapeXml(text: String): String = StringUtil.escapeXmlEntities(text)
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt.182 b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt.182
new file mode 100644
index 00000000000..aaba5c50915
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/escapeXML.kt.182
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.quickfix.expectactual
+
+import com.intellij.openapi.util.text.StringUtil
+
+fun escapeXml(text: String): String = StringUtil.escapeXml(text)
\ No newline at end of file