Skip to content

FindReplaceOverlay: add support from mnemonics from the Dialog #2235

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

Closed
wants to merge 1 commit into from
Closed

FindReplaceOverlay: add support from mnemonics from the Dialog #2235

Show file tree
Hide file tree
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
14 changes: 9 additions & 5 deletions ...nch.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,22 @@ private final class KeyboardShortcuts {
private static final List<KeyStroke> SEARCH_BACKWARD = List.of( //
KeyStroke.getInstance(SWT.SHIFT, SWT.CR), KeyStroke.getInstance(SWT.SHIFT, SWT.KEYPAD_CR));
private static final List<KeyStroke> SEARCH_ALL = List.of( //
KeyStroke.getInstance(SWT.MOD1, SWT.CR), KeyStroke.getInstance(SWT.MOD1, SWT.KEYPAD_CR),
KeyStroke.getInstance(SWT.ALT, 's'));
private static final List<KeyStroke> REPLACE_ALL = List.of( //
KeyStroke.getInstance(SWT.MOD1, SWT.CR), KeyStroke.getInstance(SWT.MOD1, SWT.KEYPAD_CR));
private static final List<KeyStroke> OPTION_CASE_SENSITIVE = List.of( //
KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'C'), KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'c'));
KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'C'), KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'c'),
KeyStroke.getInstance(SWT.ALT, 'c'));
private static final List<KeyStroke> OPTION_WHOLE_WORD = List.of( //
KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'D'), KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'd'));
private static final List<KeyStroke> OPTION_REGEX = List.of( //
KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'P'), KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'p'));
private static final List<KeyStroke> OPTION_SEARCH_IN_SELECTION = List.of( //
KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'I'), KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'i'));
KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'I'), KeyStroke.getInstance(SWT.MOD1 | SWT.SHIFT, 'i'),
KeyStroke.getInstance(SWT.ALT, 'l'));
private static final List<KeyStroke> CLOSE = List.of( //
KeyStroke.getInstance(SWT.ESC), KeyStroke.getInstance(SWT.MOD1, 'F'),
KeyStroke.getInstance(SWT.MOD1, 'f'));
KeyStroke.getInstance(SWT.ESC), KeyStroke.getInstance(SWT.MOD1, 'F'));
private static final List<KeyStroke> TOGGLE_REPLACE = List.of( //
KeyStroke.getInstance(SWT.MOD1, 'R'), KeyStroke.getInstance(SWT.MOD1, 'r'));
}
Expand Down Expand Up @@ -527,7 +531,7 @@ private void createReplaceTools() {
return;
}
performReplaceAll();
}).withShortcuts(KeyboardShortcuts.SEARCH_ALL).build();
}).withShortcuts(KeyboardShortcuts.REPLACE_ALL).build();
}

private ContentAssistCommandAdapter createContentAssistField(HistoryTextWrapper control, boolean isFind) {
Expand Down
2 changes: 1 addition & 1 deletion ...exteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceShortcutUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static private KeyStroke extractKeyStroke(KeyEvent e) {
if (ctrlDown && e.character != e.keyCode && e.character < 0x20 && (e.keyCode & SWT.KEYCODE_BIT) == 0) {
character += 0x40;
}
KeyStroke actualStroke = KeyStroke.getInstance(e.stateMask & (SWT.MOD1 | SWT.SHIFT),
KeyStroke actualStroke = KeyStroke.getInstance(e.stateMask & (SWT.MOD1 | SWT.SHIFT | SWT.ALT),
character == 0 ? e.keyCode : character);
return actualStroke;
}
Expand Down
Loading