From 9869cbc9bacf716995a616434f9d635928dcca01 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Tue, 19 Sep 2017 00:11:38 -0400 Subject: [PATCH] Bug 522461 - NPE in ParameterGuesser.createVariable() Change-Id: I68c2588866c9b4228134643bfa246452ee483c80 --- .../cdt/internal/ui/text/contentassist/ParameterGuesser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java index 0a844ada7ca..4f579d87f59 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuesser.java @@ -145,7 +145,7 @@ public class ParameterGuesser { throws CModelException { IType elementType = getType(element); String elementName = element.getName(); - if (elementType != null + if (elementType != null && enclosingType != null && (elementType.toString().equals(enclosingType.toString()) || elementType.isSameType(enclosingType) || isImplicitlyConvertible(enclosingType, elementType, ast)