From 7ad0fd56f3e7516ee82fd13e90263b78a8221521 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 13 Sep 2012 21:02:09 +0400
Subject: [PATCH] EA-39175 Completion fails if MultiDeclaration is present on
 top level in file

---
 .../lang/resolve/lazy/AbstractLazyMemberScope.java   |  5 +++--
 .../lazy/AbstractPsiBasedDeclarationProvider.java    |  2 +-
 .../completion/basic/InFileWithMultiDeclaration.kt   | 12 ++++++++++++
 .../jet/completion/JetBasicCompletionTest.java       |  4 ++++
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 idea/testData/completion/basic/InFileWithMultiDeclaration.kt

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
index 93c54fc2bea..72f11b40b0e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
@@ -245,8 +245,9 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
                         getProperties(name);
                     }
                 }
-                else if (declaration instanceof JetTypedef) {
-                    // Do nothing as typedefs are not supported
+                else if (declaration instanceof JetTypedef || declaration instanceof JetMultiDeclaration) {
+                    // Do nothing for typedefs as they are not supported.
+                    // MultiDeclarations are not supported on global level too.
                 }
                 else {
                     throw new IllegalArgumentException("Unsupported declaration kind: " + declaration);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
index cf236fc91cc..3da46ff4be8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
@@ -64,7 +64,7 @@ public abstract class AbstractPsiBasedDeclarationProvider implements Declaration
             JetClassOrObject classOrObject = (JetClassOrObject) declaration;
             classesAndObjects.put(classOrObject.getNameAsName(), classOrObject);
         }
-        else if (declaration instanceof JetParameter || declaration instanceof JetTypedef) {
+        else if (declaration instanceof JetParameter || declaration instanceof JetTypedef || declaration instanceof JetMultiDeclaration) {
             // Do nothing, just put it into allDeclarations is enough
         }
         else {
diff --git a/idea/testData/completion/basic/InFileWithMultiDeclaration.kt b/idea/testData/completion/basic/InFileWithMultiDeclaration.kt
new file mode 100644
index 00000000000..f8d6272edd1
--- /dev/null
+++ b/idea/testData/completion/basic/InFileWithMultiDeclaration.kt
@@ -0,0 +1,12 @@
+data class LocalData(val first : Int, val second : Int)
+
+val (localFirst, localSecond) = LocalData(11, 12)
+
+fun test() {
+  local<caret>
+}
+
+// Test that this test won't fail with exception
+// Regression for EA-39175
+
+// ABSENT: localFirst, localSecond
diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java
index 30a9618ec4c..e46e72d3edf 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java
@@ -100,6 +100,10 @@ public class JetBasicCompletionTest extends JetCompletionTestBase {
         doTest();
     }
 
+    public void testInFileWithMultiDeclaration() {
+        doTest();
+    }
+
     public void testInFileWithTypedef() {
         doTest();
     }