From 45c42a26d57e45b0115da9a3a9dba6974b995967 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 19 Nov 2009 13:32:01 +0300 Subject: [PATCH] NPE fixed --- .../src/com/intellij/codeInsight/lookup/LookupElementBuilder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java index 5b7d7df7d4..c76b4916f9 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java +++ b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java @@ -210,10 +210,14 @@ public class LookupElementBuilder extends LookupElement { LookupElementBuilder that = (LookupElementBuilder)o; - if (myInsertHandler != null ? !myInsertHandler.getClass().equals(that.myInsertHandler.getClass()) : that.myInsertHandler != null) return false; + final InsertHandler insertHandler = that.myInsertHandler; + if (myInsertHandler != null && insertHandler != null ? !myInsertHandler.getClass().equals(insertHandler.getClass()) + : myInsertHandler != insertHandler) return false; if (!myLookupString.equals(that.myLookupString)) return false; if (!myObject.equals(that.myObject)) return false; - if (myRenderer != null ? !myRenderer.getClass().equals(that.myRenderer.getClass()) : that.myRenderer != null) return false; + + final LookupElementRenderer renderer = that.myRenderer; + if (myRenderer != null && renderer != null ? !myRenderer.getClass().equals(renderer.getClass()) : myRenderer != renderer) return false; return true; } -- 2.11.4.GIT