Merge branch 'main' into diagnostics

Author: liumofei-amazon

.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/next-release/bugfix-2488e2f1-f725-4e01-b38a-8b6953cf5f18.json

@@ -1,3 +1,6 @@
+# _3.82_ (2025-07-03)
+- **(Bug Fix)** Skip inline completion when deleting characters
+
 # _3.81_ (2025-06-27)
 
 # _3.80_ (2025-06-26)

CHANGELOG.md

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

gradle.properties

@@ -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/constants/CodeTransformChatItems.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/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -16,14 +16,14 @@ import com.intellij.openapi.fileEditor.FileEditorManagerEvent
 import com.intellij.openapi.fileEditor.FileEditorManagerListener
 import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.openapi.vfs.newvfs.BulkFileListener
 import com.intellij.openapi.vfs.newvfs.events.VFileContentChangeEvent
 import com.intellij.openapi.vfs.newvfs.events.VFileEvent
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.eclipse.lsp4j.DidChangeTextDocumentParams
 import org.eclipse.lsp4j.DidCloseTextDocumentParams
@@ -46,6 +46,7 @@ class TextDocumentServiceHandler(
     BulkFileListener,
     DocumentListener,
     Disposable {
+
     init {
         // didOpen & didClose events
         project.messageBus.connect(this).subscribe(
@@ -68,9 +69,8 @@ class TextDocumentServiceHandler(
         // open files on startup
         cs.launch {
             val fileEditorManager = FileEditorManager.getInstance(project)
-            fileEditorManager.openFiles.forEach { file ->
+            fileEditorManager.selectedFiles.forEach { file ->
                 handleFileOpened(file)
-                delay(100)
             }
         }
     }
@@ -84,23 +84,33 @@ class TextDocumentServiceHandler(
             }
             ApplicationManager.getApplication().runReadAction {
                 FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener)
-                file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
             }
-        }
+            file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
+
+            Disposer.register(this) {
+                ApplicationManager.getApplication().runReadAction {
+                    val existingListener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
+                    if (existingListener != null) {
+                        FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(existingListener)
+                        file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
+                    }
+                }
+            }
 
-        cs.launch {
-            AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
-                toUriString(file)?.let { uri ->
-                    languageServer.textDocumentService.didOpen(
-                        DidOpenTextDocumentParams().apply {
-                            textDocument = TextDocumentItem().apply {
-                                this.uri = uri
-                                text = file.inputStream.readAllBytes().decodeToString()
-                                languageId = file.fileType.name.lowercase()
-                                version = file.modificationStamp.toInt()
+            cs.launch {
+                AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
+                    toUriString(file)?.let { uri ->
+                        languageServer.textDocumentService.didOpen(
+                            DidOpenTextDocumentParams().apply {
+                                textDocument = TextDocumentItem().apply {
+                                    this.uri = uri
+                                    text = file.inputStream.readAllBytes().decodeToString()
+                                    languageId = file.fileType.name.lowercase()
+                                    version = file.modificationStamp.toInt()
+                                }
                             }
-                        }
-                    )
+                        )
+                    }
                 }
             }
         }
@@ -116,6 +126,7 @@ class TextDocumentServiceHandler(
                             textDocument = TextDocumentIdentifier().apply {
                                 this.uri = uri
                             }
+                            // TODO: should respect `textDocumentSync.save.includeText` server capability config
                             text = document.text
                         }
                     )
@@ -125,10 +136,12 @@ class TextDocumentServiceHandler(
     }
 
     override fun after(events: MutableList<out VFileEvent>) {
-        cs.launch {
-            AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
-                events.filterIsInstance<VFileContentChangeEvent>().forEach { event ->
-                    val document = FileDocumentManager.getInstance().getCachedDocument(event.file) ?: return@forEach
+        events.filterIsInstance<VFileContentChangeEvent>().forEach { event ->
+            val document = FileDocumentManager.getInstance().getCachedDocument(event.file) ?: return@forEach
+
+            handleFileOpened(event.file)
+            cs.launch {
+                AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
                     toUriString(event.file)?.let { uri ->
                         languageServer.textDocumentService.didChange(
                             DidChangeTextDocumentParams().apply {
@@ -164,17 +177,18 @@ class TextDocumentServiceHandler(
         if (listener != null) {
             FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener)
             file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
-        }
-        cs.launch {
-            AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
-                toUriString(file)?.let { uri ->
-                    languageServer.textDocumentService.didClose(
-                        DidCloseTextDocumentParams().apply {
-                            textDocument = TextDocumentIdentifier().apply {
-                                this.uri = uri
+
+            cs.launch {
+                AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
+                    toUriString(file)?.let { uri ->
+                        languageServer.textDocumentService.didClose(
+                            DidCloseTextDocumentParams().apply {
+                                textDocument = TextDocumentIdentifier().apply {
+                                    this.uri = uri
+                                }
                             }
-                        }
-                    )
+                        )
+                    }
                 }
             }
         }
@@ -185,10 +199,12 @@ class TextDocumentServiceHandler(
     }
 
     private fun handleActiveEditorChange(fileEditor: FileEditor?) {
+        val editor = (fileEditor as? TextEditor)?.editor ?: return
+        editor.virtualFile?.let { handleFileOpened(it) }
+
         // Extract text editor if it's a TextEditor, otherwise null
-        val editor = (fileEditor as? TextEditor)?.editor
-        val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
-        val cursorState = editor?.let { getCursorState(it) }
+        val textDocumentIdentifier = TextDocumentIdentifier(toUriString(editor.virtualFile))
+        val cursorState = getCursorState(editor)
 
         val params = mapOf(
             "textDocument" to textDocumentIdentifier,