Merge remote-tracking branch 'origin/main' into rli/delete-awscaps-provider

 Conflicts:
	plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

Author: rli

.changes/3.77.json

@@ -0,0 +1,5 @@
+{
+  "date" : "2025-06-16",
+  "version" : "3.77",
+  "entries" : [ ]
+}

.changes/3.78.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-06-18",
+  "version" : "3.78",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Add model selection feature"
+  } ]
+}

.changes/3.79.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-06-25",
+  "version" : "3.79",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "/transform: run all builds client-side"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q Chat: Pin context items in chat and manage workspace rules"
+  } ]
+}

.changes/3.80.json

@@ -0,0 +1,17 @@
+{
+  "date" : "2025-06-26",
+  "version" : "3.80",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q inline: now display completions much more consistently at the user's current caret position"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q inline: now Q completions can co-exist with JetBrains' native IntelliSense completions, when both are showing, press Tab or your customized key shortcuts to accept Q completions and press Enter to accept IntelliSense completions."
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q inline: now shows in a JetBrains native UX of popup and inlay text style"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q inline: The new UX allows configurable shortcuts for accepting completions and navigating through completions. *Caveat: for users using the previous versions, if you have configured your custom key shortcuts for the Q inline before, you will have to re-configure them again in Amazon Q settings due to a change in the keymap actions."
+  } ]
+}

.changes/3.81.json

@@ -0,0 +1,5 @@
+{
+  "date" : "2025-06-27",
+  "version" : "3.81",
+  "entries" : [ ]
+}

.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"
+  } ]
+}

.github/workflows/generateUpdatesXml.py

@@ -15,7 +15,10 @@
     buildRegex = r'.*(\d{3}).zip'
     # given plugin-amazonq-3.39-SNAPSHOT-1731096007-241.zip,
     # capture 3.39-SNAPSHOT-1731096007-241 in group 1
-    versionRegex = r'.*?\-(\d.*-\d{3})\.zip'
+    # or
+    # given plugin-amazonq-3.39-SNAPSHOT-1731096007.241.zip,
+    # capture 3.39-SNAPSHOT-1731096007.241 in group 1
+    versionRegex = r'.*?\-(\d.*[.-]\d{3})\.zip$'
     for asset in data['assets']:
         name = asset['name']
         if ('plugin-amazonq' in name):

CHANGELOG.md

@@ -1,3 +1,26 @@
+# _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)
+- **(Feature)** Amazon Q inline: now display completions much more consistently at the user's current caret position
+- **(Feature)** Amazon Q inline: now Q completions can co-exist with JetBrains' native IntelliSense completions, when both are showing, press Tab or your customized key shortcuts to accept Q completions and press Enter to accept IntelliSense completions.
+- **(Feature)** Amazon Q inline: now shows in a JetBrains native UX of popup and inlay text style
+- **(Feature)** Amazon Q inline: The new UX allows configurable shortcuts for accepting completions and navigating through completions. *Caveat: for users using the previous versions, if you have configured your custom key shortcuts for the Q inline before, you will have to re-configure them again in Amazon Q settings due to a change in the keymap actions.
+
+# _3.79_ (2025-06-25)
+- **(Feature)** /transform: run all builds client-side
+- **(Feature)** Amazon Q Chat: Pin context items in chat and manage workspace rules
+
+# _3.78_ (2025-06-18)
+- **(Feature)** Add model selection feature
+
+# _3.77_ (2025-06-16)
+
 # _3.76_ (2025-06-12)
 - **(Feature)** Add MCP support for Amazon Q chat
 

CONTRIBUTING.md

@@ -24,6 +24,7 @@ reported the issue. Please try to include as much information as you can. Detail
 
 * [Java 21](https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/downloads-list.html)
 * [Git](https://git-scm.com/)
+  * If you run into a build issue on first build, ensure Git is configured to handle longer paths (common with Windows - run command as Admin): `git config --system core.longpaths true`
 * .NET 6
   * In theory, you can use a higher version, however we build with .NET 6 in CI
   * macOS steps: