Skip to content

fix(amazonq): fix Q panel will get stuck while signin if users have multiple window #5564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 16, 2025
Merged

fix(amazonq): fix Q panel will get stuck while signin if users have multiple window #5564

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b35b1d
disable toolkit_didLoadModule metrics
Will-ShaoHua Apr 10, 2025
a280fd8
fix users some ide window will be stuck at fetching profile... state …
Will-ShaoHua Apr 11, 2025
de74b61
Merge remote-tracking branch 'upstream/main' into multi-window
Will-ShaoHua Apr 14, 2025
183ded5
a
Will-ShaoHua Apr 14, 2025
6b5c069
revert
Will-ShaoHua Apr 15, 2025
9f765c1
cl
Will-ShaoHua Apr 15, 2025
46f6b45
r
Will-ShaoHua Apr 16, 2025
25dab9a
Merge remote-tracking branch 'upstream/main' into multi-window
Will-ShaoHua Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-afb46d2b-24c7-48be-94b1-02a7f56cbde0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Q panel will get stuck while signin if users have multiple windows"
}
2 changes: 1 addition & 1 deletion ...c/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
project.messageBus.connect(toolWindow.disposable).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
Copy link
Contributor Author

@Will-ShaoHua Will-ShaoHua Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line project is shadowing outside AmazonQToolWindowFactory.project

Copy link
Contributor Author

@Will-ShaoHua Will-ShaoHua Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thus the following 2 lines also use the wrong project

AmazonQToolWindow.getInstance(project).disposeAndRecreate()
qPanel.setContent(AmazonQToolWindow.getInstance(project).component)

override fun onProfileSelected(profile: QRegionProfile?) {
if (project.isDisposed) return
AmazonQToolWindow.getInstance(project).disposeAndRecreate()
qPanel.setContent(AmazonQToolWindow.getInstance(project).component)
Expand Down
2 changes: 1 addition & 1 deletion ...community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class CodeScanChatApp(private val scope: CoroutineScope) : AmazonQApp {
context.project.messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
chatSessionStorage.deleteAllSessions()
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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
Expand Down Expand Up @@ -78,7 +77,7 @@ class CodeTestChatApp(private val scope: CoroutineScope) : AmazonQApp {
context.project.messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
chatSessionStorage.deleteAllSessions()
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...hat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/DocApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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
Expand Down Expand Up @@ -81,7 +80,7 @@ class DocApp : AmazonQApp {
context.project.messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
chatSessionStorage.deleteAllSessions()
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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
Expand Down Expand Up @@ -82,7 +81,7 @@ class FeatureDevApp : AmazonQApp {
context.project.messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
chatSessionStorage.deleteAllSessions()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ware/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class FeatureDevController(
context.project.messageBus.connect().subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
chatSessionStorage.deleteAllSessions()
}
}
Expand Down
3 changes: 1 addition & 2 deletions .../amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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
Expand Down Expand Up @@ -82,7 +81,7 @@ class App : AmazonQApp {
ApplicationManager.getApplication().messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
inboundAppMessagesHandler.processSessionClear()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class InlineChatController(
project.messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
sessionStorage.deleteAllSessions()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
project.messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
stopModernize()
codeTransformationSession?.let {
Disposer.dispose(it)
Expand Down
3 changes: 1 addition & 2 deletions ...unity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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
Expand Down Expand Up @@ -168,7 +167,7 @@ class CodeTransformChatApp : AmazonQApp {
context.project.messageBus.connect(this).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
chatSessionStorage.deleteAllSessions()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...y/tst/software/aws/toolkits/jetbrains/services/codewhisperer/QRegionProfileManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class QRegionProfileManagerTest {
project.messageBus.connect(disposableRule.disposable).subscribe(
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
override fun onProfileSelected(profile: QRegionProfile?) {
cnt += 1
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ity/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl
}
}

project.messageBus
ApplicationManager.getApplication().messageBus
.syncPublisher(QRegionProfileSelectedListener.TOPIC)
.onProfileSelected(project, newProfile)
.onProfileSelected(newProfile)
}

private fun invalidateProfile(arn: String) {
Expand Down
5 changes: 2 additions & 3 deletions ...oftware/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileSelectedListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@

package software.aws.toolkits.jetbrains.services.amazonq.profile

import com.intellij.openapi.project.Project
import com.intellij.util.messages.Topic

interface QRegionProfileSelectedListener {
companion object {
@Topic.ProjectLevel
@Topic.AppLevel
val TOPIC = Topic.create("QRegionProfileSelected", QRegionProfileSelectedListener::class.java)
}

fun onProfileSelected(project: Project, profile: QRegionProfile?)
fun onProfileSelected(profile: QRegionProfile?)
}
Loading