Skip to content

Commit 46a227e

Browse files
committed
Merge branch 'feature/q-lsp-chat' of github.com:leigaol/aws-toolkit-jetbrains into mcp
2 parents 7ee4482 + 7cb2b07 commit 46a227e

File tree

66 files changed

+386
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+386
-283
lines changed

.changes/3.72.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"date" : "2025-05-22",
3+
"version" : "3.72",
4+
"entries" : [ {
5+
"type" : "removal",
6+
"description" : "/transform: remove option to receive multiple diffs"
7+
} ]
8+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Support full Unicode range in inline chat panel on Windows"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "/transform: handle InvalidGrantException properly when polling job status"
4+
}

.changes/next-release/removal-dc421992-1194-47de-9908-930d70687453.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# _3.72_ (2025-05-22)
2+
- **(Removal)** /transform: remove option to receive multiple diffs
3+
14
# _3.71_ (2025-05-15)
25
- **(Feature)** Add inline completion support for abap language
36
- **(Bug Fix)** Fix UI freezes that may occur when interacting with large files in the editor

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Toolkit Version
5-
toolkitVersion=3.72-SNAPSHOT
5+
toolkitVersion=3.73-SNAPSHOT
66

77
# Publish Settings
88
publishToken=

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QRefreshPanelAction.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.intellij.openapi.project.DumbAwareAction
1111
import com.intellij.util.messages.Topic
1212
import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
1313
import software.aws.toolkits.resources.AmazonQBundle
14-
import software.aws.toolkits.resources.message
1514
import java.util.EventListener
1615

1716
class QRefreshPanelAction : DumbAwareAction(AmazonQBundle.message("amazonq.refresh.panel"), null, AllIcons.Actions.Refresh) {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class AmazonQToolWindow private constructor(
2424

2525
val component
2626
get() = chatPanel.component
27-
2827
fun disposeAndRecreate() {
2928
Disposer.dispose(chatPanel)
3029
chatPanel = AmazonQPanel(project, scope)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
6666
ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())?.let { qConn ->
6767
openMeetQPage(project)
6868
}
69-
prepareChatContent(project, qPanel)
69+
preparePanelContent(project, qPanel)
7070
}
7171
}
7272
)
@@ -75,7 +75,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
7575
RefreshQChatPanelButtonPressedListener.TOPIC,
7676
object : RefreshQChatPanelButtonPressedListener {
7777
override fun onRefresh() {
78-
prepareChatContent(project, qPanel)
78+
preparePanelContent(project, qPanel)
7979
}
8080
}
8181
)
@@ -85,8 +85,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
8585
object : BearerTokenProviderListener {
8686
override fun onChange(providerId: String, newScopes: List<String>?) {
8787
if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {
88-
AmazonQToolWindow.getInstance(project).disposeAndRecreate()
89-
prepareChatContent(project, qPanel)
88+
preparePanelContent(project, qPanel)
9089
}
9190
}
9291
}
@@ -98,13 +97,12 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
9897
// note we name myProject intentionally ow it will shadow the "project" provided by the IDE
9998
override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {
10099
if (project.isDisposed) return
101-
AmazonQToolWindow.getInstance(project).disposeAndRecreate()
102-
prepareChatContent(project, qPanel)
100+
preparePanelContent(project, qPanel)
103101
}
104102
}
105103
)
106104

107-
prepareChatContent(project, qPanel)
105+
preparePanelContent(project, qPanel)
108106

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

117-
private fun prepareChatContent(
115+
private fun preparePanelContent(
118116
project: Project,
119117
qPanel: Wrapper,
120118
) {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ class BrowserConnector(
503503
} catch (_: CancellationException) {
504504
LOG.warn { "Cancelled chat generation" }
505505
} catch (e: Exception) {
506-
LOG.error(e) { "Failed to send chat message" }
506+
LOG.warn(e) { "Failed to send chat message" }
507507
browser.postChat(chatCommunicationManager.getErrorUiMessage(tabId, e, partialResultToken))
508508
}
509509
}

0 commit comments

Comments
 (0)