From a2b594c60dc53292c09c45079f12a39bcd6639ec Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Fri, 1 May 2020 15:32:26 +0200
Subject: [PATCH] correct reference check

GitOrigin-RevId: a0be6d4d6d3d9c217ac1d3b477c29b951318273f
---
 .../com/intellij/uiDesigner/binding/FieldFormReference.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java
index 7120505463aa..ebc60be2d8fb 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FieldFormReference.java
@@ -7,9 +7,6 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Eugene Zhuravlev
- */
 public final class FieldFormReference extends ReferenceInForm {
   private final PsiReference myClassReference;
   private final String myComponentClassName;
@@ -59,7 +56,8 @@ public final class FieldFormReference extends ReferenceInForm {
     }
 
     final PsiField field = (PsiField)element;
-    if (!myClassReference.equals(field.getContainingClass())) {
+    PsiClass fieldClass = field.getContainingClass();
+    if (fieldClass == null || !myClassReference.isReferenceTo(fieldClass)) {
       throw new IncorrectOperationException();
     }
     final String text = field.getName();