From aa10523d1f4e156578b4fe6857431528fe20d1c4 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Sun, 12 Mar 2023 16:03:10 +0100
Subject: [PATCH] fixing NPE

GitOrigin-RevId: a6a807dbdfaad0ea756650b42440e913b5f16e1f
---
 .../intellij/codeInsight/navigation/PsiTargetNavigator.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/PsiTargetNavigator.kt b/platform/lang-impl/src/com/intellij/codeInsight/navigation/PsiTargetNavigator.kt
index 7bee82d33a20..af0893ea7165 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/PsiTargetNavigator.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/PsiTargetNavigator.kt
@@ -86,7 +86,7 @@ class PsiTargetNavigator<T: PsiElement>(val supplier: Supplier<Collection<T>>) {
     else {
       val popup = buildPopup(items, title, project, selected, predicate)
       popupConsumer.accept(popup)
-      updater.let { ProgressManager.getInstance().run(updater!!) }
+      updater?.let { ProgressManager.getInstance().run(updater!!) }
     }
     return true
   }
@@ -124,7 +124,7 @@ class PsiTargetNavigator<T: PsiElement>(val supplier: Supplier<Collection<T>>) {
                          predicate: Predicate<ItemWithPresentation>): JBPopup {
     val builder = buildTargetPopupWithMultiSelect(targets, Function { it.presentation }, predicate)
     val caption = title ?: this.title ?: updater?.getCaption(targets.size)
-    caption.let { builder.setTitle(caption!!) }
+    caption?.let { builder.setTitle(caption) }
     val ref: Ref<UsageView> = Ref.create()
     if (tabTitle != null) {
       builder.setCouldPin {
@@ -134,7 +134,7 @@ class PsiTargetNavigator<T: PsiElement>(val supplier: Supplier<Collection<T>>) {
         !ref.isNull
       }
     }
-    selected.let { builder.setSelectedValue(selected, true) }
+    selected?.let { builder.setSelectedValue(selected, true) }
     updater?.let { builder.setCancelCallback { updater!!.cancelTask() }}
 
     val popup = builder.createPopup()