From 932362f7e77f9b6a6e002f9f3ec696c04acff8f0 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 18 Oct 2012 12:35:22 +0200
Subject: [PATCH] validity assertions (EA-39233)

---
 .../completion/JavaMemberNameCompletionContributor.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
index ca2c38a8f61b..f229536f13cc 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
@@ -376,11 +376,15 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
 
         for (final PsiField field : fields) {
           if (field == element) continue;
-          assert field.isValid();
+
+          assert field.isValid() : "invalid field: " + field;
+          PsiType fieldType = field.getType();
+          assert fieldType.isValid() : "invalid field type: " + field + "; " + fieldType;
+
           final PsiModifierList modifierList = field.getModifierList();
           if (staticContext && (modifierList != null && !modifierList.hasModifierProperty(PsiModifier.STATIC))) continue;
 
-          if (field.getType().equals(varType)) {
+          if (fieldType.equals(varType)) {
             final String getterName = PropertyUtil.suggestGetterName(field.getProject(), field);
             if ((psiClass.findMethodsByName(getterName, true).length == 0 ||
                  psiClass.findMethodBySignature(PropertyUtil.generateGetterPrototype(field), true) == null)) {