From d7c43ba74c104150417394e45bfc21c2943d7fea Mon Sep 17 00:00:00 2001 From: Bryce Ito Date: Wed, 21 May 2025 11:04:26 -0700 Subject: [PATCH 1/3] fix: Use JetBrains default font for inline chat popup (#5739) Use the JetBrains default font for the inline chat popup. * Canonical with fonts in other popups (e.g find all, search everywhere), instead of editor font * Supports full Unicode fonts in Windows * MacOS unaffected --- .../bugfix-061149bd-c6ef-4c86-9f12-98e38fe3b576.json | 4 ++++ .../jetbrains/services/cwc/inline/InlineChatPopupPanel.kt | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 .changes/next-release/bugfix-061149bd-c6ef-4c86-9f12-98e38fe3b576.json diff --git a/.changes/next-release/bugfix-061149bd-c6ef-4c86-9f12-98e38fe3b576.json b/.changes/next-release/bugfix-061149bd-c6ef-4c86-9f12-98e38fe3b576.json new file mode 100644 index 00000000000..3a97907cb1d --- /dev/null +++ b/.changes/next-release/bugfix-061149bd-c6ef-4c86-9f12-98e38fe3b576.json @@ -0,0 +1,4 @@ +{ + "type" : "bugfix", + "description" : "Support full Unicode range in inline chat panel on Windows" +} \ No newline at end of file diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatPopupPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatPopupPanel.kt index f909115084f..a257565f8d4 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatPopupPanel.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatPopupPanel.kt @@ -10,7 +10,6 @@ import com.intellij.openapi.editor.Caret import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.actionSystem.EditorActionHandler import com.intellij.openapi.editor.actionSystem.EditorActionManager -import com.intellij.openapi.editor.colors.EditorColorsManager import com.intellij.openapi.util.Disposer import com.intellij.ui.IdeBorderFactory import icons.AwsIcons @@ -18,7 +17,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer import software.aws.toolkits.resources.AmazonQBundle.message import java.awt.BorderLayout import java.awt.Dimension -import java.awt.Font import javax.swing.BorderFactory import javax.swing.JButton import javax.swing.JLabel @@ -95,12 +93,10 @@ class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel() override fun getPreferredSize(): Dimension = Dimension(popupWidth, popupHeight) private fun createTextField(): JTextField = JTextField().apply { - val editorColorsScheme = EditorColorsManager.getInstance().globalScheme preferredSize = Dimension(popupInputWidth, popupInputHeight) border = IdeBorderFactory.createRoundedBorder().apply { setColor(POPUP_BUTTON_BORDER) } - font = Font(editorColorsScheme.editorFontName, Font.PLAIN, editorColorsScheme.editorFontSize) } private fun createButton(text: String): JButton = JButton(text).apply { From e76451b5cc745548404ce60cdd45e6387cccbf6f Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Wed, 21 May 2025 14:29:30 -0700 Subject: [PATCH 2/3] fix(amazonq): remove `depends` declarations for languages that do not use IDE classes (#5742) Reduce risk of loading classes from incorrect plugin classloader --- .../resources/META-INF/amazonq-ext-dart.xml | 8 -------- .../resources/META-INF/amazonq-ext-datagrip.xml | 8 -------- .../main/resources/META-INF/amazonq-ext-go.xml | 8 -------- .../resources/META-INF/amazonq-ext-kotlin.xml | 8 -------- .../main/resources/META-INF/amazonq-ext-lua.xml | 8 -------- .../main/resources/META-INF/amazonq-ext-php.xml | 8 -------- .../META-INF/amazonq-ext-powershell.xml | 8 -------- .../main/resources/META-INF/amazonq-ext-r.xml | 8 -------- .../resources/META-INF/amazonq-ext-rider.xml | 8 -------- .../resources/META-INF/amazonq-ext-ruby.xml | 8 -------- .../META-INF/amazonq-ext-rust-deprecated.xml | 8 -------- .../resources/META-INF/amazonq-ext-rust.xml | 8 -------- .../resources/META-INF/amazonq-ext-scala.xml | 8 -------- .../resources/META-INF/amazonq-ext-shell.xml | 8 -------- .../resources/META-INF/amazonq-ext-swift.xml | 8 -------- .../META-INF/amazonq-ext-systemverfilog.xml | 8 -------- .../main/resources/META-INF/amazonq-ext-vue.xml | 8 -------- .../src/main/resources/META-INF/plugin.xml | 17 ----------------- 18 files changed, 153 deletions(-) delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-dart.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-datagrip.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-go.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-kotlin.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-lua.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-php.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-powershell.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-r.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rider.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-ruby.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust-deprecated.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-scala.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-shell.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-swift.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-systemverfilog.xml delete mode 100644 plugins/amazonq/src/main/resources/META-INF/amazonq-ext-vue.xml diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-dart.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-dart.xml deleted file mode 100644 index e02e988ac6c..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-dart.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-datagrip.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-datagrip.xml deleted file mode 100644 index 061fc9cbc1d..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-datagrip.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-go.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-go.xml deleted file mode 100644 index 4993941e6f1..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-go.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-kotlin.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-kotlin.xml deleted file mode 100644 index afcf0c0a0b3..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-kotlin.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-lua.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-lua.xml deleted file mode 100644 index 05a202e5829..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-lua.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-php.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-php.xml deleted file mode 100644 index e6ab317129e..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-php.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-powershell.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-powershell.xml deleted file mode 100644 index 4fac40f59b6..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-powershell.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-r.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-r.xml deleted file mode 100644 index 08a46e5b783..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-r.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rider.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rider.xml deleted file mode 100644 index d36e9a74cc4..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rider.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-ruby.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-ruby.xml deleted file mode 100644 index cbb98b4d1cc..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-ruby.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust-deprecated.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust-deprecated.xml deleted file mode 100644 index 7a4389a5d5c..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust-deprecated.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust.xml deleted file mode 100644 index 7a4389a5d5c..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-scala.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-scala.xml deleted file mode 100644 index 9b9ec3e94ab..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-scala.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-shell.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-shell.xml deleted file mode 100644 index 3b09f50f10b..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-shell.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-swift.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-swift.xml deleted file mode 100644 index 1b8e657c274..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-swift.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-systemverfilog.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-systemverfilog.xml deleted file mode 100644 index d7a94b957ad..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-systemverfilog.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-vue.xml b/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-vue.xml deleted file mode 100644 index 825a9212410..00000000000 --- a/plugins/amazonq/src/main/resources/META-INF/amazonq-ext-vue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/amazonq/src/main/resources/META-INF/plugin.xml b/plugins/amazonq/src/main/resources/META-INF/plugin.xml index 786974563a0..fa53216c64e 100644 --- a/plugins/amazonq/src/main/resources/META-INF/plugin.xml +++ b/plugins/amazonq/src/main/resources/META-INF/plugin.xml @@ -58,26 +58,9 @@ aws.toolkit.core com.intellij.modules.lang - Dart - com.intellij.database - org.jetbrains.plugins.go com.intellij.java - org.jetbrains.kotlin - com.tang JavaScriptDebugger - com.jetbrains.php - com.intellij.plugin.adernov.powershell com.intellij.modules.python - R4Intellij - com.intellij.modules.rider - org.jetbrains.plugins.ruby - com.jetbrains.rust - org.rust.lang - org.intellij.scala - com.intellij.swift - com.jetbrains.sh - studio.edaphic.sv - org.jetbrains.plugins.vue com.intellij.cwm.guest com.intellij.jetbrains.client From 4788a876f0b05acc67ba51aa6a0b6e3bcd7e77dd Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Wed, 21 May 2025 14:30:01 -0700 Subject: [PATCH 3/3] fix(amazonq): minor text change when switching tabs (#5745) --- .../amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts index aa7e389652b..59e959b4717 100644 --- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts +++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts @@ -89,8 +89,9 @@ export class QuickActionHandler { this.connector.onTabChange(existingTransformTab.id) this.mynahUI.notify({ - title: "Q - Transform", - content: "Switched to the opened transformation tab", + duration: 5000, + title: "Q CodeTransformation", + content: "Switched to the existing /transform tab; click 'Start a new transformation' below to run another transformation" }); return }