From bb859ea0f68ab559dce3ebc98fc62d287bddcf91 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 1 Sep 2016 13:46:54 +0300
Subject: [PATCH] Misc: Do not use empty scope for KtParameter/KtTypeParameter
 (possible fix for EA-1185336)

---
 .../frontend/src/org/jetbrains/kotlin/psi/KtParameter.java     | 3 +--
 .../frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtParameter.java
index 4714028bef0..aee460b15b5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtParameter.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtParameter.java
@@ -20,7 +20,6 @@ import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.tree.TokenSet;
@@ -192,6 +191,6 @@ public class KtParameter extends KtNamedDeclarationStub<KotlinParameterStub> imp
         if (owner == null) {
             owner = PsiTreeUtil.getParentOfType(this, KtExpression.class);
         }
-        return owner != null ? new LocalSearchScope(owner) : GlobalSearchScope.EMPTY_SCOPE;
+        return new LocalSearchScope(owner != null ? owner : this);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java
index a814947f0e5..2d199e0bd53 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtTypeParameter.java
@@ -91,6 +91,6 @@ public class KtTypeParameter extends KtNamedDeclarationStub<KotlinTypeParameterS
     @Override
     public SearchScope getUseScope() {
         KtTypeParameterListOwner owner = PsiTreeUtil.getParentOfType(this, KtTypeParameterListOwner.class);
-        return owner != null ? new LocalSearchScope(owner) : GlobalSearchScope.EMPTY_SCOPE;
+        return new LocalSearchScope(owner != null ? owner : this);
     }
 }