Merge branch 'main' into samgst/UserFacingNetworkErrors

Author: samgst-amazon

.changes/3.38.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2024-11-07",
+  "version" : "3.38",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Improve the position that inline chat shortcut hint is shown in editor"
+  }, {
+    "type" : "bugfix",
+    "description" : "Improve `@workspace` index start stop strategy"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fixed an issue where Q inline won't appear in JetBrains remote 2024.2+"
+  } ]
+}

.changes/next-release/bugfix-1b531ca4-5b80-48d9-89e7-ac88adc77ad5.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix poor inline suggestions from Amazon Q caused by improperly formatted supplemental context"
+}

.changes/next-release/bugfix-4dc2263c-25fa-4d07-a6e1-69389f5ec001.json

@@ -1,3 +1,8 @@
+# _3.38_ (2024-11-07)
+- **(Bug Fix)** Improve the position that inline chat shortcut hint is shown in editor
+- **(Bug Fix)** Improve `@workspace` index start stop strategy
+- **(Bug Fix)** Fixed an issue where Q inline won't appear in JetBrains remote 2024.2+
+
 # _3.37_ (2024-10-31)
 - **(Bug Fix)** Amazon Q /dev: Fix the issue resulting in the first request per conversation to /dev failing
 - **(Bug Fix)** Fix inline chat shortcut hint breaking text selection on remote editors

.changes/next-release/bugfix-4fee3628-1445-40f3-b164-2b0d3c12bd19.json

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

.changes/next-release/bugfix-eb803511-b66c-454e-a832-ca189572d1af.json

@@ -364,7 +364,7 @@ class ProjectContextProviderTest {
                         .withResponseBody(
                             Body(validQueryInlineResponse)
                         )
-                        .withFixedDelay(51) // 10 sec
+                        .withFixedDelay(101) // 100 ms
                 )
             )
 

CHANGELOG.md

@@ -15,6 +15,7 @@ import com.intellij.util.concurrency.annotations.RequiresEdt
 import software.amazon.awssdk.services.codewhispererruntime.model.Completion
 import software.amazon.awssdk.services.codewhispererruntime.model.GenerateCompletionsResponse
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
+import software.aws.toolkits.jetbrains.services.amazonq.SUPPLEMENTAL_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.PayloadContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManagerNew
@@ -73,7 +74,7 @@ data class SupplementalContextInfo(
         }
 
     val isProcessTimeout: Boolean
-        get() = latency > CodeWhispererConstants.SUPPLEMENTAL_CONTEXT_TIMEOUT
+        get() = latency > SUPPLEMENTAL_CONTEXT_TIMEOUT
 
     companion object {
         fun emptyCrossFileContextInfo(targetFileName: String): SupplementalContextInfo = SupplementalContextInfo(

gradle.properties

@@ -53,6 +53,7 @@ import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererConnection
+import software.aws.toolkits.jetbrains.services.amazonq.SUPPLEMENTAL_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManager
@@ -76,7 +77,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhis
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CaretMovement
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeInsightsSettingsFacade
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.SUPPLEMENTAL_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getCompletionType
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getTelemetryOptOutPreference
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.notifyErrorCodeWhispererUsageLimit