From 42bb6673a1717acc8a9c969804338e45f4cf5bcc Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Fri, 16 Apr 2004 19:42:20 +0000 Subject: [PATCH] Fix for bug#44370 --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../internal/ui/text/contentassist/ResultCollector.java | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 134b4278f7e..33b44336847 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2004-04-16 Hoda Amer + Fix for bug#44370 : [Content Assist] function-style macros have arguments + 2004-04-16 David Inglis Register our adapter factory though new extension point diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ResultCollector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ResultCollector.java index 67606d80199..74b5fe2349d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ResultCollector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ResultCollector.java @@ -280,7 +280,15 @@ public class ResultCollector extends CompletionRequestorAdaptor { // create proposal and add it to completions list CCompletionProposal proposal = createProposal(replaceString, displayString, infoString.toString(), arguments, image, completionStart, completionLength, relevance); + proposal.setTriggerCharacters(VAR_TRIGGERS); + + boolean userMustCompleteParameters= (arguments != null && arguments.length() > 0); + if (userMustCompleteParameters) { + // set the cursor before the closing bracket + proposal.setCursorPosition(replaceString.length() - 1); + } + completions.add(proposal); }