Merge remote-tracking branch 'origin/main' into rli/otel

Author: rli

.changes/3.35.json

@@ -0,0 +1,26 @@
+{
+  "date" : "2024-10-29",
+  "version" : "3.35",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Remove read-only mode on before diff of code changes generated by agent"
+  }, {
+    "type" : "feature",
+    "description" : "Provide more frequent updates about code changes made by agent"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q /dev: Add stop generation action"
+  }, {
+    "type" : "feature",
+    "description" : "Added inline chat support. Select some code and hit ⌘+I on Mac or Ctrl+I on Windows to start"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix pointless busy loop in Amazon Q wasting CPU cycles (#5000)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Update `@workspace` index when adding or deleting a file"
+  }, {
+    "type" : "deprecation",
+    "description" : "An upcoming release will remove support for JetBrains Gateway version 2024.2 and for IDEs based on the 2023.3 platform"
+  } ]
+}

.changes/next-release/bugfix-b18a6b61-e1e9-42dd-952d-7c32ea7a3a19.json

@@ -1,3 +1,12 @@
+# _3.35_ (2024-10-29)
+- **(Feature)** Remove read-only mode on before diff of code changes generated by agent
+- **(Feature)** Provide more frequent updates about code changes made by agent
+- **(Feature)** Amazon Q /dev: Add stop generation action
+- **(Feature)** Added inline chat support. Select some code and hit ⌘+I on Mac or Ctrl+I on Windows to start
+- **(Bug Fix)** Fix pointless busy loop in Amazon Q wasting CPU cycles ([#5000](https://github.com/aws/aws-toolkit-jetbrains/issues/5000))
+- **(Bug Fix)** Update `@workspace` index when adding or deleting a file
+- **(Deprecation)** An upcoming release will remove support for JetBrains Gateway version 2024.2 and for IDEs based on the 2023.3 platform
+
 # _3.34_ (2024-10-22)
 - **(Bug Fix)** Fix issue where the plugin can't read SSO tokens from disk / always returns 'Unable to load client registration'
 

.changes/next-release/bugfix-e0e23b25-959c-46ef-a9f9-13283cff5568.json

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

.changes/next-release/deprecation-a09c7f8f-fb8c-4f71-8039-f86faf4c7273.json

@@ -6,6 +6,7 @@ assertJ = "3.26.3"
 awsSdk = "2.26.25"
 commonmark = "0.22.0"
 detekt = "1.23.7"
+diff-util = "4.12"
 intellijExt = "1.1.8"
 # match with <root>/settings.gradle.kts
 intellijGradle = "2.1.0"
@@ -71,6 +72,7 @@ commons-collections = { module = "org.apache.commons:commons-collections4", vers
 commons-io = { module = "commons-io:commons-io", version.ref = "apache-commons-io" }
 detekt-api = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" }
 detekt-formattingRules = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
+diff-util = { module = "io.github.java-diff-utils:java-diff-utils", version.ref = "diff-util" }
 detekt-test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" }
 gradlePlugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 gradlePlugin-ideaExt = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "intellijExt" }

.changes/next-release/feature-c5c4cc47-126a-4236-82af-70743a805ca8.json

@@ -19,6 +19,7 @@ dependencies {
     implementation(project(":plugin-amazonq:shared:jetbrains-community"))
     // everything references codewhisperer, which is not ideal
     implementation(project(":plugin-amazonq:codewhisperer:jetbrains-community"))
+    implementation(libs.diff.util)
 
     compileOnly(project(":plugin-core:jetbrains-community"))
 

CHANGELOG.md

@@ -79,6 +79,13 @@
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToPromptAction">
                 <keyboard-shortcut keymap="$default" first-keystroke="meta alt S" />
             </action>
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.inline.openChat"
+                    class="software.aws.toolkits.jetbrains.services.cwc.inline.OpenChatInputAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="meta I"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="meta I"/>
+                <keyboard-shortcut keymap="$default" first-keystroke="control I"/>
+            </action>
         </group>
     </actions>
 </idea-plugin>