Merge branch 'model-selection' of github.com:zuoyaofu/aws-toolkit-jetbrains into model-selection

Author: zuoyaofu

.changes/3.73.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-05-29",
+  "version" : "3.73",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "/transform: handle InvalidGrantException properly when polling job status"
+  } ]
+}

.changes/next-release/bugfix-ddfb0a9a-529f-4597-8b7a-519d4e838fa4.json

@@ -1,3 +1,6 @@
+# _3.73_ (2025-05-29)
+- **(Bug Fix)** /transform: handle InvalidGrantException properly when polling job status
+
 # _3.72_ (2025-05-22)
 - **(Removal)** /transform: remove option to receive multiple diffs
 

CHANGELOG.md

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

gradle.properties

@@ -78,7 +78,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
             val name = telemetryMap["name"] as? String ?: return
 
             @Suppress("UNCHECKED_CAST")
-            val data = telemetryMap["data"] as? Map<String, Any> ?: return
+            val data = telemetryMap["data"] as? Map<String, Any?> ?: return
 
             TelemetryService.getInstance().record(project) {
                 datum(name) {
@@ -91,7 +91,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                     }
 
                     data.forEach { (key, value) ->
-                        metadata(key, value.toString())
+                        metadata(key, value?.toString() ?: "null")
                     }
                 }
             }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

@@ -22,6 +22,8 @@ import org.eclipse.lsp4j.DidChangeTextDocumentParams
 import org.eclipse.lsp4j.DidCloseTextDocumentParams
 import org.eclipse.lsp4j.DidOpenTextDocumentParams
 import org.eclipse.lsp4j.DidSaveTextDocumentParams
+import org.eclipse.lsp4j.Position
+import org.eclipse.lsp4j.Range
 import org.eclipse.lsp4j.TextDocumentContentChangeEvent
 import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.TextDocumentItem
@@ -164,6 +166,9 @@ class TextDocumentServiceHandler(
             pluginAwareExecuteOnPooledThread {
                 val vFile = FileDocumentManager.getInstance().getFile(event.document) ?: return@pluginAwareExecuteOnPooledThread
                 toUriString(vFile)?.let { uri ->
+                    val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return@pluginAwareExecuteOnPooledThread
+                    val logicalPosition = editor.offsetToLogicalPosition(event.offset)
+                    val newLogicalPosition = editor.offsetToLogicalPosition(event.offset + event.newLength)
                     languageServer.textDocumentService.didChange(
                         DidChangeTextDocumentParams().apply {
                             textDocument = VersionedTextDocumentIdentifier().apply {
@@ -173,6 +178,10 @@ class TextDocumentServiceHandler(
                             contentChanges = listOf(
                                 TextDocumentContentChangeEvent().apply {
                                     text = event.newFragment.toString()
+                                    range = Range(
+                                        Position(logicalPosition.line, logicalPosition.column),
+                                        Position(newLogicalPosition.line, newLogicalPosition.column)
+                                    )
                                 }
                             )
                         }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

@@ -81,6 +81,36 @@ class AmazonQLanguageClientImplTest {
         )
     }
 
+    @Test
+    fun `telemetryEvent handles null`() {
+        val telemetryService = mockk<TelemetryService>(relaxed = true)
+        mockkObject(TelemetryService)
+        every { TelemetryService.getInstance() } returns telemetryService
+
+        val builderCaptor = slot<MetricEvent.Builder.() -> Unit>()
+        every { telemetryService.record(project, capture(builderCaptor)) } returns Unit
+
+        val event = mapOf(
+            "name" to "test_event",
+            "data" to mapOf(
+                "key1" to null,
+            )
+        )
+
+        sut.telemetryEvent(event)
+
+        val builder = DefaultMetricEvent.builder()
+        builderCaptor.captured.invoke(builder)
+
+        val metricEvent = builder.build()
+        val datum = metricEvent.data.first()
+
+        assertThat(datum.name).isEqualTo("test_event")
+        assertThat(datum.metadata).contains(
+            entry("key1", "null"),
+        )
+    }
+
     @Test
     fun `telemetryEvent handles event with result field`() {
         val telemetryService = mockk<TelemetryService>(relaxed = true)