Merge branch 'main' into addButtons

Author: dhasani23

.changes/3.82.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-07-03",
+  "version" : "3.82",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Skip inline completion when deleting characters"
+  } ]
+}

.changes/3.83.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-07-07",
+  "version" : "3.83",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix auto-suggestions being shown when suggestions are paused"
+  } ]
+}

CHANGELOG.md

@@ -1,3 +1,9 @@
+# _3.83_ (2025-07-07)
+- **(Bug Fix)** Fix auto-suggestions being shown when suggestions are paused
+
+# _3.82_ (2025-07-03)
+- **(Bug Fix)** Skip inline completion when deleting characters
+
 # _3.81_ (2025-06-27)
 
 # _3.80_ (2025-06-26)

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.82-SNAPSHOT
+toolkitVersion=3.84-SNAPSHOT
 
 # Publish Settings
 publishToken=

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

@@ -221,6 +221,14 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                         box-shadow: none !important;
                         border-radius: 0 !important;
                     }
+                    select.mynah-form-input {
+                        -webkit-appearance: menulist !important;
+                        appearance: menulist !important;
+                        padding: 0 !important;
+                    }
+                    .mynah-select-handle {
+                        visibility: hidden;
+                    }
                     .mynah-ui-spinner-container > span.mynah-ui-spinner-logo-part > .mynah-ui-spinner-logo-mask.text {
                         will-change: transform !important;
                         transform: translateZ(0) !important;

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -356,10 +356,16 @@ fun buildUserInputCustomDependencyVersionsChatContent(message: String) = CodeTra
     type = CodeTransformChatMessageType.PendingAnswer,
 )
 
-fun buildPromptTargetJDKNameChatContent(version: String) = CodeTransformChatMessageContent(
-    message = message("codemodernizer.chat.message.enter_jdk_name", version),
-    type = CodeTransformChatMessageType.FinalizedAnswer,
-)
+fun buildPromptTargetJDKNameChatContent(version: String, currentJdkName: String?): CodeTransformChatMessageContent {
+    var message = message("codemodernizer.chat.message.enter_jdk_name", version)
+    if (currentJdkName != null) {
+        message += "\n\ncurrent: `$currentJdkName`"
+    }
+    return CodeTransformChatMessageContent(
+        message = message,
+        type = CodeTransformChatMessageType.FinalizedAnswer,
+    )
+}
 
 fun buildInvalidTargetJdkNameChatContent(jdkName: String) = CodeTransformChatMessageContent(
     message = message("codemodernizer.chat.message.enter_jdk_name_error", jdkName),

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -138,6 +138,7 @@ class CodeTransformChatController(
     private val codeModernizerManager = CodeModernizerManager.getInstance(context.project)
     private val artifactHandler = ArtifactHandler(context.project, GumbyClient.getInstance(context.project), codeTransformChatHelper)
     private val telemetry = CodeTransformTelemetryManager.getInstance(context.project)
+    private val jdkVersionToName = mutableMapOf<String, String>()
 
     override suspend fun processChatPromptMessage(message: IncomingCodeTransformMessage.ChatPrompt) {
         if (chatSessionStorage.getSession(message.tabId).conversationState == CodeTransformConversationState.PROMPT_TARGET_JDK_NAME) {
@@ -456,6 +457,10 @@ class CodeTransformChatController(
             codeTransformChatHelper.addNewMessage(buildInvalidTargetJdkNameChatContent(providedJdkName))
             return
         }
+        val jdkVersion = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name
+        if (jdkVersion != null) {
+            jdkVersionToName[jdkVersion] = targetJdkName
+        }
         codeModernizerManager.codeTransformationSession?.sessionContext?.targetJdkName = targetJdkName
         codeTransformChatHelper.addNewMessage(buildUserReplyChatContent(message.message.trim()))
         // start local build once we get target JDK path
@@ -506,7 +511,8 @@ dependencyManagement:
     private suspend fun promptForTargetJdkName(tabId: String) {
         chatSessionStorage.getSession(tabId).conversationState = CodeTransformConversationState.PROMPT_TARGET_JDK_NAME
         val targetJdkVersion = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name.orEmpty()
-        codeTransformChatHelper.addNewMessage(buildPromptTargetJDKNameChatContent(targetJdkVersion))
+        val currentJdkName = jdkVersionToName[targetJdkVersion]
+        codeTransformChatHelper.addNewMessage(buildPromptTargetJDKNameChatContent(targetJdkVersion, currentJdkName))
         codeTransformChatHelper.sendChatInputEnabledMessage(tabId, true)
         codeTransformChatHelper.sendUpdatePlaceholderMessage(tabId, "Enter the name of your $targetJdkVersion")
     }

plugins/amazonq/codewhisperer/jetbrains-community/src-242/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt

@@ -19,3 +19,6 @@ fun getManualCallEvent(editor: Editor, isIntelliSenseAccept: Boolean): InlineCom
     }
     return InlineCompletionEvent.DirectCall(editor, editor.caretModel.currentCaret, dataContext)
 }
+
+@Suppress("FunctionOnlyReturningConstant")
+fun InlineCompletionEvent.isDeletion(): Boolean = false

plugins/amazonq/codewhisperer/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt

@@ -15,3 +15,6 @@ fun getManualCallEvent(editor: Editor, isIntelliSenseAccept: Boolean): InlineCom
     val data = UserDataHolderBase().apply { this.putUserData(KEY_Q_AUTO_TRIGGER_INTELLISENSE, isIntelliSenseAccept) }
     return InlineCompletionEvent.ManualCall(editor, Q_INLINE_PROVIDER_ID, data)
 }
+
+fun InlineCompletionEvent.isDeletion(): Boolean =
+    this is InlineCompletionEvent.Backspace

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QInlineCompletionProvider.kt

@@ -404,6 +404,14 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
             CodeWhispererInvocationStatus.getInstance().setIsInvokingQInline(session, false)
         }
 
+        // this is only available in 2024.3+
+        if (request.event.isDeletion()) {
+            logInline(triggerSessionId) {
+                "Skip inline completion when deleting"
+            }
+            return InlineCompletionSuggestion.Empty
+        }
+
         val sessionContext = InlineCompletionSessionContext(triggerOffset = request.endOffset)
 
         // Pagination workaround: Always return exactly 5 variants
@@ -584,8 +592,10 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
         val project = editor.project ?: return false
 
         if (!isQConnected(project)) return false
-        if (!CodeWhispererExplorerActionManager.getInstance().isAutoEnabled() && event.isManualCall()) return false
         if (QRegionProfileManager.getInstance().hasValidConnectionButNoActiveProfile(project)) return false
+        if (event.isManualCall()) return true
+        if (!CodeWhispererExplorerActionManager.getInstance().isAutoEnabled()) return false
+
         return true
     }
 }