From e05a9efeab04ad205ba23884a8a761386267c681 Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Tue, 21 May 2013 14:20:41 +0400
Subject: [PATCH] Don't create stubs for properties in delegate expression

---
 .../psi/stubs/elements/JetStubElementType.java    | 15 +++++++++++----
 .../jetbrains/jet/plugin/stubs/JetStubsTest.java  |  6 ++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java
index 434e812fe69..4cddb31a310 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java
@@ -23,10 +23,7 @@ import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetBlockExpression;
-import org.jetbrains.jet.lang.psi.JetExpression;
-import org.jetbrains.jet.lang.psi.JetFunctionLiteral;
-import org.jetbrains.jet.lang.psi.JetWithExpressionInitializer;
+import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.plugin.JetLanguage;
 
 public abstract class JetStubElementType<StubT extends StubElement, PsiT extends PsiElement> extends IStubElementType<StubT, PsiT> {
@@ -67,6 +64,16 @@ public abstract class JetStubElementType<StubT extends StubElement, PsiT extends
             }
         }
 
+        // Don't create stubs if declaration is inside property delegate
+        @SuppressWarnings("unchecked") JetPropertyDelegate delegate =
+                PsiTreeUtil.getParentOfType(psi, JetPropertyDelegate.class, true, JetBlockExpression.class);
+        if (delegate != null) {
+            JetExpression delegateExpression = delegate.getExpression();
+            if (PsiTreeUtil.isAncestor(delegateExpression, psi, true)) {
+                return false;
+            }
+        }
+
         return super.shouldCreateStub(node);
     }
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
index c203b293dca..20d53feec13 100644
--- a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
@@ -129,6 +129,12 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
                     "    VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n");
     }
 
+    public void testNotStorePropertyFromDelegate() {
+        doBuildTest("val a by kotlin.\n val b = 1",
+                    "PsiJetFileStubImpl[package=]\n" +
+                    "  PROPERTY:PsiJetPropertyStubImpl[val top topFQName=a name=a typeText=null bodyText=null]\n");
+    }
+
     public void testNotStorePropertiesFrom() {
         doBuildTest("class Test() {\n" +
                     "    val test = 12;\n" +