Skip to content

Fix problem of ExternalURLHandler blocking selection of completion names #111

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
opeongo wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −16
Open

Fix problem of ExternalURLHandler blocking selection of completion names #111

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
30 changes: 14 additions & 16 deletions AutoComplete/src/main/java/org/fife/ui/autocomplete/AutoCompleteDescWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,24 +346,22 @@ public void hyperlinkUpdate(HyperlinkEvent e) {
newUrl, e.getDescription(), e.getSourceElement());
}
}
}

// Custom hyperlink handler for this completion type
ExternalURLHandler handler = ac.getExternalURLHandler();
if (handler!=null) {
HistoryEntry current = history.get(historyPos);
handler.urlClicked(e, current.completion, this);
return;
}

// No custom handler...
if (url!=null) {
// Custom hyperlink handler for this completion type
ExternalURLHandler handler = ac.getExternalURLHandler();
if (handler!=null) {
HistoryEntry current = history.get(historyPos);
handler.urlClicked(e, current.completion, this);
}
else {
// No custom handler...
// Try loading in external browser (Java 6+ only).
try {
Util.browse(new URI(url.toString()));
} catch (/*IO*/URISyntaxException ioe) {
UIManager.getLookAndFeel().provideErrorFeedback(descArea);
ioe.printStackTrace();
try {
Util.browse(new URI(url.toString()));
} catch (/*IO*/URISyntaxException ioe) {
UIManager.getLookAndFeel().provideErrorFeedback(descArea);
ioe.printStackTrace();
}
}
}
else { // Assume simple function name text, like in c.xml
Expand Down