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

recover after exceptions when trying to show lookup (EA-65651, EA-65652) and fix one of them

Browse Source
This commit is contained in:
peter
2015-05-21 15:31:41 +02:00
parent 5bfa9f37bd
commit 56b4bcef5b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+7 -2
View File
@@ -654,8 +654,13 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable,
myUi = new LookupUi(this, myAdComponent, myList, myProject);
myUi.setCalculating(myCalculating);
Point p = myUi.calculatePosition().getLocation();
HintManagerImpl.getInstanceImpl().showEditorHint(this, myEditor, p, HintManager.HIDE_BY_ESCAPE | HintManager.UPDATE_BY_SCROLLING, 0, false,
HintManagerImpl.createHintHint(myEditor, p, this, HintManager.UNDER).setAwtTooltip(false));
try {
HintManagerImpl.getInstanceImpl().showEditorHint(this, myEditor, p, HintManager.HIDE_BY_ESCAPE | HintManager.UPDATE_BY_SCROLLING, 0, false,
HintManagerImpl.createHintHint(myEditor, p, this, HintManager.UNDER).setAwtTooltip(false));
}
catch (Exception e) {
LOG.error(e);
}
if (!isVisible() || !myList.isShowing()) {
hide();
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+3 -1
View File
@@ -1123,7 +1123,9 @@ public class AbstractPopup implements JBPopup {
mySpeedSearchPatternField = new JTextField();
if (SystemInfo.isMac) {
Font f = mySpeedSearchPatternField.getFont();
mySpeedSearchPatternField.setFont(f.deriveFont(f.getStyle(), f.getSize() - 2));
if (f != null) {
mySpeedSearchPatternField.setFont(f.deriveFont(f.getStyle(), f.getSize() - 2));
}
}
}