mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
fix NPEs (bug 65145)
This commit is contained in:
parent
458a70dd54
commit
390e03694a
1 changed files with 3 additions and 2 deletions
|
@ -705,7 +705,7 @@ public class CompletionEngine implements RelevanceConstants {
|
|||
{
|
||||
IASTNode.LookupKind[] kinds = new IASTNode.LookupKind[]{ IASTNode.LookupKind.STRUCTURES };
|
||||
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();
|
||||
kinds[ 0 ] = IASTNode.LookupKind.CONSTRUCTORS;
|
||||
result = lookup( searchNode, completionNode.getCompletionPrefix(), kinds, cls, completionNode.getFunctionParameters() );
|
||||
|
@ -738,7 +738,8 @@ public class CompletionEngine implements RelevanceConstants {
|
|||
kinds = new IASTNode.LookupKind[] { IASTNode.LookupKind.ALL };
|
||||
|
||||
ILookupResult result = lookup(completionNode.getCompletionScope(), prefix, kinds, completionNode.getCompletionContext(), completionNode.getFunctionParameters());
|
||||
addToCompletions(result, false, false, functionsOnly ? result.getIndexOfNextParameter() : -1 );
|
||||
if( result != null)
|
||||
addToCompletions(result, false, false, functionsOnly ? result.getIndexOfNextParameter() : -1 );
|
||||
|
||||
if( !functionsOnly ){
|
||||
List macros = lookupMacros(completionNode.getCompletionPrefix());
|
||||
|
|
Loading…
Add table
Reference in a new issue