mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Added completion for qualified names. Fixed up the images for fields.

Browse source
This commit is contained in:
Doug Schaefer 2005-03-28 20:55:04 +00:00
parent 746bb4fda5
commit c47e2bcfca
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
View file

@ -375,6 +375,8 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
throwBacktrack(first.getOffset(), l.getEndOffset() throwBacktrack(first.getOffset(), l.getEndOffset()
- first.getOffset()); - first.getOffset());
case IToken.tIDENTIFIER: case IToken.tIDENTIFIER:
case IToken.tCOMPLETION:
case IToken.tEOC:
last = consume(); last = consume();
last = consumeTemplateArguments(last, argumentList); last = consumeTemplateArguments(last, argumentList);
if (last.getType() == IToken.tGT) if (last.getType() == IToken.tGT)
@ -4533,6 +4535,12 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
*/ */
protected IASTName createName(IToken token) { protected IASTName createName(IToken token) {
CPPASTName n = new CPPASTName(token.getCharImage()); CPPASTName n = new CPPASTName(token.getCharImage());
switch (token.getType()) {
case IToken.tCOMPLETION:
case IToken.tEOC:
createCompletionNode(token).addName(n);
break;
}
n.setOffsetAndLength(token.getOffset(), token.getLength()); n.setOffsetAndLength(token.getOffset(), token.getLength());
return n; return n;
} }

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
View file

@ -1517,6 +1517,8 @@ abstract class BaseScanner implements IScanner {
if (finished) { if (finished) {
if (contentAssistMode) { if (contentAssistMode) {
if (lastToken != null)
lastToken.setNext(nextToken);
lastToken = nextToken; lastToken = nextToken;
nextToken = eocToken; nextToken = eocToken;
return lastToken; return lastToken;

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
View file

@ -23,6 +23,8 @@ import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.IVariable;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPField;
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.contentassist.ICompletionContributor; import org.eclipse.cdt.ui.text.contentassist.ICompletionContributor;
@ -146,6 +148,18 @@ public class DOMCompletionContributor implements ICompletionContributor {
imageDescriptor = CElementImageProvider.getUnionImageDescriptor(); imageDescriptor = CElementImageProvider.getUnionImageDescriptor();
} else if (binding instanceof IFunction) { } else if (binding instanceof IFunction) {
imageDescriptor = CElementImageProvider.getFunctionImageDescriptor(); imageDescriptor = CElementImageProvider.getFunctionImageDescriptor();
} else if (binding instanceof ICPPField) {
switch (((ICPPField)binding).getVisibility()) {
case ICPPField.v_private:
imageDescriptor = CElementImageProvider.getFieldImageDescriptor(ASTAccessVisibility.PRIVATE);
break;
case ICPPField.v_protected:
imageDescriptor = CElementImageProvider.getFieldImageDescriptor(ASTAccessVisibility.PROTECTED);
break;
default:
imageDescriptor = CElementImageProvider.getFieldImageDescriptor(ASTAccessVisibility.PUBLIC);
break;
}
} else if (binding instanceof IVariable) { } else if (binding instanceof IVariable) {
imageDescriptor = CElementImageProvider.getVariableImageDescriptor(); imageDescriptor = CElementImageProvider.getVariableImageDescriptor();
} }