Skip to content

refactor(amazonq): remove redunant panel re-creation #5729

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 7 commits into from
May 20, 2025
Merged

refactor(amazonq): remove redunant panel re-creation #5729

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0f567e
remove redunant panel re-creation
Will-ShaoHua May 16, 2025
a8e566d
patch
Will-ShaoHua May 16, 2025
07a89cf
rename
Will-ShaoHua May 16, 2025
4660f63
Merge remote-tracking branch 'upstream/feature/q-lsp-chat' into jcef
Will-ShaoHua May 16, 2025
9439fee
Merge branch 'feature/q-lsp-chat' into jcef
Will-ShaoHua May 19, 2025
990d4f1
Merge branch 'feature/q-lsp-chat' into jcef
Will-ShaoHua May 19, 2025
3ae8576
Merge branch 'feature/q-lsp-chat' into jcef
Will-ShaoHua May 20, 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
14 changes: 6 additions & 8 deletions ...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 @@ -66,7 +66,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())?.let { qConn ->
openMeetQPage(project)
}
prepareChatContent(project, qPanel)
preparePanelContent(project, qPanel)
}
}
)
Expand All @@ -75,7 +75,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
RefreshQChatPanelButtonPressedListener.TOPIC,
object : RefreshQChatPanelButtonPressedListener {
override fun onRefresh() {
prepareChatContent(project, qPanel)
preparePanelContent(project, qPanel)
}
}
)
Expand All @@ -85,8 +85,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
object : BearerTokenProviderListener {
override fun onChange(providerId: String, newScopes: List<String>?) {
if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {
AmazonQToolWindow.getInstance(project).disposeAndRecreate()
Copy link
Contributor Author

@Will-ShaoHua Will-ShaoHua May 16, 2025

Choose a reason for hiding this comment

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

not necessary to re-init an entire new panel

prepareChatContent(project, qPanel)
preparePanelContent(project, qPanel)
}
}
}
Expand All @@ -98,13 +97,12 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
// 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()
Copy link
Contributor Author

@Will-ShaoHua Will-ShaoHua May 16, 2025

Choose a reason for hiding this comment

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

TODO: send active profile to LSP so that LSP can render selected profile in a card

prepareChatContent(project, qPanel)
preparePanelContent(project, qPanel)
}
}
)

prepareChatContent(project, qPanel)
preparePanelContent(project, qPanel)

val content = contentManager.factory.createContent(mainPanel, null, false).also {
it.isCloseable = true
Expand All @@ -114,7 +112,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
contentManager.addContent(content)
}

private fun prepareChatContent(
private fun preparePanelContent(
project: Project,
qPanel: Wrapper,
) {
Expand Down
Loading