azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

201: Change of ProblemDescriptorBase.getFixes() return type

Browse Source 
https://github.com/JetBrains/intellij-community/commit/15a39d5742161a79d9169c871a8b74d5272bc0db
This commit is contained in:
Nikolay Krasko
2020-01-28 21:55:25 +03:00
committed by Nikolay Krasko
parent 8cb4a8f5c6
commit 7a89bd9c90
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
+18 -15
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.idea.maven 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.ProblemDescriptorBase
import com.intellij.codeInspection.QuickFix import com.intellij.codeInspection.QuickFix
import com.intellij.ide.highlighter.JavaFileType import com.intellij.ide.highlighter.JavaFileType
@@ -119,7 +119,7 @@ abstract class AbstractKotlinMavenInspectionTest : MavenImportingTestCase() {
val (problem, quickfix) = suggestedFix val (problem, quickfix) = suggestedFix
val file = rangesToFixFiles.entries.first { (_, range) -> index + 1 in range }.key val file = rangesToFixFiles.entries.first { (_, range) -> index + 1 in range }.key
quickfix.applyFix(problem) applyFix(quickfix, problem)
KotlinTestUtils.assertEqualsToFile(file, document.text.trim()) KotlinTestUtils.assertEqualsToFile(file, document.text.trim())
@@ -147,21 +147,24 @@ abstract class AbstractKotlinMavenInspectionTest : MavenImportingTestCase() {
} }
} }
private fun QuickFix<CommonProblemDescriptor>.applyFix(desc: ProblemDescriptorBase) { private fun <D: ProblemDescriptor> applyFix(quickFix: QuickFix<in D>, desc: D) {
CommandProcessor.getInstance().executeCommand(myProject, { CommandProcessor.getInstance().executeCommand(
ApplicationManager.getApplication().runWriteAction { myProject,
applyFix(myProject, desc) {
ApplicationManager.getApplication().runWriteAction {
quickFix.applyFix(myProject, desc)
val manager = PsiDocumentManager.getInstance(myProject) val manager = PsiDocumentManager.getInstance(myProject)
val document = manager.getDocument(PsiManager.getInstance(myProject).findFile(myProjectPom)!!)!! val document = manager.getDocument(PsiManager.getInstance(myProject).findFile(myProjectPom)!!)!!
manager.doPostponedOperationsAndUnblockDocument(document) manager.doPostponedOperationsAndUnblockDocument(document)
manager.commitDocument(document) manager.commitDocument(document)
FileDocumentManager.getInstance().saveDocument(document) FileDocumentManager.getInstance().saveDocument(document)
}
} println(myProjectPom.contentsToByteArray().toString(Charsets.UTF_8))
},
println(myProjectPom.contentsToByteArray().toString(Charsets.UTF_8)) "quick-fix-$name", "Kotlin",
}, "quick-fix-$name", "Kotlin") )
} }
private fun mkJavaFile() { private fun mkJavaFile() {