From d2c7393544e64b60ef52f86cd8526c6a5af0fe1d Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Wed, 4 Apr 2007 15:58:48 +0000 Subject: [PATCH] Patch for Bryan - 180885 - handles content assist of names after parens which is ambiguious in C. --- .../cdt/internal/core/dom/parser/c/GNUCSourceParser.java | 4 ++-- .../ui/tests/text/contentassist2/CompletionTests_PlainC.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java index dba24e9a19e..c0319d45e1b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java @@ -850,8 +850,8 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser { startCastExpression=mark(); castExpression = castExpression(); break; - case IToken.tEOC: - break; +// case IToken.tEOC: // support for completion removed +// break; // in favour of another parse tree default: needBack = true; // throw backtrack; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java index fb447f7f178..f2bdd18fde7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java @@ -66,7 +66,7 @@ public class CompletionTests_PlainC extends AbstractContentAssistTest { //void test() { // int myvar; // (my/*cursor*/ - public void _testLocalVariableAfterOpeningParen_Bug180885() throws Exception { + public void testLocalVariableAfterOpeningParen_Bug180885() throws Exception { final String[] expected= { "myvar" };