r

Will-ShaoHua · Will-ShaoHua · commit 46f6b458b278 · 2025-04-15T23:36:34.000-07:00
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
@@ -95,7 +95,8 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         project.messageBus.connect(toolWindow.disposable).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                // note we name myProject intentionally ow it will shadow the "project" provided by the IDE
+                override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {
                     if (project.isDisposed) return
                     AmazonQToolWindow.getInstance(project).disposeAndRecreate()
                     qPanel.setContent(AmazonQToolWindow.getInstance(project).component)
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt
@@ -147,7 +147,7 @@ class CodeScanChatApp(private val scope: CoroutineScope) : AmazonQApp {
         context.project.messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     chatSessionStorage.deleteAllSessions()
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatApp.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatApp.kt
@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonqCodeTest
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
@@ -77,7 +78,7 @@ class CodeTestChatApp(private val scope: CoroutineScope) : AmazonQApp {
         context.project.messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     chatSessionStorage.deleteAllSessions()
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/DocApp.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/DocApp.kt
@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonqDoc
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.launch
 import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
@@ -80,7 +81,7 @@ class DocApp : AmazonQApp {
         context.project.messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     chatSessionStorage.deleteAllSessions()
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevApp.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevApp.kt
@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonqFeatureDev
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.launch
 import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
@@ -81,7 +82,7 @@ class FeatureDevApp : AmazonQApp {
         context.project.messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     chatSessionStorage.deleteAllSessions()
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
@@ -100,7 +100,7 @@ class FeatureDevController(
         context.project.messageBus.connect().subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     chatSessionStorage.deleteAllSessions()
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/App.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/App.kt
@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.cwc
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.launch
 import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
@@ -81,7 +82,7 @@ class App : AmazonQApp {
         ApplicationManager.getApplication().messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     inboundAppMessagesHandler.processSessionClear()
                 }
             }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatController.kt
@@ -106,7 +106,7 @@ class InlineChatController(
         project.messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     sessionStorage.deleteAllSessions()
                 }
             }
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
@@ -139,7 +139,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         project.messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     stopModernize()
                     codeTransformationSession?.let {
                         Disposer.dispose(it)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt
@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.codemodernizer
 
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.launch
 import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
@@ -167,7 +168,7 @@ class CodeTransformChatApp : AmazonQApp {
         context.project.messageBus.connect(this).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     chatSessionStorage.deleteAllSessions()
                 }
             }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/QRegionProfileManagerTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/QRegionProfileManagerTest.kt
@@ -142,7 +142,7 @@ class QRegionProfileManagerTest {
         project.messageBus.connect(disposableRule.disposable).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(profile: QRegionProfile?) {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     cnt += 1
                 }
             }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt
@@ -146,7 +146,7 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl
 
         ApplicationManager.getApplication().messageBus
             .syncPublisher(QRegionProfileSelectedListener.TOPIC)
-            .onProfileSelected(newProfile)
+            .onProfileSelected(project, newProfile)
     }
 
     private fun invalidateProfile(arn: String) {
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileSelectedListener.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileSelectedListener.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.profile
 
+import com.intellij.openapi.project.Project
 import com.intellij.util.messages.Topic
 
 interface QRegionProfileSelectedListener {
@@ -11,5 +12,5 @@ interface QRegionProfileSelectedListener {
         val TOPIC = Topic.create("QRegionProfileSelected", QRegionProfileSelectedListener::class.java)
     }
 
-    fun onProfileSelected(profile: QRegionProfile?)
+    fun onProfileSelected(project: Project, profile: QRegionProfile?)
 }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ class CodeScanChatApp(private val scope: CoroutineScope) : AmazonQApp {`
`147`	`147`	`context.project.messageBus.connect(this).subscribe(`
`148`	`148`	`QRegionProfileSelectedListener.TOPIC,`
`149`	`149`	`object : QRegionProfileSelectedListener {`
`150`		`- override fun onProfileSelected(profile: QRegionProfile?) {`
	`150`	`+ override fun onProfileSelected(project: Project, profile: QRegionProfile?) {`
`151`	`151`	`chatSessionStorage.deleteAllSessions()`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class FeatureDevController(`
`100`	`100`	`context.project.messageBus.connect().subscribe(`
`101`	`101`	`QRegionProfileSelectedListener.TOPIC,`
`102`	`102`	`object : QRegionProfileSelectedListener {`
`103`		`- override fun onProfileSelected(profile: QRegionProfile?) {`
	`103`	`+ override fun onProfileSelected(project: Project, profile: QRegionProfile?) {`
`104`	`104`	`chatSessionStorage.deleteAllSessions()`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class InlineChatController(`
`106`	`106`	`project.messageBus.connect(this).subscribe(`
`107`	`107`	`QRegionProfileSelectedListener.TOPIC,`
`108`	`108`	`object : QRegionProfileSelectedListener {`
`109`		`- override fun onProfileSelected(profile: QRegionProfile?) {`
	`109`	`+ override fun onProfileSelected(project: Project, profile: QRegionProfile?) {`
`110`	`110`	`sessionStorage.deleteAllSessions()`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ class QRegionProfileManagerTest {`
`142`	`142`	`project.messageBus.connect(disposableRule.disposable).subscribe(`
`143`	`143`	`QRegionProfileSelectedListener.TOPIC,`
`144`	`144`	`object : QRegionProfileSelectedListener {`
`145`		`- override fun onProfileSelected(profile: QRegionProfile?) {`
	`145`	`+ override fun onProfileSelected(project: Project, profile: QRegionProfile?) {`
`146`	`146`	`cnt += 1`
`147`	`147`	`}`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl`
`146`	`146`
`147`	`147`	`ApplicationManager.getApplication().messageBus`
`148`	`148`	`.syncPublisher(QRegionProfileSelectedListener.TOPIC)`
`149`		`- .onProfileSelected(newProfile)`
	`149`	`+ .onProfileSelected(project, newProfile)`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`private fun invalidateProfile(arn: String) {`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`package software.aws.toolkits.jetbrains.services.amazonq.profile`
`5`	`5`
	`6`	`+import com.intellij.openapi.project.Project`
`6`	`7`	`import com.intellij.util.messages.Topic`
`7`	`8`
`8`	`9`	`interface QRegionProfileSelectedListener {`
`@@ -11,5 +12,5 @@ interface QRegionProfileSelectedListener {`
`11`	`12`	`val TOPIC = Topic.create("QRegionProfileSelected", QRegionProfileSelectedListener::class.java)`
`12`	`13`	`}`
`13`	`14`
`14`		`- fun onProfileSelected(profile: QRegionProfile?)`
	`15`	`+ fun onProfileSelected(project: Project, profile: QRegionProfile?)`
`15`	`16`	`}`