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

Remove usage of HighlightingSession.getEditor()

Browse Source 
It's going to be deleted in IDEA.
This commit is contained in:
Nikolay Krasko
2017-06-23 21:23:33 +03:00
parent 0c8ca5f930
commit 73c37ecd25
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt
+9 -11
View File
@@ -39,8 +39,8 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.Disposer
import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiUtilBase
import com.intellij.util.DocumentUtil import com.intellij.util.DocumentUtil
import com.intellij.util.Processor
import org.jetbrains.kotlin.idea.core.targetDescriptors import org.jetbrains.kotlin.idea.core.targetDescriptors
import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer
import org.jetbrains.kotlin.idea.imports.OptimizedImportsBuilder import org.jetbrains.kotlin.idea.imports.OptimizedImportsBuilder
@@ -152,16 +152,14 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
val highlightingSession = HighlightingSessionImpl.getHighlightingSession(file, progress) val highlightingSession = HighlightingSessionImpl.getHighlightingSession(file, progress)
val project = highlightingSession.project val project = highlightingSession.project
val editor = highlightingSession.editor val editor = PsiUtilBase.findEditor(file)
if (editor != null) { if (editor != null) {
val modificationStamp = editor.document.modificationStamp val modificationStamp = editor.document.modificationStamp
val invokeFixLater = object : Disposable { val invokeFixLater = Disposable {
override fun dispose() { // later because should invoke when highlighting is finished
// later because should invoke when highlighting is finished ApplicationManager.getApplication().invokeLater {
ApplicationManager.getApplication().invokeLater { if (timeToOptimizeImportsOnTheFly(file, editor, project) && editor.document.modificationStamp == modificationStamp) {
if (timeToOptimizeImportsOnTheFly(file, editor, project) && editor.document.modificationStamp == modificationStamp) { optimizeImportsOnTheFly(file, optimizedImports, editor, project)
optimizeImportsOnTheFly(file, optimizedImports, editor, project)
}
} }
} }
} }
@@ -193,7 +191,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
val document = editor.document val document = editor.document
var hasErrors = false var hasErrors = false
DaemonCodeAnalyzerEx.processHighlights(document, project, HighlightSeverity.ERROR, 0, document.textLength, Processor { highlightInfo -> DaemonCodeAnalyzerEx.processHighlights(document, project, HighlightSeverity.ERROR, 0, document.textLength, { highlightInfo ->
if (!importsRange.containsRange(highlightInfo.startOffset, highlightInfo.endOffset)) { if (!importsRange.containsRange(highlightInfo.startOffset, highlightInfo.endOffset)) {
hasErrors = true hasErrors = true
false false
@@ -215,7 +213,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
} }
} }
private class OptimizeImportsQuickFix(private val file: KtFile): LocalQuickFix { private class OptimizeImportsQuickFix(private val file: KtFile) : LocalQuickFix {
override fun getName() = "Optimize imports" override fun getName() = "Optimize imports"
override fun getFamilyName() = name override fun getFamilyName() = name