mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

fix NPEs (bug 65145)

Browse source
This commit is contained in:
Andrew Niefer 2004-06-02 19:09:25 +00:00
parent 458a70dd54
commit 390e03694a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
View file

@ -705,7 +705,7 @@ public class CompletionEngine implements RelevanceConstants {
{ {
IASTNode.LookupKind[] kinds = new IASTNode.LookupKind[]{ IASTNode.LookupKind.STRUCTURES }; IASTNode.LookupKind[] kinds = new IASTNode.LookupKind[]{ IASTNode.LookupKind.STRUCTURES };
ILookupResult result = lookup( searchNode, completionNode.getFunctionName(), kinds, null, null ); ILookupResult result = lookup( searchNode, completionNode.getFunctionName(), kinds, null, null );
if( result.getResultsSize() == 1 ){ if( result != null && result.getResultsSize() == 1 ){
IASTClassSpecifier cls = (IASTClassSpecifier) result.getNodes().next(); IASTClassSpecifier cls = (IASTClassSpecifier) result.getNodes().next();
kinds[ 0 ] = IASTNode.LookupKind.CONSTRUCTORS; kinds[ 0 ] = IASTNode.LookupKind.CONSTRUCTORS;
result = lookup( searchNode, completionNode.getCompletionPrefix(), kinds, cls, completionNode.getFunctionParameters() ); result = lookup( searchNode, completionNode.getCompletionPrefix(), kinds, cls, completionNode.getFunctionParameters() );
@ -738,6 +738,7 @@ public class CompletionEngine implements RelevanceConstants {
kinds = new IASTNode.LookupKind[] { IASTNode.LookupKind.ALL }; kinds = new IASTNode.LookupKind[] { IASTNode.LookupKind.ALL };
ILookupResult result = lookup(completionNode.getCompletionScope(), prefix, kinds, completionNode.getCompletionContext(), completionNode.getFunctionParameters()); ILookupResult result = lookup(completionNode.getCompletionScope(), prefix, kinds, completionNode.getCompletionContext(), completionNode.getFunctionParameters());
if( result != null)
addToCompletions(result, false, false, functionsOnly ? result.getIndexOfNextParameter() : -1 ); addToCompletions(result, false, false, functionsOnly ? result.getIndexOfNextParameter() : -1 );
if( !functionsOnly ){ if( !functionsOnly ){