Fixed RIDER-131486

(cherry picked from commit 6a2b0e95be4dda19ef2de878aa16279c5380f090) IJ-CR-180418 GitOrigin-RevId: 849359bdcf0bbbbff02e1794bcc53d4325fd9828

Author: eterekhin

platform/core-impl/src/com/intellij/pom/wrappers/PsiEventWrapperAspect.java

@@ -10,6 +10,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.PsiDocumentManagerBase;
 import com.intellij.psi.impl.PsiManagerEx;
+import com.intellij.psi.impl.PsiManagerImpl;
 import org.jetbrains.annotations.NotNull;
 
 public final class PsiEventWrapperAspect implements PomModelAspect {
@@ -29,7 +30,7 @@ public void update(@NotNull PomModelEvent event) {
  ((PsiDocumentManagerBase)PsiDocumentManager.getInstance(file.getProject())).getSynchronizer().processEvents(changeSet, file);
 
  if (PomModelImpl.shouldFirePhysicalPsiEvents(file)) {
- changeSet.fireEvents();
+ PsiManagerImpl.runWriteActionOnEdtRegardlessOfCurrentThread(() -> changeSet.fireEvents());
  }
  else {
  ((PsiManagerEx)file.getManager()).afterChange(false);

platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java

@@ -464,7 +464,7 @@ private void fireEvent(@NotNull PsiTreeChangeEventImpl event) {
 
  @RequiresWriteLock
  @ApiStatus.Internal
- static void runWriteActionOnEdtRegardlessOfCurrentThread(Runnable action) {
+ public static void runWriteActionOnEdtRegardlessOfCurrentThread(Runnable action) {
  if (EDT.isCurrentThreadEdt()) {
  action.run();
  }