| author | hbehrens | 2008-11-06 06:49:45 (EST) |
|---|---|---|
| committer | sefftinge | 2008-11-06 06:49:45 (EST) |
| commit | d8147b87cd15b781f80edd70a084221b82567c7f (patch) (side-by-side diff) | |
| tree | 8b2ff41517bd0a105e00214a482b7ece7dd4df3e | |
| parent | 655193afc5bc6431f5a0c28c22dbff770698782d (diff) | |
| download | org.eclipse.xtext-d8147b87cd15b781f80edd70a084221b82567c7f.zip org.eclipse.xtext-d8147b87cd15b781f80edd70a084221b82567c7f.tar.gz org.eclipse.xtext-d8147b87cd15b781f80edd70a084221b82567c7f.tar.bz2 | |
* Fixed some problems with CA
* changed default behavior of xrefs that cannot be resolved: All Candidates -> None
| -rw-r--r-- | plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessor.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessor.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessor.java index 69cece4..c972925 100644 --- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessor.java +++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/DefaultContentAssistProcessor.java @@ -46,6 +46,7 @@ import org.eclipse.xtext.ui.core.editor.model.XtextDocument; /** * @author Michael Clay - Initial contribution and API * @author Dennis Hübner - Initial contribution and API + * @author Heiko Behrens */ public class DefaultContentAssistProcessor implements IContentAssistProcessor { @@ -102,7 +103,7 @@ public class DefaultContentAssistProcessor implements IContentAssistProcessor { List<EObject> resolvedElementOrRuleList = resolveElement(nextElement); collectCompletionProposalList(resolvedElementOrRuleList, completionProposalList, xtextDocument, - currentLeafNode, prefix, offset); + lastCompleteNode, prefix, offset); } if (completionProposalList != null) { @@ -288,7 +289,7 @@ public class DefaultContentAssistProcessor implements IContentAssistProcessor { } private void collectCompletionProposalList(List<EObject> resolvedElementOrRuleList, - List<ICompletionProposal> completionProposalList, IDocument document, LeafNode currentLeafNode, + List<ICompletionProposal> completionProposalList, IDocument document, AbstractNode currentLeafNode, String prefix, final int offset) { for (Iterator<EObject> elementOrRuleIterator = resolvedElementOrRuleList.iterator(); elementOrRuleIterator .hasNext();) { |