From e6e5c4483ddf281bd18d4497925886092b97d0d4 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Thu, 2 Jun 2016 02:03:18 -0400 Subject: [PATCH] Bug 495095 - Disable parameter guessing for CDT 9.0 Change-Id: Iee60d904a725a0ed50b21de2f85cbcf01df09aed --- .../ui/tests/text/contentassist2/ContentAssist2TestSuite.java | 4 ++-- .../cdt/internal/ui/preferences/CodeAssistPreferencePage.java | 4 ++-- .../ui/text/contentassist/DOMCompletionProposalComputer.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java index 354cb986d25..1f3016893fa 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/ContentAssist2TestSuite.java @@ -72,8 +72,8 @@ public class ContentAssist2TestSuite extends TestSuite { addTest(CompletionTests.suite()); addTest(CompletionTests_PlainC.suite()); addTest(ParameterHintTests.suite()); - addTest(CPPParameterGuessingTests.suite()); - addTest(CParameterGuessingTests.suite()); + //addTest(CPPParameterGuessingTests.suite()); + //addTest(CParameterGuessingTests.suite()); addTest(ShowCamelCasePreferenceTest.suite()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java index b0905b25928..7b3e57dced7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java @@ -108,8 +108,8 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { label = PreferencesMessages.CEditorPreferencePage_ContentAssistPage_insertCommonProposalAutomatically; addCheckBox(insertionGroup, label, ContentAssistPreference.PREFIX_COMPLETION, 0); - label = PreferencesMessages.CEditorPreferencePage_ContentAssistPage_guessArguments; - addCheckBox(insertionGroup, label, ContentAssistPreference.GUESS_ARGUMENTS, 0); + //label = PreferencesMessages.CEditorPreferencePage_ContentAssistPage_guessArguments; + //addCheckBox(insertionGroup, label, ContentAssistPreference.GUESS_ARGUMENTS, 0); //&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& // sorting and filtering 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 9f2ddd1e4f5..d0b865d386f 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 @@ -138,7 +138,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer protected List computeCompletionProposals(CContentAssistInvocationContext context, IASTCompletionNode completionNode, String prefix) { fPrefix = prefix; - fGuessArguments = getPreferenceStore().getBoolean(ContentAssistPreference.GUESS_ARGUMENTS); + fGuessArguments = false; // parameter guessing disabled for now (see bug 495095) fAvailableElements = fGuessArguments ? getDefinedElements(context) : Collections.emptyList(); List proposals = new ArrayList<>();