From 7d0db414636ad8c5219166a257b6bf61cc46c1c8 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Fri, 23 Apr 2004 03:09:03 +0000 Subject: [PATCH] Partial fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=59686 --- core/org.eclipse.cdt.core/parser/ChangeLog-parser | 3 +++ .../org/eclipse/cdt/internal/core/parser/Parser.java | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/ChangeLog-parser b/core/org.eclipse.cdt.core/parser/ChangeLog-parser index cfa2fee841e..a675da122a1 100644 --- a/core/org.eclipse.cdt.core/parser/ChangeLog-parser +++ b/core/org.eclipse.cdt.core/parser/ChangeLog-parser @@ -1,3 +1,6 @@ +2004-04-22 John Camelon + Partial fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=59686 + 2004-04-22 John Camelon Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=59507 diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java index 036239295bd..3be854f37c9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java @@ -2629,22 +2629,26 @@ public abstract class Parser extends ExpressionParser implements IParser { case IToken.t_virtual : consume(IToken.t_virtual); + setCompletionValues(astClassSpec.getOwnerScope(), CompletionKind.CLASS_REFERENCE, KeywordSets.Key.EMPTY ); isVirtual = true; break; case IToken.t_public : - consume(); + consume(); + setCompletionValues(astClassSpec.getOwnerScope(), CompletionKind.CLASS_REFERENCE, KeywordSets.Key.EMPTY ); break; case IToken.t_protected : consume(); visibility = ASTAccessVisibility.PROTECTED; + setCompletionValues(astClassSpec.getOwnerScope(), CompletionKind.CLASS_REFERENCE, KeywordSets.Key.EMPTY ); break; case IToken.t_private : visibility = ASTAccessVisibility.PRIVATE; consume(); + setCompletionValues(astClassSpec.getOwnerScope(), CompletionKind.CLASS_REFERENCE, KeywordSets.Key.EMPTY ); break; case IToken.tCOLONCOLON : case IToken.tIDENTIFIER : - nameDuple = name(astClassSpec.getOwnerScope(), CompletionKind.CLASS_REFERENCE, Key.EMPTY ); + nameDuple = name(astClassSpec.getOwnerScope(), CompletionKind.CLASS_REFERENCE, Key.BASE_SPECIFIER ); break; case IToken.tCOMMA : try @@ -2668,6 +2672,7 @@ public abstract class Parser extends ExpressionParser implements IParser visibility = ASTAccessVisibility.PUBLIC; nameDuple = null; consume(); + setCompletionValues(astClassSpec.getOwnerScope(), CompletionKind.CLASS_REFERENCE, KeywordSets.Key.BASE_SPECIFIER ); continue baseSpecifierLoop; default : break baseSpecifierLoop;