From 600b4ce49af6df5057fa45beb2f164c1b5c15dba Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 12 Jul 2018 20:52:00 +0200 Subject: [PATCH] check copyright presence against committed PSI might fix IDEA-166903, IDEA-191665, IDEA-161852 --- .../src/com/intellij/copyright/CopyrightManager.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/copyright/src/com/intellij/copyright/CopyrightManager.kt b/plugins/copyright/src/com/intellij/copyright/CopyrightManager.kt index b1b08b443be4..5f0812028f55 100644 --- a/plugins/copyright/src/com/intellij/copyright/CopyrightManager.kt +++ b/plugins/copyright/src/com/intellij/copyright/CopyrightManager.kt @@ -3,6 +3,7 @@ package com.intellij.copyright import com.intellij.configurationStore.* import com.intellij.openapi.Disposable +import com.intellij.openapi.application.AppUIExecutor import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ModalityState import com.intellij.openapi.components.PersistentStateComponent @@ -227,9 +228,9 @@ private class CopyrightManagerPostStartupActivity : StartupActivity { return } - ApplicationManager.getApplication().invokeLater(Runnable { + AppUIExecutor.onUiThread(ModalityState.NON_MODAL).later().withDocumentsCommitted(project).submit { if (!virtualFile.isValid) { - return@Runnable + return@submit } val file = PsiManager.getInstance(project).findFile(virtualFile) @@ -238,7 +239,7 @@ private class CopyrightManagerPostStartupActivity : StartupActivity { UpdateCopyrightProcessor(project, module, file).run() } } - }, ModalityState.NON_MODAL, project.disposed) + } } }, project) }