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

do not pass original Ctrl-Shift-A event to the invoked action

Browse Source
This commit is contained in:
Gregory.Shrago
2018-02-08 19:49:47 +03:00
parent 591fdc7b7a
commit a9b9a31ee9
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+3 -4
View File
@@ -81,7 +81,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
project.putUserData(ChooseByNamePopup.CHOOSE_BY_NAME_POPUP_IN_PROJECT_KEY, null);
}
String enteredText = popup.getTrimmedText();
openOptionOrPerformAction(((GotoActionModel.MatchedValue)element).value, enteredText, project, component, e);
openOptionOrPerformAction(((GotoActionModel.MatchedValue)element).value, enteredText, project, component);
}
};
@@ -281,8 +281,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
public static void openOptionOrPerformAction(@NotNull Object element,
final String enteredText,
@Nullable final Project project,
Component component,
@Nullable AnActionEvent e) {
Component component) {
if (element instanceof OptionDescription) {
OptionDescription optionDescription = (OptionDescription)element;
final String configurableId = optionDescription.getConfigurableId();
@@ -296,7 +295,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
}
else {
ApplicationManager.getApplication().invokeLater(() -> IdeFocusManager.getInstance(project).doWhenFocusSettlesDown(
() -> performAction(element, component, e)));
() -> performAction(element, component, null)));
}
}
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+1 -1
View File
@@ -528,7 +528,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
}
}
else {
GotoActionAction.openOptionOrPerformAction(value, pattern, project, c, event);
GotoActionAction.openOptionOrPerformAction(value, pattern, project, c);
}
});
return ()->{};