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

Increment PsiModificationTracker counter in a write action

Browse Source 
(cherry picked from commit 73307a2)
This commit is contained in:
Yan Zhulanow
2016-10-04 21:56:34 +03:00
committed by Yan Zhulanow
parent 2f933cfcf2
commit 34efaea6ea
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+4 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.cli.jvm.compiler package org.jetbrains.kotlin.cli.jvm.compiler
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.util.io.JarUtil import com.intellij.openapi.util.io.JarUtil
import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
@@ -264,7 +265,9 @@ object KotlinToJVMBytecodeCompiler {
} }
// Clear package caches (see KotlinJavaPsiFacade) // Clear package caches (see KotlinJavaPsiFacade)
(PsiManager.getInstance(environment.project).modificationTracker as? PsiModificationTrackerImpl)?.incCounter() ApplicationManager.getApplication().runWriteAction {
(PsiManager.getInstance(environment.project).modificationTracker as? PsiModificationTrackerImpl)?.incCounter()
}
// Clear all diagnostic messages // Clear all diagnostic messages
configuration[CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY]?.clear() configuration[CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY]?.clear()
plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/AnnotationProcessingExtension.kt
+4 -1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.annotation package org.jetbrains.kotlin.annotation
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.psi.JavaPsiFacade import com.intellij.psi.JavaPsiFacade
@@ -291,7 +292,9 @@ abstract class AbstractAnnotationProcessingExtension(
} }
// Update the platform caches // Update the platform caches
(psiManager().modificationTracker as? PsiModificationTrackerImpl)?.incCounter() ApplicationManager.getApplication().runWriteAction {
(psiManager().modificationTracker as? PsiModificationTrackerImpl)?.incCounter()
}
// Find generated files // Find generated files
val localFileSystem = StandardFileSystems.local() val localFileSystem = StandardFileSystems.local()