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

Do not call FileEditorManager.getSelectedEditor outside UI thread (KT-30130)

Browse Source 
^KT-30130 Fixed
This commit is contained in:
Natalia Selezneva
2019-03-28 11:24:39 +03:00
parent 0e0c78317d
commit 0de0321fa9
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptNewDependenciesNotification.kt
+29 -13
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.idea.core.script package org.jetbrains.kotlin.idea.core.script
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.fileEditor.FileEditor import com.intellij.openapi.fileEditor.FileEditor
import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
@@ -18,9 +19,12 @@ import org.jetbrains.kotlin.psi.UserDataProperty
import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult
fun VirtualFile.removeScriptDependenciesNotificationPanel(project: Project) { fun VirtualFile.removeScriptDependenciesNotificationPanel(project: Project) {
val editor = FileEditorManager.getInstance(project).getSelectedEditor(this) ?: return withSelectedEditor(project) { manager ->
editor.notificationPanel?.let { FileEditorManager.getInstance(project).removeTopComponent(editor, it) } notificationPanel?.let {
editor.notificationPanel = null manager.removeTopComponent(this, it)
}
notificationPanel = null
}
} }
fun VirtualFile.addScriptDependenciesNotificationPanel( fun VirtualFile.addScriptDependenciesNotificationPanel(
@@ -28,18 +32,30 @@ fun VirtualFile.addScriptDependenciesNotificationPanel(
project: Project, project: Project,
onClick: (ResolveResult) -> Unit onClick: (ResolveResult) -> Unit
) { ) {
val editor = FileEditorManager.getInstance(project).getSelectedEditor(this) ?: return withSelectedEditor(project) { manager ->
val existingPanel = editor.notificationPanel val existingPanel = notificationPanel
if (existingPanel != null) { if (existingPanel != null) {
if (existingPanel.resolveResult.dependencies == resolveResult.dependencies) return if (existingPanel.resolveResult.dependencies == resolveResult.dependencies) {
editor.notificationPanel?.let { return@withSelectedEditor
FileEditorManager.getInstance(project).removeTopComponent(editor, it) }
notificationPanel?.let {
manager.removeTopComponent(this, it)
}
}
val panel = NewScriptDependenciesNotificationPanel(onClick, resolveResult, project)
notificationPanel = panel
manager.addTopComponent(this, panel)
}
}
private fun VirtualFile.withSelectedEditor(project: Project, f: FileEditor.(FileEditorManager) -> Unit) {
ApplicationManager.getApplication().invokeLater {
val fileEditorManager = FileEditorManager.getInstance(project)
(fileEditorManager.getSelectedEditor(this))?.let {
f(it, fileEditorManager)
} }
} }
val panel = NewScriptDependenciesNotificationPanel(onClick, resolveResult, project)
editor.notificationPanel = panel
FileEditorManager.getInstance(project).addTopComponent(editor, panel)
} }
private var FileEditor.notificationPanel: NewScriptDependenciesNotificationPanel? by UserDataProperty<FileEditor, NewScriptDependenciesNotificationPanel>(Key.create("script.dependencies.panel")) private var FileEditor.notificationPanel: NewScriptDependenciesNotificationPanel? by UserDataProperty<FileEditor, NewScriptDependenciesNotificationPanel>(Key.create("script.dependencies.panel"))