delete dummy popup and set nullable popup

evanliu048 · evanliu048 · commit be2a6e297dde · 2025-02-04T15:12:03.000-08:00
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/CodeWhispererInlayManager.kt
@@ -22,7 +22,7 @@ class CodeWhispererInlayManager {
         clearInlays()
 
         chunks.forEach { chunk ->
-            createCodeWhispererInlays(editor, chunk.inlayOffset, chunk.text, states.popup)
+            states.popup?.let { createCodeWhispererInlays(editor, chunk.inlayOffset, chunk.text, it) }
         }
     }
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt
@@ -216,7 +216,7 @@ data class InvocationContext(
     val requestContext: RequestContext,
     val responseContext: ResponseContext,
     val recommendationContext: RecommendationContext,
-    val popup: JBPopup,
+    val popup: JBPopup? = null,
 ) : Disposable {
     override fun dispose() {}
 }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt
@@ -141,15 +141,15 @@ class CodeWhispererPopupManager {
             val startOffset = states.requestContext.caretPosition.offset
             val currOffset = states.requestContext.editor.caretModel.offset
             if (startOffset > currOffset) {
-                cancelPopup(popup)
+                popup?.let { cancelPopup(popup) }
                 return
             }
 
             // userInput + typeahead
             val prefix = states.requestContext.editor.document.charsSequence
                 .substring(startOffset, currOffset)
             if (prefix.length < userInputOriginal.length) {
-                cancelPopup(popup)
+                popup?.let { cancelPopup(popup) }
                 return
             } else {
                 prefix.substring(userInputOriginal.length)
@@ -172,7 +172,7 @@ class CodeWhispererPopupManager {
         )
         if (selectedIndex == -1 || !isValidRecommendation(details[selectedIndex], userInput, typeaheadOriginal)) {
             LOG.debug { "None of the recommendation is valid at this point, cancelling the popup" }
-            cancelPopup(popup)
+            popup?.let { cancelPopup(popup) }
             return
         }
         val typeahead = resolveTypeahead(states, selectedIndex, typeaheadOriginal)
@@ -245,7 +245,7 @@ class CodeWhispererPopupManager {
                 states.requestContext.latencyContext.getPerceivedLatency(states.requestContext.triggerTypeInfo.triggerType)
         }
         if (!isRecommendationAdded) {
-            showPopup(states, sessionContext, states.popup, visible = sessionContext.isPopupShowing)
+            states.popup?.let { showPopup(states, sessionContext, it, visible = sessionContext.isPopupShowing) }
         }
     }
 
@@ -423,8 +423,8 @@ class CodeWhispererPopupManager {
 
     private fun addPopupListener(states: InvocationContext) {
         val listener = CodeWhispererPopupListener(states)
-        states.popup.addListener(listener)
-        Disposer.register(states) { states.popup.removeListener(listener) }
+        states.popup?.addListener(listener)
+        Disposer.register(states) { states.popup?.removeListener(listener) }
     }
 
     private fun addMessageSubscribers(states: InvocationContext) {
@@ -460,7 +460,7 @@ class CodeWhispererPopupManager {
                     dontClosePopupAndRun {
                         CodeWhispererEditorManager.getInstance().updateEditorWithRecommendation(states, sessionContext)
                     }
-                    closePopup(states.popup)
+                    states.popup?.let { closePopup(it) }
                     if (sessionContext.selectedIndex == 0) {
                         CodeWhispererService.getInstance().promoteNextInvocationIfAvailable()
                     }
@@ -512,7 +512,7 @@ class CodeWhispererPopupManager {
         val codewhispererSelectionListener: SelectionListener = object : SelectionListener {
             override fun selectionChanged(event: SelectionEvent) {
                 if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
-                    cancelPopup(states.popup)
+                    states.popup?.let { cancelPopup(it) }
                 }
                 super.selectionChanged(event)
             }
@@ -528,7 +528,7 @@ class CodeWhispererPopupManager {
                 if (editor.caretModel.offset == event.offset) {
                     changeStates(states, 0)
                 } else if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
-                    cancelPopup(states.popup)
+                    states.popup?.let { cancelPopup(it) }
                 }
             }
         }
@@ -537,7 +537,7 @@ class CodeWhispererPopupManager {
         val codewhispererCaretListener: CaretListener = object : CaretListener {
             override fun caretPositionChanged(event: CaretEvent) {
                 if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
-                    cancelPopup(states.popup)
+                    states.popup?.let { cancelPopup(it) }
                 }
                 super.caretPositionChanged(event)
             }
@@ -550,11 +550,11 @@ class CodeWhispererPopupManager {
             val window = ComponentUtil.getWindow(editorComponent)
             val windowListener: ComponentListener = object : ComponentAdapter() {
                 override fun componentMoved(event: ComponentEvent) {
-                    cancelPopup(states.popup)
+                    states.popup?.let { cancelPopup(it) }
                 }
 
                 override fun componentShown(e: ComponentEvent?) {
-                    cancelPopup(states.popup)
+                    states.popup?.let { cancelPopup(it) }
                     super.componentShown(e)
                 }
             }
@@ -565,7 +565,7 @@ class CodeWhispererPopupManager {
         val suggestionHoverEnterListener: EditorMouseMotionListener = object : EditorMouseMotionListener {
             override fun mouseMoved(e: EditorMouseEvent) {
                 if (e.inlay != null) {
-                    showPopup(states, sessionContext, states.popup, visible = true)
+                    states.popup?.let { showPopup(states, sessionContext, it, visible = true) }
                 } else {
                     bringSuggestionInlayToFront(editor, states.popup, sessionContext, opposite = true)
                 }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererUIChangeListener.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererUIChangeListener.kt
@@ -61,8 +61,10 @@ class CodeWhispererUIChangeListener : CodeWhispererPopupStateChangeListener {
                 },
                 HighlighterTargetArea.EXACT_RANGE
             )
-            Disposer.register(states.popup) {
-                editor.markupModel.removeHighlighter(rangeHighlighter)
+            states.popup?.let {
+                Disposer.register(it) {
+                    editor.markupModel.removeHighlighter(rangeHighlighter)
+                }
             }
             sessionContext.toBeRemovedHighlighter = rangeHighlighter
         }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupEscHandler.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupEscHandler.kt
@@ -13,7 +13,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
 
 class CodeWhispererPopupEscHandler(states: InvocationContext) : CodeWhispererEditorActionHandler(states) {
     override fun doExecute(editor: Editor, caret: Caret?, dataContext: DataContext?) {
-        CodeWhispererPopupManager.getInstance().cancelPopup(states.popup)
+        states.popup?.let { CodeWhispererPopupManager.getInstance().cancelPopup(it) }
     }
 }
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt
@@ -16,7 +16,6 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.VisualPosition
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.JBPopup
-import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.util.Disposer
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
@@ -299,12 +298,9 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
                             }
                         }
                         val nextRecommendationContext = RecommendationContext(detailContexts, "", "", newVisualPosition)
-                        val newPopup = withContext(EDT) {
-                            JBPopupFactory.getInstance().createMessage("Dummy popup")
-                        }
 
                         // send userDecision and trigger decision when next recommendation haven't been seen
-                        if (currStates.popup.isDisposed) {
+                        if (currStates.popup?.isDisposed == true) {
                             CodeWhispererTelemetryService.getInstance().sendUserDecisionEventForAll(
                                 nextRequestContext,
                                 nextResponseContext,
@@ -313,7 +309,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
                                 false
                             )
                         } else {
-                            nextInvocationContext = InvocationContext(nextRequestContext, nextResponseContext, nextRecommendationContext, newPopup)
+                            nextInvocationContext = InvocationContext(nextRequestContext, nextResponseContext, nextRecommendationContext, null)
                         }
                         LOG.debug { "Prefetched next invocation stored in nextInvocationContext" }
                     }
@@ -709,7 +705,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         val updatedStates = states.copy(
             recommendationContext = recommendationContext.copy(details = details + newDetailContexts)
         )
-        Disposer.register(states.popup, updatedStates)
+        states.popup?.let { Disposer.register(it, updatedStates) }
         CodeWhispererPopupManager.getInstance().initPopupListener(updatedStates)
         return updatedStates
     }
@@ -744,7 +740,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         cs.launch {
             val newPopup = CodeWhispererPopupManager.getInstance().initPopup()
             val updatedNextStates = nextStates.copy(popup = newPopup).also {
-                addPopupChildDisposables(it.requestContext.project, it.requestContext.editor, it.popup)
+                it.popup?.let { it1 -> addPopupChildDisposables(it.requestContext.project, it.requestContext.editor, it1) }
                 Disposer.register(newPopup, it)
             }
             CodeWhispererPopupManager.getInstance().initPopupListener(updatedNextStates)

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class CodeWhispererInlayManager {`
`22`	`22`	`clearInlays()`
`23`	`23`
`24`	`24`	`chunks.forEach { chunk ->`
`25`		`- createCodeWhispererInlays(editor, chunk.inlayOffset, chunk.text, states.popup)`
	`25`	`+ states.popup?.let { createCodeWhispererInlays(editor, chunk.inlayOffset, chunk.text, it) }`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ data class InvocationContext(`
`216`	`216`	`val requestContext: RequestContext,`
`217`	`217`	`val responseContext: ResponseContext,`
`218`	`218`	`val recommendationContext: RecommendationContext,`
`219`		`- val popup: JBPopup,`
	`219`	`+ val popup: JBPopup? = null,`
`220`	`220`	`) : Disposable {`
`221`	`221`	`override fun dispose() {}`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,15 +141,15 @@ class CodeWhispererPopupManager {`
`141`	`141`	`val startOffset = states.requestContext.caretPosition.offset`
`142`	`142`	`val currOffset = states.requestContext.editor.caretModel.offset`
`143`	`143`	`if (startOffset > currOffset) {`
`144`		`- cancelPopup(popup)`
	`144`	`+ popup?.let { cancelPopup(popup) }`
`145`	`145`	`return`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`// userInput + typeahead`
`149`	`149`	`val prefix = states.requestContext.editor.document.charsSequence`
`150`	`150`	`.substring(startOffset, currOffset)`
`151`	`151`	`if (prefix.length < userInputOriginal.length) {`
`152`		`- cancelPopup(popup)`
	`152`	`+ popup?.let { cancelPopup(popup) }`
`153`	`153`	`return`
`154`	`154`	`} else {`
`155`	`155`	`prefix.substring(userInputOriginal.length)`
`@@ -172,7 +172,7 @@ class CodeWhispererPopupManager {`
`172`	`172`	`)`
`173`	`173`	`if (selectedIndex == -1 \|\| !isValidRecommendation(details[selectedIndex], userInput, typeaheadOriginal)) {`
`174`	`174`	`LOG.debug { "None of the recommendation is valid at this point, cancelling the popup" }`
`175`		`- cancelPopup(popup)`
	`175`	`+ popup?.let { cancelPopup(popup) }`
`176`	`176`	`return`
`177`	`177`	`}`
`178`	`178`	`val typeahead = resolveTypeahead(states, selectedIndex, typeaheadOriginal)`
`@@ -245,7 +245,7 @@ class CodeWhispererPopupManager {`
`245`	`245`	`states.requestContext.latencyContext.getPerceivedLatency(states.requestContext.triggerTypeInfo.triggerType)`
`246`	`246`	`}`
`247`	`247`	`if (!isRecommendationAdded) {`
`248`		`- showPopup(states, sessionContext, states.popup, visible = sessionContext.isPopupShowing)`
	`248`	`+ states.popup?.let { showPopup(states, sessionContext, it, visible = sessionContext.isPopupShowing) }`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
`@@ -423,8 +423,8 @@ class CodeWhispererPopupManager {`
`423`	`423`
`424`	`424`	`private fun addPopupListener(states: InvocationContext) {`
`425`	`425`	`val listener = CodeWhispererPopupListener(states)`
`426`		`- states.popup.addListener(listener)`
`427`		`- Disposer.register(states) { states.popup.removeListener(listener) }`
	`426`	`+ states.popup?.addListener(listener)`
	`427`	`+ Disposer.register(states) { states.popup?.removeListener(listener) }`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`private fun addMessageSubscribers(states: InvocationContext) {`
`@@ -460,7 +460,7 @@ class CodeWhispererPopupManager {`
`460`	`460`	`dontClosePopupAndRun {`
`461`	`461`	`CodeWhispererEditorManager.getInstance().updateEditorWithRecommendation(states, sessionContext)`
`462`	`462`	`}`
`463`		`- closePopup(states.popup)`
	`463`	`+ states.popup?.let { closePopup(it) }`
`464`	`464`	`if (sessionContext.selectedIndex == 0) {`
`465`	`465`	`CodeWhispererService.getInstance().promoteNextInvocationIfAvailable()`
`466`	`466`	`}`
`@@ -512,7 +512,7 @@ class CodeWhispererPopupManager {`
`512`	`512`	`val codewhispererSelectionListener: SelectionListener = object : SelectionListener {`
`513`	`513`	`override fun selectionChanged(event: SelectionEvent) {`
`514`	`514`	`if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {`
`515`		`- cancelPopup(states.popup)`
	`515`	`+ states.popup?.let { cancelPopup(it) }`
`516`	`516`	`}`
`517`	`517`	`super.selectionChanged(event)`
`518`	`518`	`}`
`@@ -528,7 +528,7 @@ class CodeWhispererPopupManager {`
`528`	`528`	`if (editor.caretModel.offset == event.offset) {`
`529`	`529`	`changeStates(states, 0)`
`530`	`530`	`} else if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {`
`531`		`- cancelPopup(states.popup)`
	`531`	`+ states.popup?.let { cancelPopup(it) }`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`	`}`
`@@ -537,7 +537,7 @@ class CodeWhispererPopupManager {`
`537`	`537`	`val codewhispererCaretListener: CaretListener = object : CaretListener {`
`538`	`538`	`override fun caretPositionChanged(event: CaretEvent) {`
`539`	`539`	`if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {`
`540`		`- cancelPopup(states.popup)`
	`540`	`+ states.popup?.let { cancelPopup(it) }`
`541`	`541`	`}`
`542`	`542`	`super.caretPositionChanged(event)`
`543`	`543`	`}`
`@@ -550,11 +550,11 @@ class CodeWhispererPopupManager {`
`550`	`550`	`val window = ComponentUtil.getWindow(editorComponent)`
`551`	`551`	`val windowListener: ComponentListener = object : ComponentAdapter() {`
`552`	`552`	`override fun componentMoved(event: ComponentEvent) {`
`553`		`- cancelPopup(states.popup)`
	`553`	`+ states.popup?.let { cancelPopup(it) }`
`554`	`554`	`}`
`555`	`555`
`556`	`556`	`override fun componentShown(e: ComponentEvent?) {`
`557`		`- cancelPopup(states.popup)`
	`557`	`+ states.popup?.let { cancelPopup(it) }`
`558`	`558`	`super.componentShown(e)`
`559`	`559`	`}`
`560`	`560`	`}`
`@@ -565,7 +565,7 @@ class CodeWhispererPopupManager {`
`565`	`565`	`val suggestionHoverEnterListener: EditorMouseMotionListener = object : EditorMouseMotionListener {`
`566`	`566`	`override fun mouseMoved(e: EditorMouseEvent) {`
`567`	`567`	`if (e.inlay != null) {`
`568`		`- showPopup(states, sessionContext, states.popup, visible = true)`
	`568`	`+ states.popup?.let { showPopup(states, sessionContext, it, visible = true) }`
`569`	`569`	`} else {`
`570`	`570`	`bringSuggestionInlayToFront(editor, states.popup, sessionContext, opposite = true)`
`571`	`571`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,10 @@ class CodeWhispererUIChangeListener : CodeWhispererPopupStateChangeListener {`
`61`	`61`	`},`
`62`	`62`	`HighlighterTargetArea.EXACT_RANGE`
`63`	`63`	`)`
`64`		`- Disposer.register(states.popup) {`
`65`		`- editor.markupModel.removeHighlighter(rangeHighlighter)`
	`64`	`+ states.popup?.let {`
	`65`	`+ Disposer.register(it) {`
	`66`	`+ editor.markupModel.removeHighlighter(rangeHighlighter)`
	`67`	`+ }`
`66`	`68`	`}`
`67`	`69`	`sessionContext.toBeRemovedHighlighter = rangeHighlighter`
`68`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe`
`13`	`13`
`14`	`14`	`class CodeWhispererPopupEscHandler(states: InvocationContext) : CodeWhispererEditorActionHandler(states) {`
`15`	`15`	`override fun doExecute(editor: Editor, caret: Caret?, dataContext: DataContext?) {`
`16`		`- CodeWhispererPopupManager.getInstance().cancelPopup(states.popup)`
	`16`	`+ states.popup?.let { CodeWhispererPopupManager.getInstance().cancelPopup(it) }`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ import com.intellij.openapi.editor.Editor`
`16`	`16`	`import com.intellij.openapi.editor.VisualPosition`
`17`	`17`	`import com.intellij.openapi.project.Project`
`18`	`18`	`import com.intellij.openapi.ui.popup.JBPopup`
`19`		`-import com.intellij.openapi.ui.popup.JBPopupFactory`
`20`	`19`	`import com.intellij.openapi.util.Disposer`
`21`	`20`	`import com.intellij.psi.PsiDocumentManager`
`22`	`21`	`import com.intellij.psi.PsiFile`
`@@ -299,12 +298,9 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {`
`299`	`298`	`}`
`300`	`299`	`}`
`301`	`300`	`val nextRecommendationContext = RecommendationContext(detailContexts, "", "", newVisualPosition)`
`302`		`- val newPopup = withContext(EDT) {`
`303`		`- JBPopupFactory.getInstance().createMessage("Dummy popup")`
`304`		`- }`
`305`	`301`
`306`	`302`	`// send userDecision and trigger decision when next recommendation haven't been seen`
`307`		`- if (currStates.popup.isDisposed) {`
	`303`	`+ if (currStates.popup?.isDisposed == true) {`
`308`	`304`	`CodeWhispererTelemetryService.getInstance().sendUserDecisionEventForAll(`
`309`	`305`	`nextRequestContext,`
`310`	`306`	`nextResponseContext,`
`@@ -313,7 +309,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {`
`313`	`309`	`false`
`314`	`310`	`)`
`315`	`311`	`} else {`
`316`		`- nextInvocationContext = InvocationContext(nextRequestContext, nextResponseContext, nextRecommendationContext, newPopup)`
	`312`	`+ nextInvocationContext = InvocationContext(nextRequestContext, nextResponseContext, nextRecommendationContext, null)`
`317`	`313`	`}`
`318`	`314`	`LOG.debug { "Prefetched next invocation stored in nextInvocationContext" }`
`319`	`315`	`}`
`@@ -709,7 +705,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {`
`709`	`705`	`val updatedStates = states.copy(`
`710`	`706`	`recommendationContext = recommendationContext.copy(details = details + newDetailContexts)`
`711`	`707`	`)`
`712`		`- Disposer.register(states.popup, updatedStates)`
	`708`	`+ states.popup?.let { Disposer.register(it, updatedStates) }`
`713`	`709`	`CodeWhispererPopupManager.getInstance().initPopupListener(updatedStates)`
`714`	`710`	`return updatedStates`
`715`	`711`	`}`
`@@ -744,7 +740,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {`
`744`	`740`	`cs.launch {`
`745`	`741`	`val newPopup = CodeWhispererPopupManager.getInstance().initPopup()`
`746`	`742`	`val updatedNextStates = nextStates.copy(popup = newPopup).also {`
`747`		`- addPopupChildDisposables(it.requestContext.project, it.requestContext.editor, it.popup)`
	`743`	`+ it.popup?.let { it1 -> addPopupChildDisposables(it.requestContext.project, it.requestContext.editor, it1) }`
`748`	`744`	`Disposer.register(newPopup, it)`
`749`	`745`	`}`
`750`	`746`	`CodeWhispererPopupManager.getInstance().initPopupListener(updatedNextStates)`