ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-09-11 14:56:19 +03:00
Code Issues Projects Releases Wiki Activity

Fix issue #425. Logic does not have to be run in read task

Browse Source
This commit is contained in:
Rik van der Kleij 2019-05-23 17:21:53 +02:00
parent 6770b410f1
commit d67a7f9c82
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/scala/intellij/haskell/notification/ConfigFileWatcherNotificationProvider.scala
View File

@ -4,10 +4,7 @@ import java.util
import java.util.concurrent.ConcurrentHashMap
import com.intellij.openapi.fileEditor.FileEditor
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.util.ReadTask.Continuation
import com.intellij.openapi.progress.util.{ProgressIndicatorUtils, ReadTask}
import com.intellij.openapi.project.{DumbService, Project}
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Key
import com.intellij.openapi.vfs.newvfs.BulkFileListener
import com.intellij.openapi.vfs.newvfs.events.{VFileContentChangeEvent, VFileEvent}
@ -63,30 +60,10 @@ private class ConfigFileWatcher(project: Project, notifications: EditorNotificat
override def after(events: util.List[_ <: VFileEvent]): Unit = {
if (!StackProjectManager.isInitializing(project)) {
val readTask = new ReadTask {
override def runBackgroundProcess(indicator: ProgressIndicator): Continuation = {
DumbService.getInstance(project).runReadActionInSmartMode(() => {
performInReadAction(indicator)
})
}
override def computeInReadAction(indicator: ProgressIndicator): Unit = {
if (!project.isDisposed) {
indicator.checkCanceled()
if (events.asScala.exists(e => e.isInstanceOf[VFileContentChangeEvent] && !e.isFromRefresh && watchFiles.exists(_.getAbsolutePath == HaskellFileUtil.getAbsolutePath(e.getFile)))) {
ConfigFileWatcherNotificationProvider.showNotificationsByProject.put(project, true)
notifications.updateAllNotifications()
}
}
}
override def onCanceled(indicator: ProgressIndicator): Unit = {
ProgressIndicatorUtils.scheduleWithWriteActionPriority(this)
}
if (events.asScala.exists(e => e.isInstanceOf[VFileContentChangeEvent] && !e.isFromRefresh && watchFiles.exists(_.getAbsolutePath == HaskellFileUtil.getAbsolutePath(e.getFile)))) {
ConfigFileWatcherNotificationProvider.showNotificationsByProject.put(project, true)
notifications.updateAllNotifications()
}
ProgressIndicatorUtils.scheduleWithWriteActionPriority(readTask)
}
}
}