diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index 63d8463b360..0fc82ab0de9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Markus Schorn (Wind River Systems) + * Bryan Wilkinson (QNX) - https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; @@ -4471,6 +4472,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { break; case IToken.tCOLONCOLON: case IToken.tIDENTIFIER: + case IToken.tCOMPLETION: // to get templates right we need to use the class as the scope ITokenDuple d = name(); name = createName(d); @@ -4506,6 +4508,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { continue baseSpecifierLoop; case IToken.tLBRACE: + case IToken.tEOC: if (name == null) name = createName(); baseSpec = createBaseSpecifier(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java index aac62c4d8f2..ae7bae90940 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial implementation * Markus Schorn (Wind River Systems) + * Bryan Wilkinson (QNX) - https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 *******************************************************************************/ package org.eclipse.cdt.internal.core.parser.scanner2; @@ -2036,7 +2037,7 @@ abstract class BaseScanner implements IScanner { } // We've run out of contexts, our work is done here - return contentAssistMode ? eocToken : null; + return contentAssistMode ? new SimpleToken(IToken.tCOMPLETION, Integer.MAX_VALUE, null, Integer.MAX_VALUE) : null; } protected CharTable ident = new CharTable(1024); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix.java index afc25b3235a..d8cf811ce73 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix.java @@ -41,8 +41,8 @@ public class CompletionTest_ArgumentType_NoPrefix extends CompletionProposalsBa public CompletionTest_ArgumentType_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix2.java index 7f1f0eb8ebf..347c12456ce 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_NoPrefix2.java @@ -41,8 +41,8 @@ public class CompletionTest_ArgumentType_NoPrefix2 extends CompletionProposalsB public CompletionTest_ArgumentType_NoPrefix2(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java index 3b4e9d76d97..92c3a2536c0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java @@ -33,20 +33,11 @@ public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBase "anEnumeration", // missing proposal: "AStruct" - /* FIXME: Additional results which should not be there. Run with trace enabled to reproduce: -Result: aFirstEnum -Result: aFunction(void) bool -Result: anotherFunction(void) void -Result: aSecondEnum -Result: aThirdEnum -Result: aVariable : int - */ }; public CompletionTest_ArgumentType_Prefix(String name) { super(name); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724 - // and https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 setExpectFailure(109724); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java index 12e220d7a07..55d9cebe843 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java @@ -33,20 +33,11 @@ public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBas "anEnumeration", // missing proposal: "AStruct" - /* FIXME: Additional results which should not be there. Run with trace enabled to reproduce: -Result: aFirstEnum -Result: aFunction(void) bool -Result: anotherFunction(void) void -Result: aSecondEnum -Result: aThirdEnum -Result: aVariable : int - */ }; public CompletionTest_ArgumentType_Prefix2(String name) { super(name); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724 - // and https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 setExpectFailure(109724); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java index 91a02330d85..4b6910c2057 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java @@ -36,8 +36,8 @@ public class CompletionTest_ClassReference_NoPrefix extends CompletionProposals public CompletionTest_ClassReference_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java index 53ec1ad4653..69011004f87 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java @@ -30,22 +30,12 @@ public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBa private final String[] expectedResults = { "aClass", //$NON-NLS-1$ "anotherClass" //$NON-NLS-1$ - /* FIXME: Additional results which should not be there. Run with trace enabled to reproduce: - Result: aFirstEnum - Result: aFunction(void) bool - Result: aNamespace - Result: anEnumeration - Result: anotherFunction(void) void - Result: aSecondEnum - Result: aThirdEnum - Result: aVariable : int - */ }; public CompletionTest_ClassReference_Prefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 - setExpectFailure(88787); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java index 3caa829243b..bc82bb0e41a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java @@ -30,14 +30,15 @@ public class CompletionTest_ConstructorReference extends CompletionProposalsBas private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { + // missing proposals: "xOtherClass(char*)", "xOtherClass(int)" }; public CompletionTest_ConstructorReference(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // unknown failure + setExpectFailure(77777); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java index d037eb26dd0..7abd3e5f4fa 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java @@ -29,13 +29,21 @@ public class CompletionTest_ExceptionReference_NoPrefix extends CompletionPropo private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { - "..." // TODO + "AStruct", + "XStruct", + "aClass", + "aNamespace", + "anEnumeration", + "anotherClass", + "xEnumeration", + "xNamespace", + "xOtherClass" }; public CompletionTest_ExceptionReference_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java index 8b856abaf0c..eff25760594 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java @@ -35,22 +35,11 @@ public class CompletionTest_ExceptionReference_Prefix extends CompletionProposa "anEnumeration", // missing proposal: "AStruct" - /* FIXME: Additional results which should not be there. Run with trace enabled to reproduce: -Result: aFirstEnum -Result: aFunction(void) bool -Result: anotherField : int -Result: anotherFunction(void) void -Result: anotherMethod(void) void -Result: aSecondEnum -Result: aThirdEnum -Result: aVariable : int - */ }; public CompletionTest_ExceptionReference_Prefix(String name) { super(name); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724 - // and https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 setExpectFailure(109724); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java index 2df5aa1e2c1..3ea35f01818 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java @@ -26,13 +26,22 @@ public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseT private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { - "" // TODO + "AStruct", + "XStruct", + "aClass", + "aNamespace", + "aThirdClass", + "anEnumeration", + "anotherClass", + "xEnumeration", + "xNamespace", + "xOtherClass" }; public CompletionTest_FieldType_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java index f22bc5bc3ea..0af1921f54e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java @@ -27,13 +27,22 @@ public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBase private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { - "" // TODO + "AStruct", + "XStruct", + "aClass", + "aNamespace", + "aThirdClass", + "anEnumeration", + "anotherClass", + "xEnumeration", + "xNamespace", + "xOtherClass" }; public CompletionTest_FieldType_NoPrefix2(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java index 7c4ec2f9547..bea45e1af72 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java @@ -32,20 +32,11 @@ public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTes "anEnumeration", // missing proposal: "AStruct" - /* FIXME: Additional results which should not be returned. Run with tracing enabled to reproduce: -Result: aFirstEnum -Result: aFunction(void) bool -Result: anotherFunction(void) void -Result: aSecondEnum -Result: aThirdEnum -Result: aVariable : int - */ }; public CompletionTest_FieldType_Prefix(String name) { super(name); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724 - // and https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 setExpectFailure(109724); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java index e2b0d195838..1f7f26443fa 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java @@ -27,15 +27,27 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { + // missing results: "aMacro(x)", "Debug", "xMacro(x,y)" + /* superfluous results: + AStruct + XStruct + aClass + aNamespace + anEnumeration + anotherClass + xEnumeration + xNamespace + xOtherClass +*/ }; public CompletionTest_MacroRef_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708 + setExpectFailure(171708); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java index 30712556848..e09a44baed4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java @@ -27,13 +27,14 @@ public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = "D"; private final String[] expectedResults = { + // missing result: "Debug" }; public CompletionTest_MacroRef_Prefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708 + setExpectFailure(171708); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java index dbdf30f1b1b..20a4d35a439 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java @@ -33,8 +33,8 @@ public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBa public CompletionTest_NamespaceRef_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java index 96c5a9eb557..d428176016f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java @@ -29,13 +29,12 @@ public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBase private final String expectedPrefix = "a"; private final String[] expectedResults = { "aNamespace" - /* FIXME: extra results */ }; public CompletionTest_NamespaceRef_Prefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 - setExpectFailure(88787); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java index 7bd10e8a0e7..604b97d69f6 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java @@ -32,13 +32,19 @@ public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposa "anotherClass", "AStruct", "xOtherClass", - "XStruct" + "XStruct", + "aNamespace", + "xNamespace" + /* extra results: + anEnumeration + xEnumeration + */ }; public CompletionTest_NewTypeReference_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // unknown problem + setExpectFailure(77777); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java index 47d8b94f260..135a26b3501 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java @@ -30,23 +30,17 @@ public class CompletionTest_NewTypeReference_Prefix extends CompletionProposals private final String[] expectedResults = { "aClass", "anotherClass", + "aNamespace", // missing proposal: "AStruct" - /* FIXME: Additional results which should not be there. Run with trace enabled to reproduce: -Result: aFirstEnum -Result: aFunction(void) bool -Result: anotherField : int -Result: anotherFunction(void) void -Result: anotherMethod(void) void -Result: aSecondEnum -Result: aThirdEnum -Result: aVariable : int - */ }; + // extra proposal: + // anEnumeration + + }; public CompletionTest_NewTypeReference_Prefix(String name) { super(name); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724 - // and https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 setExpectFailure(109724); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java index 1a4de1bd90b..30bb7a75d74 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java @@ -27,19 +27,17 @@ public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProp private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { - "Foo", - "x : int", + "Foo(void) ", "bar(void) void", - "fum(void) void" + "fum(void) void", + // missing: + "x : int" }; - /* FIXME: Unexpected results; run with tracing to reproduce -Result: y : int - */ public CompletionTest_ScopedReference_NonCodeScope(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 - setExpectFailure(88787); + // unknown problem + setExpectFailure(77777); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java index 04bc4eb0001..2c048ea9e76 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java @@ -28,14 +28,38 @@ public class CompletionTest_SingleName_Method_NoPrefix extends CompletionPropos //TODO Hoda - please update this constant with what it is supposed to be private final String[] expectedResults = { + "AStruct", + "XStruct", + "aClass", + "aFirstEnum", + "aFunction(void) bool", + "aNamespace", + "aSecondEnum", + "aThirdEnum", + "aVariable : int", + "anEnumeration", + "anotherClass", "anotherField : int", - "anotherMethod() void" + "anotherFunction(void) void", + "anotherMethod(void) void", + "xEnumeration", + "xFirstEnum", + "xFunction(void) bool", + "xNamespace", + "xOtherClass", + "xOtherFunction(void) void", + "xSecondEnum", + "xThirdEnum", + "xVariable : int", + "~anotherClass(void) " + // extra result + // "operator =(const anotherClass &) anotherClass &", }; public CompletionTest_SingleName_Method_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java index aa5f75b0b52..f16bfd56d44 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_NoPrefix.java @@ -26,46 +26,47 @@ public class CompletionTest_SingleName_NoPrefix extends CompletionProposalsBase private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { - "x : int" -// "aVariable : int", -// "xVariable : int", -// "aFunction() bool", -// "anotherFunction() void", -// "foo(int) void", -// "xFunction() bool", -// "xOtherFunction() void", -// "aClass", -// "anotherClass", -// "xOtherClass", -// "AStruct", -// "XStruct", -// "aNamespace", -// "xNamespace", -// "anEnumeration", -// "xEnumeration", -// "aFirstEnum", -// "aSecondEnum", -// "aThirdEnum", -// "xFirstEnum", -// "xSecondEnum", -// "xThirdEnum", -// "__cplusplus", -// "__DATE__", -// "__FILE__", -// "__LINE__", -// "__STDC__", -// "__STDC_HOSTED__", -// "__STDC_VERSION__", -// "__TIME__", -// "AMacro(x)", -// "DEBUG", -// "XMacro(x,y)" + "x : int", + "aVariable : int", + "xVariable : int", + "aFunction(void) bool", + "anotherFunction(void) void", + "foo(int) void", + "xFunction(void) bool", + "xOtherFunction(void) void", + "aClass", + "anotherClass", + "xOtherClass", + "AStruct", + "XStruct", + "aNamespace", + "xNamespace", + "anEnumeration", + "xEnumeration", + "aFirstEnum", + "aSecondEnum", + "aThirdEnum", + "xFirstEnum", + "xSecondEnum", + "xThirdEnum", + // missing: + "__cplusplus", + "__DATE__", + "__FILE__", + "__LINE__", + "__STDC__", + "__STDC_HOSTED__", + "__STDC_VERSION__", + "__TIME__", + "AMacro(x)", + "DEBUG", + "XMacro(x,y)" }; public CompletionTest_SingleName_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708 + setExpectFailure(171708); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java index 234629573f2..0beaa1101ee 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java @@ -25,11 +25,15 @@ public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTe private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = "AM"; private final String[] expectedResults = { + // missing results "AMacro(x)" }; public CompletionTest_SingleName_Prefix(String name) { super(name); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=171708 +// setExpectFailure(171708); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java index 23ad4987a56..c10120d99d6 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java @@ -29,32 +29,12 @@ public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTes private final String[] expectedResults = { "aNamespace", "xNamespace" - /* FIXME: Additional results which should not be there. Run with trace enabled to reproduce: -Result: aClass -Result: aFirstEnum -Result: aFunction(void) bool -Result: anEnumeration -Result: anotherClass -Result: anotherFunction(void) void -Result: aSecondEnum -Result: AStruct -Result: aThirdEnum -Result: aVariable : int -Result: xEnumeration -Result: xFirstEnum -Result: xFunction(void) bool -Result: xOtherClass -Result: xOtherFunction(void) void -Result: xSecondEnum -Result: XStruct -Result: xThirdEnum -Result: xVariable : int - */ }; + }; public CompletionTest_TypeRef_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 - setExpectFailure(88787); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java index ce4efe08862..a34b8acfe0f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java @@ -29,22 +29,12 @@ public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest{ private final String expectedPrefix = "a"; private final String[] expectedResults = { "aNamespace" - /* FIXME: Additional results which should not be there. Run with trace enabled to reproduce: -Result: aClass -Result: aFirstEnum -Result: aFunction(void) bool -Result: anEnumeration -Result: anotherClass -Result: anotherFunction(void) void -Result: aSecondEnum -Result: aThirdEnum -Result: aVariable : int - */ }; + }; public CompletionTest_TypeRef_Prefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 - setExpectFailure(88787); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java index 6894d62c2c3..46da1847acb 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java @@ -27,19 +27,18 @@ public class CompletionTest_VariableType_NestedPrefix extends CompletionProposa private final String headerFileFullPath ="resources/contentassist/" + headerFileName; private final String expectedPrefix = ""; private final String[] expectedResults = { - "Foo", - "DEF", + "Foo(void) ", "bar(void) void", "fum(void) void", + // missing: + "DEF", "x : int" }; -/* FIXME: Unexpected result. Rerun with tracing to reproduce -Result: y : int - */ + public CompletionTest_VariableType_NestedPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 - setExpectFailure(88787); + // unknown problem + setExpectFailure(77777); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java index 31b03f6d041..a0aaef4bc45 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java @@ -38,8 +38,8 @@ public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBa public CompletionTest_VariableType_NoPrefix(String name) { super(name); - // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=151207 - setExpectFailure(151207); + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=169860 + setExpectFailure(169860); } public static Test suite() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java index f35604476fb..a8ba31bd5fc 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java @@ -31,20 +31,11 @@ public class CompletionTest_VariableType_Prefix extends CompletionProposalsBase "anEnumeration", // missing proposal: "AStruct" - /* Superfluous proposals: - "aFirstEnum", - "aFunction(void) bool", - "aSecondEnum", - "aThirdEnum", - "aVariable : int", - "anotherFunction(void) void" - */ }; public CompletionTest_VariableType_Prefix(String name) { super(name); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=109724 - // and https://bugs.eclipse.org/bugs/show_bug.cgi?id=88787 setExpectFailure(109724); }