Skip to content

Find/Replace overlay: fix content assist not available in Java files #4201

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
HeikoKlare wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Find/Replace overlay: fix content assist not available in Java files #4201

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
10 changes: 10 additions & 0 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 @@ -501,6 +501,8 @@ private void createCloseTools() {
// Also close on Ctrl+F: otherwise it would reopen (a duplicate of) this very overlay.
commandSupport.registerAction(
new FindReplaceOverlayAction(this::close, IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE));
commandSupport.registerAction(new FindReplaceOverlayAction(this::triggerContentAssist,
ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS));

// Close button
new AccessibleToolItemBuilder(closeTools).withStyleBits(SWT.PUSH)
Expand Down Expand Up @@ -976,6 +978,14 @@ private void updateContentAssistAvailability() {
setContentAssistsEnablement(findReplaceLogic.isAvailableAndActive(SearchOptions.REGEX));
}

private void triggerContentAssist() {
if (searchBar.isFocusControl() && contentAssistSearchField.isEnabled()) {
contentAssistSearchField.openProposalPopup();
} else if (okayToUse(replaceBar) && replaceBar.isFocusControl() && contentAssistReplaceField.isEnabled()) {
contentAssistReplaceField.openProposalPopup();
}
}

private void decorate() {
if (findReplaceLogic.isAvailableAndActive(SearchOptions.REGEX)) {
SearchDecoration.validateRegex(getFindString(), searchBarDecoration);
Expand Down
Loading