Skip to content

Commit 815e86d

Browse files
committed
Merge remote-tracking branch 'origin/feature/q-lsp-chat' into HEAD
Conflicts: plugins/amazonq/src/main/resources/META-INF/plugin.xml
2 parents 996c6bb + ca1161c commit 815e86d

21 files changed

+7
-160
lines changed
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+
}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatPopupPanel.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ import com.intellij.openapi.editor.Caret
1010
import com.intellij.openapi.editor.Editor
1111
import com.intellij.openapi.editor.actionSystem.EditorActionHandler
1212
import com.intellij.openapi.editor.actionSystem.EditorActionManager
13-
import com.intellij.openapi.editor.colors.EditorColorsManager
1413
import com.intellij.openapi.util.Disposer
1514
import com.intellij.ui.IdeBorderFactory
1615
import icons.AwsIcons
1716
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_BUTTON_BORDER
1817
import software.aws.toolkits.resources.AmazonQBundle.message
1918
import java.awt.BorderLayout
2019
import java.awt.Dimension
21-
import java.awt.Font
2220
import javax.swing.BorderFactory
2321
import javax.swing.JButton
2422
import javax.swing.JLabel
@@ -95,12 +93,10 @@ class InlineChatPopupPanel(private val parentDisposable: Disposable) : JPanel()
9593
override fun getPreferredSize(): Dimension = Dimension(popupWidth, popupHeight)
9694

9795
private fun createTextField(): JTextField = JTextField().apply {
98-
val editorColorsScheme = EditorColorsManager.getInstance().globalScheme
9996
preferredSize = Dimension(popupInputWidth, popupInputHeight)
10097
border = IdeBorderFactory.createRoundedBorder().apply {
10198
setColor(POPUP_BUTTON_BORDER)
10299
}
103-
font = Font(editorColorsScheme.editorFontName, Font.PLAIN, editorColorsScheme.editorFontSize)
104100
}
105101

106102
private fun createButton(text: String): JButton = JButton(text).apply {

plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ export class QuickActionHandler {
9393
this.connector.onTabChange(existingTransformTab.id)
9494

9595
this.mynahUI?.notify({
96-
title: "Q - Transform",
97-
content: "Switched to the opened transformation tab",
96+
duration: 5000,
97+
title: "Q CodeTransformation",
98+
content: "Switched to the existing /transform tab; click 'Start a new transformation' below to run another transformation"
9899
});
99100
return
100101
}

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-dart.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-datagrip.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-go.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-kotlin.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-lua.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-php.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-powershell.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-r.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rider.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-ruby.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust-deprecated.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-rust.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-scala.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-shell.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-swift.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-systemverfilog.xml

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

plugins/amazonq/src/main/resources/META-INF/amazonq-ext-vue.xml

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

plugins/amazonq/src/main/resources/META-INF/plugin.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,27 +59,9 @@
5959
<depends>com.intellij.modules.lang</depends>
6060

6161
<depends optional="true" config-file="amazonq-ext-codewithme.xml">com.jetbrains.codeWithMe</depends>
62-
63-
<depends optional="true" config-file="amazonq-ext-dart.xml">Dart</depends>
64-
<depends optional="true" config-file="amazonq-ext-datagrip.xml">com.intellij.database</depends>
65-
<depends optional="true" config-file="amazonq-ext-go.xml">org.jetbrains.plugins.go</depends>
6662
<depends optional="true" config-file="amazonq-ext-java.xml">com.intellij.java</depends>
67-
<depends optional="true" config-file="amazonq-ext-kotlin.xml">org.jetbrains.kotlin</depends>
68-
<depends optional="true" config-file="amazonq-ext-lua.xml">com.tang</depends>
6963
<depends optional="true" config-file="amazonq-ext-nodejs.xml">JavaScriptDebugger</depends>
70-
<depends optional="true" config-file="amazonq-ext-php.xml">com.jetbrains.php</depends>
71-
<depends optional="true" config-file="amazonq-ext-powershell.xml">com.intellij.plugin.adernov.powershell</depends>
7264
<depends optional="true" config-file="amazonq-ext-python.xml">com.intellij.modules.python</depends>
73-
<depends optional="true" config-file="amazonq-ext-r.xml">R4Intellij</depends>
74-
<depends optional="true" config-file="amazonq-ext-rider.xml">com.intellij.modules.rider</depends>
75-
<depends optional="true" config-file="amazonq-ext-ruby.xml">org.jetbrains.plugins.ruby</depends>
76-
<depends optional="true" config-file="amazonq-ext-rust.xml">com.jetbrains.rust</depends>
77-
<depends optional="true" config-file="amazonq-ext-rust-deprecated.xml">org.rust.lang</depends>
78-
<depends optional="true" config-file="amazonq-ext-scala.xml">org.intellij.scala</depends>
79-
<depends optional="true" config-file="amazonq-ext-swift.xml">com.intellij.swift</depends>
80-
<depends optional="true" config-file="amazonq-ext-shell.xml">com.jetbrains.sh</depends>
81-
<depends optional="true" config-file="amazonq-ext-systemverfilog.xml">studio.edaphic.sv</depends>
82-
<depends optional="true" config-file="amazonq-ext-vue.xml">org.jetbrains.plugins.vue</depends>
8365

8466
<incompatible-with>com.intellij.cwm.guest</incompatible-with>
8567
<incompatible-with>com.intellij.jetbrains.client</incompatible-with>

0 commit comments

Comments
 (0)