Skip to content

Merge main into feature/remote-chat-lsp #5747

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.

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 6 commits into from
May 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Support full Unicode range in inline chat panel on Windows"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ 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
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.POPUP_BUTTON_BORDER
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
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,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
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

18 changes: 0 additions & 18 deletions plugins/amazonq/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,9 @@
<depends>com.intellij.modules.lang</depends>

<depends optional="true" config-file="amazonq-ext-codewithme.xml">com.jetbrains.codeWithMe</depends>

<depends optional="true" config-file="amazonq-ext-dart.xml">Dart</depends>
<depends optional="true" config-file="amazonq-ext-datagrip.xml">com.intellij.database</depends>
<depends optional="true" config-file="amazonq-ext-go.xml">org.jetbrains.plugins.go</depends>
<depends optional="true" config-file="amazonq-ext-java.xml">com.intellij.java</depends>
<depends optional="true" config-file="amazonq-ext-kotlin.xml">org.jetbrains.kotlin</depends>
<depends optional="true" config-file="amazonq-ext-lua.xml">com.tang</depends>
<depends optional="true" config-file="amazonq-ext-nodejs.xml">JavaScriptDebugger</depends>
<depends optional="true" config-file="amazonq-ext-php.xml">com.jetbrains.php</depends>
<depends optional="true" config-file="amazonq-ext-powershell.xml">com.intellij.plugin.adernov.powershell</depends>
<depends optional="true" config-file="amazonq-ext-python.xml">com.intellij.modules.python</depends>
<depends optional="true" config-file="amazonq-ext-r.xml">R4Intellij</depends>
<depends optional="true" config-file="amazonq-ext-rider.xml">com.intellij.modules.rider</depends>
<depends optional="true" config-file="amazonq-ext-ruby.xml">org.jetbrains.plugins.ruby</depends>
<depends optional="true" config-file="amazonq-ext-rust.xml">com.jetbrains.rust</depends>
<depends optional="true" config-file="amazonq-ext-rust-deprecated.xml">org.rust.lang</depends>
<depends optional="true" config-file="amazonq-ext-scala.xml">org.intellij.scala</depends>
<depends optional="true" config-file="amazonq-ext-swift.xml">com.intellij.swift</depends>
<depends optional="true" config-file="amazonq-ext-shell.xml">com.jetbrains.sh</depends>
<depends optional="true" config-file="amazonq-ext-systemverfilog.xml">studio.edaphic.sv</depends>
<depends optional="true" config-file="amazonq-ext-vue.xml">org.jetbrains.plugins.vue</depends>

<incompatible-with>com.intellij.cwm.guest</incompatible-with>
<incompatible-with>com.intellij.jetbrains.client</incompatible-with>
Expand Down
Loading