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

remove EditorChooseLookupItemAlways action

Browse Source
This commit is contained in:
Sergey Ignatov
2014-04-10 13:53:12 +04:00
parent efacd0106f
commit 44dbc43727
14 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
-6
View File
@@ -185,12 +185,6 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement
myLookup.setFocusDegree(LookupImpl.FocusDegree.FOCUSED);
}
}
else if (FeatureUsageTracker.getInstance()
.isToBeAdvertisedInLookup(CodeCompletionFeatures.EDITING_COMPLETION_CONTROL_ENTER, getProject())) {
myLookup.addAdvertisement("Press " +
CompletionContributor.getActionShortcut(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM_ALWAYS) +
" to choose the selected (or first) suggestion", null);
}
if (!myEditor.isOneLineMode() &&
FeatureUsageTracker.getInstance()
.isToBeAdvertisedInLookup(CodeCompletionFeatures.EDITING_COMPLETION_CONTROL_ARROWS, getProject())) {
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/actions/ChooseItemAction.java
-5
View File
@@ -153,11 +153,6 @@ public abstract class ChooseItemAction extends EditorAction {
return liveTemplateLookup.getTemplateShortcut() == shortcutChar;
}
public static class Always extends ChooseItemAction {
public Always() {
super(new Handler(false, Lookup.NORMAL_SELECT_CHAR));
}
}
public static class FocusedOnly extends ChooseItemAction {
public FocusedOnly() {
super(new Handler(true, Lookup.NORMAL_SELECT_CHAR));
platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java
-1
View File
@@ -74,7 +74,6 @@ public interface IdeActions {
@NonNls String ACTION_HIPPIE_COMPLETION = "HippieCompletion";
@NonNls String ACTION_HIPPIE_BACKWARD_COMPLETION = "HippieBackwardCompletion";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM = "EditorChooseLookupItem";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM_ALWAYS = "EditorChooseLookupItemAlways";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM_REPLACE = "EditorChooseLookupItemReplace";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM_COMPLETE_STATEMENT = "EditorChooseLookupItemCompleteStatement";
@NonNls String ACTION_CHOOSE_LOOKUP_ITEM_DOT = "EditorChooseLookupItemDot";
platform/platform-resources-en/src/tips/FinishByControlEnter.html
-10
View File
@@ -1,10 +0,0 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="css/tips.css">
</head>
<body>
<p>
<span class="shortcut">&shortcut:EditorChooseLookupItemAlways;</span> will
choose the first item of the autopopup completion when there is no selection there.</p>
</body>
</html>
platform/platform-resources/src/idea/Keymap_Default.xml
-3
View File
@@ -675,9 +675,6 @@
<action id="EditorChooseLookupItem">
<keyboard-shortcut first-keystroke="ENTER"/>
</action>
<action id="EditorChooseLookupItemAlways">
<keyboard-shortcut first-keystroke="control ENTER"/>
</action>
<action id="Inline">
<keyboard-shortcut first-keystroke="control alt N"/>
</action>
platform/platform-resources/src/idea/Keymap_Mac.xml
-4
View File
@@ -313,10 +313,6 @@
<keyboard-shortcut first-keystroke="alt DOWN"/>
</action>
<action id="EditorChooseLookupItemAlways">
<keyboard-shortcut first-keystroke="control ENTER"/>
</action>
<action id="EditorLookupUp"> <keyboard-shortcut first-keystroke="control UP"/> </action>
<action id="EditorLookupDown"> <keyboard-shortcut first-keystroke="control DOWN"/> </action>
platform/platform-resources/src/idea/Keymap_MacClassic.xml
-4
View File
@@ -87,10 +87,6 @@
<action id="RunGc"/>
<action id="RunClass"/>
<action id="EditorChooseLookupItemAlways">
<keyboard-shortcut first-keystroke="control ENTER"/>
</action>
<action id="EditorLookupUp"> <keyboard-shortcut first-keystroke="control UP"/> </action>
<action id="EditorLookupDown"> <keyboard-shortcut first-keystroke="control DOWN"/> </action>
platform/platform-resources/src/idea/PlatformLangActionManager.xml
-1
View File
@@ -3,7 +3,6 @@
<group id="LookupActions">
<!-- these must be declared before standard EnterAction and TabAction -->
<action id="EditorChooseLookupItem" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$FocusedOnly"/>
<action id="EditorChooseLookupItemAlways" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$Always"/>
<action id="EditorChooseLookupItemReplace" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$Replacing"/>
<action id="EditorChooseLookupItemCompleteStatement" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$CompletingStatement"/>
<action id="EditorChooseLookupItemDot" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$ChooseWithDot"/>
python/resources/ProductivityFeaturesRegistry.xml
-6
View File
@@ -115,12 +115,6 @@
first-show="5"
successive-show="7"
/>
<feature
id="editing.completion.finishByControlEnter"
tip-file="FinishByControlEnter.html"
min-usage-count="10"
first-show="2"
successive-show="3"/>
<feature
id="editing.completion.cancelByControlArrows"
tip-file="CancelByControlArrows.html"
python/resources/tips/FinishByControlEnter.html
-10
View File
@@ -1,10 +0,0 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="css/tips.css">
</head>
<body>
<p>
<span class="shortcut">&shortcut:EditorChooseLookupItemAlways;</span> will
choose the first item of the autopopup completion when there is no selection there.</p>
</body>
</html>
python/src/META-INF/IdeTipsAndTricks.xml
-1
View File
@@ -107,7 +107,6 @@
<tipAndTrick file="ChangeSorting.html"/>
<tipAndTrick file="CheckRegExp.html"/>
<tipAndTrick file="CtrlDotInLookups.html"/>
<tipAndTrick file="FinishByControlEnter.html"/>
<tipAndTrick file="HorizontalScrolling.html"/>
</extensions>
</idea-plugin>
resources/src/META-INF/IdeTipsAndTricks.xml
-1
View File
@@ -147,7 +147,6 @@
<tipAndTrick file="FinishBySmartEnter.html" feature-id="editing.completion.finishBySmartEnter"/>
<tipAndTrick file="FinishByExclamation.html" feature-id="editing.completion.finishByExclamation"/>
<tipAndTrick file="CompletionImportStatic.html" feature-id="editing.completion.global.member.name"/>
<tipAndTrick file="FinishByControlEnter.html" feature-id="editing.completion.finishByControlEnter"/>
<tipAndTrick file="SecondBasicClassNameCompletion.html" feature-id="editing.completion.second.basic"/>
<tipAndTrick file="SecondSmartCompletionToar.html" feature-id="editing.completion.second.smarttype.toar"/>
<tipAndTrick file="ChangeSorting.html" feature-id="editing.completion.changeSorting"/>
resources/src/ProductivityFeaturesRegistry.xml
-6
View File
@@ -219,12 +219,6 @@
first-show="5"
successive-show="7"
/>
<feature
id="editing.completion.finishByControlEnter"
tip-file="FinishByControlEnter.html"
min-usage-count="10"
first-show="2"
successive-show="3"/>
<feature
id="editing.completion.cancelByControlArrows"
tip-file="CancelByControlArrows.html"
resources/src/idea/RichPlatformActions.xml
-1
View File
@@ -3,7 +3,6 @@
<group id="LookupActions">
<!-- these must be declared before standard EnterAction and TabAction -->
<action id="EditorChooseLookupItem" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$FocusedOnly"/>
<action id="EditorChooseLookupItemAlways" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$Always"/>
<action id="EditorChooseLookupItemReplace" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$Replacing"/>
<action id="EditorChooseLookupItemCompleteStatement" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$CompletingStatement"/>
<action id="EditorChooseLookupItemDot" class="com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction$ChooseWithDot"/>