Skip to content

Commands not behaving as expected #2391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Commands not behaving as expected #2391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/command/Menus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,18 +736,25 @@ define(function (require, exports, module) {
Metrics.countEvent(Metrics.EVENT_TYPE.UI_MENU, "click", menuItem._command.getID());
logger.leaveTrail("UI Menu Click: " + menuItem._command.getID());
MainViewManager.focusActivePane();
if (menuItem._command._options.eventSource) {
// NOTE: Ideally beforeExecuteCommand should be fired inside Command.execute itself.
// But right now Command.execute() bypasses the event flow
// So we run through CommandManager.execute() to keep things consistent
// (keyboard + menu both go through the same path)
// Read this for more info: https://github.com/phcode-dev/phoenix/pull/2356
CommandManager.execute(menuItem._command.getID(), {
const commandId = menuItem._command.getID();

// NOTE: we handle save commands differently because we want save commands to go through the
// CommandManager.execute() to trigger beforeExecuteCommand events consistently, whether invoked via
// menu click or keyboard shortcut.
// because there are listeners that uses beforeExecuteCommand to listen to save commands
// (for ex: tabbar listens to save commands to add placeholder tabs to working set)
// Other commands use direct execution to preserve file tree context
if(commandId === Commands.FILE_SAVE ||
commandId === Commands.FILE_SAVE_AS ||
commandId === Commands.FILE_SAVE_ALL) {
CommandManager.execute(commandId);
} else if (menuItem._command._options.eventSource) {
menuItem._command.execute({
eventSource: CommandManager.SOURCE_UI_MENU_CLICK,
sourceType: self.id
});
} else {
CommandManager.execute(menuItem._command.getID());
menuItem._command.execute();
}
});

Expand Down
Loading