From 7a89bd9c905f7de4d38997c4d77e2a6778c5efe3 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <goodwinnk@gmail.com>
Date: Tue, 28 Jan 2020 21:55:25 +0300
Subject: [PATCH] 201: Change of ProblemDescriptorBase.getFixes() return type

https://github.com/JetBrains/intellij-community/commit/15a39d5742161a79d9169c871a8b74d5272bc0db
---
 .../AbstractKotlinMavenInspectionTest.kt      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
index 3f53555dba2..e1607012a8c 100644
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.idea.maven
 
-import com.intellij.codeInspection.CommonProblemDescriptor
+import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.codeInspection.ProblemDescriptorBase
 import com.intellij.codeInspection.QuickFix
 import com.intellij.ide.highlighter.JavaFileType
@@ -119,7 +119,7 @@ abstract class AbstractKotlinMavenInspectionTest : MavenImportingTestCase() {
             val (problem, quickfix) = suggestedFix
             val file = rangesToFixFiles.entries.first { (_, range) -> index + 1 in range }.key
 
-            quickfix.applyFix(problem)
+            applyFix(quickfix, problem)
 
             KotlinTestUtils.assertEqualsToFile(file, document.text.trim())
 
@@ -147,21 +147,24 @@ abstract class AbstractKotlinMavenInspectionTest : MavenImportingTestCase() {
         }
     }
 
-    private fun QuickFix<CommonProblemDescriptor>.applyFix(desc: ProblemDescriptorBase) {
-        CommandProcessor.getInstance().executeCommand(myProject, {
-            ApplicationManager.getApplication().runWriteAction {
-                applyFix(myProject, desc)
+    private fun <D: ProblemDescriptor> applyFix(quickFix: QuickFix<in D>, desc: D) {
+        CommandProcessor.getInstance().executeCommand(
+            myProject,
+            {
+                ApplicationManager.getApplication().runWriteAction {
+                    quickFix.applyFix(myProject, desc)
 
-                val manager = PsiDocumentManager.getInstance(myProject)
-                val document = manager.getDocument(PsiManager.getInstance(myProject).findFile(myProjectPom)!!)!!
-                manager.doPostponedOperationsAndUnblockDocument(document)
-                manager.commitDocument(document)
-                FileDocumentManager.getInstance().saveDocument(document)
+                    val manager = PsiDocumentManager.getInstance(myProject)
+                    val document = manager.getDocument(PsiManager.getInstance(myProject).findFile(myProjectPom)!!)!!
+                    manager.doPostponedOperationsAndUnblockDocument(document)
+                    manager.commitDocument(document)
+                    FileDocumentManager.getInstance().saveDocument(document)
+                }
 
-            }
-
-            println(myProjectPom.contentsToByteArray().toString(Charsets.UTF_8))
-        }, "quick-fix-$name", "Kotlin")
+                println(myProjectPom.contentsToByteArray().toString(Charsets.UTF_8))
+            },
+            "quick-fix-$name", "Kotlin",
+        )
     }
 
     private fun mkJavaFile() {