From c943ec104dcf1fd14d79e9866cdd14c18c091bb9 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 7 Aug 2015 19:35:08 +0300
Subject: [PATCH] KT-8718 KNPE at PropertyUsagesSearchHelper.makeItemList() on
 erasing parameter name

 #KT-8718 Fixed
---
 .../idea/search/ideaExtensions/KotlinReferencesSearcher.kt  | 3 ++-
 .../kotlin/idea/search/usagesSearch/searchHelpers.kt        | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
index fd6bdecfc14..b3d8ee11a81 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
@@ -70,6 +70,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
     }
 
     private fun searchNamedArguments(parameter: JetParameter, queryParameters: ReferencesSearch.SearchParameters) {
+        val parameterName = parameter.name ?: return
         val function = parameter.ownerFunction ?: return
         if (function.nameAsName?.isSpecial ?: true) return
         val project = function.project
@@ -83,7 +84,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
             namedArgsScope = GlobalSearchScope.filesScope(project, filesWithFunctionName.asList())
         }
 
-        queryParameters.optimizer.searchWord(parameter.name!!,
+        queryParameters.optimizer.searchWord(parameterName,
                                              namedArgsScope,
                                              KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT,
                                              true,
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
index 933005c94a1..f73a2293971 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
@@ -251,6 +251,8 @@ class PropertyUsagesSearchHelper(
     override fun makeItemList(target: UsagesSearchTarget<JetNamedDeclaration>): List<UsagesSearchRequestItem> {
         val element = target.element
         if (element is JetParameter) {
+            val parameterName = element.name ?: return emptyList()
+
             val realUsagesScope = element.useScope and target.effectiveScope
             val realUsagesTarget = target.withScope(realUsagesScope)
             val realUsagesFilter = makeFilter(target) and !(PsiReference::isNamedArgumentUsage).searchFilter
@@ -271,10 +273,10 @@ class PropertyUsagesSearchHelper(
                 scope = JetSourceFilterScope.kotlinSourcesAndLibraries(scope, element.project)
             }
 
-            val additionalFilter1 = AdditionalFileFilter(element.name!!, KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT, true)
+            val additionalFilter1 = AdditionalFileFilter(parameterName, KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT, true)
             val additionalFilter2 = AdditionalFileFilter(function.name!!, UsageSearchContext.IN_CODE, true)
             val namedArgsRequest = UsagesSearchRequestItem(target.withScope(scope),
-                                                           listOf(element.name!!),
+                                                           listOf(parameterName),
                                                            (PsiReference::isNamedArgumentUsage).searchFilter and makeFilter(target),
                                                            additionalFileFilters = listOf(additionalFilter1, additionalFilter2))
             return listOf(realUsagesRequest, namedArgsRequest)