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

forget about the hint autopopup as of a nightmare

Browse Source
This commit is contained in:
peter
2011-03-07 18:24:47 +01:00
parent 539c6b24b8
commit 2099206254
8 changed files with 17 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+1 -1
View File
@@ -219,7 +219,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
@NotNull
private LookupImpl obtainLookup(Editor editor) {
LookupImpl existing = (LookupImpl)LookupManager.getActiveLookup(editor);
if (existing != null && existing.isCompletion() && !existing.isHintMode()) {
if (existing != null && existing.isCompletion()) {
existing.markReused();
if (!autopopup) {
existing.setFocused(true);
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+1 -11
View File
@@ -38,7 +38,6 @@ import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.patterns.ElementPattern;
import com.intellij.psi.PsiReference;
@@ -329,22 +328,13 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
}
}
if (isAutopopupCompletion() && showHintAutopopup()) {
myLookup.setHintMode(true);
}
else {
myLookup.show();
}
myLookup.show();
}
myLookup.refreshUi();
hideAutopopupIfMeaningless();
updateFocus();
}
public static boolean showHintAutopopup() {
return "true".equals(Registry.stringValue("hint.autopopup")) && !ApplicationManager.getApplication().isUnitTestMode();
}
final boolean isInsideIdentifier() {
return getIdentifierEndOffset() != getSelectionEndOffset();
}
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/EndHandler.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class EndHandler extends EditorActionHandler {
public void execute(Editor editor, DataContext dataContext){
LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(editor);
if (lookup == null || !lookup.isFocused() || lookup.isHintMode()) {
if (lookup == null || !lookup.isFocused()) {
myOriginalHandler.execute(editor, dataContext);
return;
}
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/HomeHandler.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class HomeHandler extends EditorActionHandler {
public void execute(Editor editor, DataContext dataContext){
LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(editor);
if (lookup == null || !lookup.isFocused() || lookup.isHintMode()) {
if (lookup == null || !lookup.isFocused()) {
myOriginalHandler.execute(editor, dataContext);
return;
}
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java
+4 -19
View File
@@ -98,16 +98,8 @@ public abstract class LookupActionHandler extends EditorActionHandler {
public void actionPerformed(AnActionEvent e) {
LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(PlatformDataKeys.EDITOR.getData(e.getDataContext()));
assert lookup != null;
if (!CompletionProgressIndicator.showHintAutopopup()) {
lookup.hide();
ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_UP).actionPerformed(e);
return;
}
lookup.setHintMode(false);
lookup.refreshUi();
UpHandler.executeUp(lookup);
lookup.hide();
ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_UP).actionPerformed(e);
}
@Override
@@ -123,15 +115,8 @@ public abstract class LookupActionHandler extends EditorActionHandler {
public void actionPerformed(AnActionEvent e) {
LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(PlatformDataKeys.EDITOR.getData(e.getDataContext()));
assert lookup != null;
if (!CompletionProgressIndicator.showHintAutopopup()) {
lookup.hide();
ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN).actionPerformed(e);
return;
}
lookup.setHintMode(false);
lookup.refreshUi();
DownHandler.executeDown(lookup);
lookup.hide();
ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN).actionPerformed(e);
}
@Override
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+7 -162
View File
@@ -35,10 +35,7 @@ import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorFontType;
import com.intellij.openapi.editor.event.*;
import com.intellij.openapi.editor.event.DocumentAdapter;
import com.intellij.openapi.keymap.KeymapUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.JBPopup;
@@ -51,7 +48,10 @@ import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.DebugUtil;
import com.intellij.ui.*;
import com.intellij.ui.LightweightHint;
import com.intellij.ui.ListScrollingUtil;
import com.intellij.ui.ScreenUtil;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.ui.components.JBList;
import com.intellij.ui.plaf.beg.BegPopupMenuBorder;
@@ -60,7 +60,6 @@ import com.intellij.util.CollectConsumer;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.AsyncProcessIcon;
import com.intellij.util.ui.GridBag;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
@@ -69,7 +68,6 @@ import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import javax.swing.border.LineBorder;
import javax.swing.border.MatteBorder;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
@@ -391,7 +389,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
if (!model.isEmpty()) {
myList.setFixedCellWidth(Math.max(myLookupTextWidth + myCellRenderer.getIconIndent(), myAdComponent.getPreferredSize().width));
if (isFocused() && (!isExactPrefixItem(model.iterator().next()) || mySelectionTouched) && !isHintMode()) {
if (isFocused() && (!isExactPrefixItem(model.iterator().next()) || mySelectionTouched)) {
restoreSelection(oldSelected, hasPreselected, oldInvariant);
}
else {
@@ -481,22 +479,6 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
model.addElement(item);
}
public void setHintMode(final boolean hintMode) {
if (!hintMode) {
hideAutopopupHint();
markSelectionTouched();
setFocused(true);
if (!myShown) {
show();
}
}
myHintMode = hintMode;
}
public boolean isHintMode() {
return myHintMode;
}
private static LookupElementPresentation renderItemApproximately(LookupElement item) {
final LookupElementPresentation p = new LookupElementPresentation();
item.renderElement(p);
@@ -1109,8 +1091,6 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
myDisposed = true;
disposeTrace = DebugUtil.currentStackTrace();
hideAutopopupHint();
}
private int doSelectMostPreferableItem(List<LookupElement> items) {
@@ -1139,156 +1119,21 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
updateList();
final Editor editor = myEditor;
if (isVisible()) {
LOG.assertTrue(!ApplicationManager.getApplication().isUnitTestMode());
if (editor.getComponent().getRootPane() == null) {
if (myEditor.getComponent().getRootPane() == null) {
LOG.error("Null root pane");
}
updateScrollbarVisibility();
HintManagerImpl.adjustEditorHintPosition(this, editor, calculatePosition(getComponent()));
HintManagerImpl.adjustEditorHintPosition(this, myEditor, calculatePosition(getComponent()));
layoutStatusIcons();
if (reused) {
ensureSelectionVisible();
}
}
else if (myHintMode) {
final int itemTextPadding = 2;
final JPanel hintComponent = createAutopopupHintComponent(itemTextPadding);
Point bestPoint = calculatePosition(hintComponent);
bestPoint.x += myCellRenderer.getIconIndent() - itemTextPadding;
Point editorPoint = SwingUtilities.convertPoint(
editor.getComponent().getRootPane().getLayeredPane(),
bestPoint,
editor.getContentComponent()
);
final HintHint hintHint = new HintHint(editor, editorPoint);
final HintManagerImpl hintManager = HintManagerImpl.getInstanceImpl();
if (myAutopopupHint == null) {
final JPanel panel = new JPanel(new BorderLayout());
panel.add(hintComponent);
myAutopopupHint = new MyLightweightHint(panel);
myAutopopupHint.setForceShowAsPopup(true);
hintManager.showEditorHint(myAutopopupHint, editor, new Point(bestPoint),
HintManagerImpl.HIDE_BY_ESCAPE | HintManagerImpl.UPDATE_BY_SCROLLING, 0, false, hintHint);
} else {
final JComponent panel = myAutopopupHint.getComponent();
panel.remove(0);
panel.add(hintComponent);
HintManagerImpl.adjustEditorHintPosition(myAutopopupHint, editor, bestPoint);
}
}
}
private JPanel createAutopopupHintComponent(int itemTextPadding) {
int maxAutopopupItems = 7;
JPanel pane = new JPanel(new GridBagLayout());
pane.setBackground(HintUtil.INFORMATION_COLOR);
final Font editorFont = EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN);
final String ctrlSpace = KeymapUtil.getFirstKeyboardShortcutText(
ActionManager.getInstance().getAction(IdeActions.ACTION_CODE_COMPLETION));
final String ctrlDown = KeymapUtil.getFirstKeyboardShortcutText(ActionManager.getInstance().getAction("EditorLookupDown"));
final String tab = KeymapUtil.getFirstKeyboardShortcutText(ActionManager.getInstance().getAction(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM_REPLACE));
final String enter = KeymapUtil.getFirstKeyboardShortcutText(ActionManager.getInstance().getAction(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM));
final List<LookupElement> items = getItems();
GridBag gb = new GridBag().setDefaultFill(GridBagConstraints.HORIZONTAL).setDefaultWeightX(1);
for (int i = 0; i < Math.min(maxAutopopupItems, items.size()); i++) {
final LookupElement element = items.get(i);
final LookupElementPresentation presentation = new LookupElementPresentation();
element.renderElement(presentation);
{
final GridBagLayout gridBagLayout = new GridBagLayout();
final JPanel row = new JPanel(gridBagLayout);
row.setOpaque(false);
GridBag rgb = new GridBag().setDefaultAnchor(GridBagConstraints.BASELINE);
final SimpleColoredComponent nameLabel = new SimpleColoredComponent();
nameLabel.setIpad(new Insets(0, 0, 0, 0));
nameLabel.setFont(editorFont);
final int style = presentation.isItemTextBold() ? Font.BOLD : Font.PLAIN;
myCellRenderer.renderItemName(element, LookupCellRenderer.FOREGROUND_COLOR, false, style,
StringUtil.notNullize(presentation.getItemText()), nameLabel);
nameLabel.setOpaque(false);
row.add(nameLabel, rgb.next());
final JLabel tailLabel = normalizedLabel(presentation.getTailText(), editorFont);
tailLabel.setForeground(LookupCellRenderer.getTailTextColor(false, presentation, tailLabel.getForeground()));
row.add(tailLabel, rgb.next());
String keys = i == 0 ? " [" + tab + (isFocused() ? ", " + enter : "") + "]" : i == 1 ? " [" + ctrlDown + "]" : "";
JLabel adLabel = new JLabel(keys);
adLabel.setFont(adLabel.getFont().deriveFont(Font.BOLD, editorFont.getSize()));
row.add(adLabel, rgb.next().weightx(1).fillCellHorizontally());
row.add(normalizedLabel(" " + StringUtil.notNullize(presentation.getTypeText()) + " ", editorFont), rgb.next());
if (i == 1) {
row.setBorder(BorderFactory.createCompoundBorder(new EmptyBorder(5, 0, 0, 0),
BorderFactory.createCompoundBorder(new MatteBorder(1, 0, 0, 0, Color.lightGray),
new EmptyBorder(5, itemTextPadding, 0, 0))));
}
else {
row.setBorder(new EmptyBorder(0, itemTextPadding, 0, 0));
}
row.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
setCurrentItem(element);
CommandProcessor.getInstance().executeCommand(myProject, new Runnable() {
public void run() {
finishLookup(NORMAL_SELECT_CHAR);
}
}, "", null);
}
});
pane.add(row, gb.nextLine());
}
}
if (items.size() > maxAutopopupItems) {
final JPanel lastLine = new JPanel(new BorderLayout());
lastLine.setBorder(new EmptyBorder(4, 0, 2, 0));
lastLine.setOpaque(false);
JLabel moreLabel = new JLabel(" " + (items.size() - maxAutopopupItems) + " more");
moreLabel.setFont(moreLabel.getFont().deriveFont(Font.ITALIC, editorFont.getSize()));
lastLine.add(moreLabel, BorderLayout.WEST);
JLabel keyLabel = new JLabel(" [" + ctrlSpace + "]");
keyLabel.setFont(keyLabel.getFont().deriveFont(Font.BOLD, editorFont.getSize()));
lastLine.add(keyLabel);
pane.add(lastLine, gb.nextLine().padx(5).pady(2).coverColumn());
}
return pane;
}
private static JLabel normalizedLabel(String text, Font font) {
JLabel label = new JLabel(text);
label.setFont(label.getFont().deriveFont(Font.PLAIN, font.getSize()));
return label;
}
private void hideAutopopupHint() {
if (myAutopopupHint != null) {
myAutopopupHint.justHide();
myPositionedAbove = null;
}
}
private void layoutStatusIcons() {
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/actions/ChooseItemReplaceAction.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class ChooseItemReplaceAction extends EditorAction {
FeatureUsageTracker.getInstance().triggerFeatureUsed(CodeCompletionFeatures.EDITING_COMPLETION_REPLACE);
LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(editor);
assert lookup != null;
lookup.finishLookup(lookup.isHintMode() ? Lookup.NORMAL_SELECT_CHAR : Lookup.REPLACE_SELECT_CHAR);
lookup.finishLookup(Lookup.REPLACE_SELECT_CHAR);
}
@Override
platform/platform-resources-en/src/misc/registry.properties
+1 -3
View File
@@ -116,6 +116,4 @@ vcs.show.history.numbers=true
navbar.updateMergeTime=250
navbar.userActivityMergeTime=500
inspectionGadgets.telemetry.enabled=false
hint.autopopup=true
inspectionGadgets.telemetry.enabled=false