diff options
author | Mickael Istria | 2018-09-17 21:54:37 +0000 |
---|---|---|
committer | Mickael Istria | 2018-09-17 21:54:37 +0000 |
commit | 3c80a177e44f9924952496eeb79d87b7ea955a9d (patch) | |
tree | 365a37d32322f5804898fe7b8836b79ed24a6640 /org.eclipse.jface.text/src | |
parent | 29bf56750751161c20aa3ab9d2b02c357bb30dee (diff) | |
download | eclipse.platform.text-3c80a177e44f9924952496eeb79d87b7ea955a9d.tar.gz eclipse.platform.text-3c80a177e44f9924952496eeb79d87b7ea955a9d.tar.xz eclipse.platform.text-3c80a177e44f9924952496eeb79d87b7ea955a9d.zip |
Bug 539165 - API for ContentAssistant to ignore completion trigger chars
Change-Id: If8741d6564ab5b13940b0b656f169d1b77df3812
Signed-off-by: Mickael Istria <mistria@redhat.com>
Diffstat (limited to 'org.eclipse.jface.text/src')
2 files changed, 37 insertions, 9 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java index 55009fe0bb4..7d077f2bb07 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java @@ -1369,16 +1369,18 @@ class CompletionProposalPopup implements IContentAssistListener { return false; default: - ICompletionProposal p= getSelectedProposal(); - if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension t= (ICompletionProposalExtension) p; - char[] triggers= t.getTriggerCharacters(); - if (contains(triggers, key)) { - e.doit= false; - hide(); - insertProposal(p, key, e.stateMask, fContentAssistSubjectControlAdapter.getSelectedRange().x); + if (fContentAssistant.isCompletionProposalTriggerCharsEnabled()) { + ICompletionProposal p= getSelectedProposal(); + if (p instanceof ICompletionProposalExtension) { + ICompletionProposalExtension t= (ICompletionProposalExtension) p; + char[] triggers= t.getTriggerCharacters(); + if (contains(triggers, key)) { + e.doit= false; + hide(); + insertProposal(p, key, e.stateMask, fContentAssistSubjectControlAdapter.getSelectedRange().x); + } } - } + } } return true; diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java index bfe38f3784a..7c614d561d2 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java @@ -1055,6 +1055,8 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt */ private boolean fAsynchronous; + private boolean fCompletionProposalTriggerCharsEnabled= true; + /** * Creates a new content assistant. The content assistant is not automatically activated, * overlays the completion proposals with context information list if necessary, and shows the @@ -2757,4 +2759,28 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt fProposalPopup.setSorter(fSorter); } } + + /** + * Returns whether completion trigger char are enabled. If false, completion proposal trigger + * chars are ignored and only Enter key can be used to select a proposal. + * + * @return whether completion trigger char are enabled. + * @see ICompletionProposalExtension#getTriggerCharacters() + * @since 3.15 + */ + public boolean isCompletionProposalTriggerCharsEnabled() { + return fCompletionProposalTriggerCharsEnabled; + } + + /** + * Set whether completion trigger chars are enabled. If set to false, completion proposal + * trigger chars are ignored and only Enter key can be used to select a proposal. + * + * @param enable whether current content assistant should consider completion trigger chars. + * @see ICompletionProposalExtension#getTriggerCharacters() + * @since 3.15 + */ + public void enableCompletionProposalTriggerChars(boolean enable) { + fCompletionProposalTriggerCharsEnabled= enable; + } } |