MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

navigate from switcher in a write-safe context (EA-89634 - assert: PsiDocumentManagerBase.commitDocument)

Browse Source
This commit is contained in:
peter
2016-11-04 16:33:21 +01:00
parent ecca380b23
commit 60276b4e0a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+6 -3
View File
@@ -22,6 +22,7 @@ import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.impl.PresentationFactory;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.editor.markup.EffectType;
import com.intellij.openapi.editor.markup.TextAttributes;
@@ -70,13 +71,14 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.*;
import java.util.List;
import static java.awt.event.InputEvent.*;
import static java.awt.event.InputEvent.CTRL_DOWN_MASK;
import static java.awt.event.KeyEvent.*;
import static javax.swing.KeyStroke.getKeyStroke;
@@ -886,7 +888,8 @@ public class Switcher extends AnAction implements DumbAware {
}
else if (values[0] instanceof ToolWindow) {
final ToolWindow toolWindow = (ToolWindow)values[0];
IdeFocusManager.getInstance(project).doWhenFocusSettlesDown(() -> toolWindow.activate(null, true, true));
IdeFocusManager.getInstance(project).doWhenFocusSettlesDown(() -> toolWindow.activate(null, true, true),
ModalityState.current());
}
else {
IdeFocusManager.getInstance(project).doWhenFocusSettlesDown(() -> {
@@ -916,7 +919,7 @@ public class Switcher extends AnAction implements DumbAware {
}
}
}
});
}, ModalityState.current());
}
}