From ec2d06f42a5bbf83221d164eca6fe1ab82c38a61 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Wed, 4 Apr 2012 19:05:38 +0400
Subject: [PATCH] IDEA-84070 fix '@null' red code in android xml files

---
 .../android/dom/converters/ResourceReferenceConverter.java    | 4 ++++
 plugins/android/testData/dom/layout/hl.xml                    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java b/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java
index d02dcee87ddd..30f6d2608222 100644
--- a/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java
+++ b/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java
@@ -314,6 +314,10 @@ public class ResourceReferenceConverter extends ResolvingConverter<ResourceValue
 
   @NotNull
   public PsiReference[] createReferences(GenericDomValue<ResourceValue> value, PsiElement element, ConvertContext context) {
+    if ("@null".equals(value.getStringValue())) {
+      return PsiReference.EMPTY_ARRAY;
+    }
+
     Module module = context.getModule();
     if (module != null) {
       AndroidFacet facet = AndroidFacet.getInstance(module);
diff --git a/plugins/android/testData/dom/layout/hl.xml b/plugins/android/testData/dom/layout/hl.xml
index 519ff42443e3..b12d6da966ed 100644
--- a/plugins/android/testData/dom/layout/hl.xml
+++ b/plugins/android/testData/dom/layout/hl.xml
@@ -9,6 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dip"
         android:text="@string/welcome"
+        android:padding="@null"
     />
 
     <TextView
@@ -16,6 +17,7 @@
           android:layout_height="wrap_content"
           android:layout_marginBottom="10dip"
           android:text="<error>@string/animation_1_instructions</error>"
+          android:padding="<error>@nul</error>"
       />
 
   <RadioGroup android:layout_width="fill_parent" android:layout_height="wrap_content"/>