From 68e19daf1e937c049918a93d51f1d42fe9774780 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Wed, 11 Jan 2017 00:54:55 -0500 Subject: [PATCH] Bug 509191 - Do not create parameter guessing proposal if we know we are not calling the function Change-Id: I7e45501707e0f58ed6d8745506a3519e29c0763a --- .../cdt/ui/tests/text/contentassist2/CompletionTests.java | 4 ++-- .../ui/text/contentassist/DOMCompletionProposalComputer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java index 4eae9b50d14..355c14019cd 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java @@ -1478,7 +1478,7 @@ public class CompletionTests extends AbstractContentAssistTest { // } // using N::f/*cursor*/ public void testUsingDeclaration_379631() throws Exception { - final String[] expected= { "foo()" }; + final String[] expected= { "foo;" }; assertCompletionResults(fCursorOffset, expected, REPLACEMENT); } @@ -1651,7 +1651,7 @@ public class CompletionTests extends AbstractContentAssistTest { // } // using N::fo/*cursor*/; public void testUsingCompletionWithFollowingSemicolon() throws Exception { - final String[] expected = { "foo()" }; + final String[] expected = { "foo" }; assertContentAssistResults(fCursorOffset, expected, true, REPLACEMENT); final String[] expectedInformation = { "null" }; assertContentAssistResults(fCursorOffset, expectedInformation, true, CONTEXT); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java index 56ebb345e3a..04b9904f1dc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java @@ -680,7 +680,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer // The ParameterGuessingProposal will be active if the function accepts parameters and the content // assist is invoked before typing any parameters. Otherwise, the normal parameter hint proposal will // be added. - if (function.getParameters() != null && function.getParameters().length != 0 + if (canBeCall && function.getParameters() != null && function.getParameters().length != 0 && isBeforeParameters(cContext)) { proposals.add(ParameterGuessingProposal.createProposal(cContext, fAvailableElements, proposal, function, fPrefix, fGuessArguments));