From 390e03694a3daa4a76f4e7f5d401679ab94c1c62 Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Wed, 2 Jun 2004 19:09:25 +0000 Subject: [PATCH] fix NPEs (bug 65145) --- .../cdt/internal/ui/text/contentassist/CompletionEngine.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java index 3d4b25560f2..8c64d8586fb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java @@ -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());