merged conflicts

Author: manodnyab

.changes/3.31.json

@@ -0,0 +1,17 @@
+{
+  "date" : "2024-10-03",
+  "version" : "3.31",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q Developer: Updated legal disclaimer text"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q Code Transformation: allow users to skip tests"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where multiple SSO login attempts in a short time result in 404"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where a user may get stuck while attempting to login to Builder ID"
+  } ]
+}

.changes/next-release/bugfix-10275db3-073a-4531-8559-98071108341f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix error occuring when Amazon Q attempts to show UI hints on manually triggerred inline suggestion (#4929)"
+}

.changes/next-release/bugfix-34500b24-b177-49b2-a740-3b89dfb1f702.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix 'Slow operations are prohibited on EDT.' when Amazon Q is determining if a file supports inline suggestions (#4823)"
+}

.changes/next-release/bugfix-c7239939-2067-469a-809e-594d2c95594b.json

@@ -38,6 +38,7 @@ ij_java_use_single_class_imports = true
 ij_java_while_brace_force = always
 
 [{*.kts,*.kt}]
+ij_kotlin_allow_trailing_comma = true
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647

.changes/next-release/feature-7c035aa7-49fc-4179-8287-bb94928249e2.json

@@ -1,3 +1,9 @@
+# _3.31_ (2024-10-03)
+- **(Feature)** Amazon Q Developer: Updated legal disclaimer text
+- **(Feature)** Amazon Q Code Transformation: allow users to skip tests
+- **(Bug Fix)** Fix issue where multiple SSO login attempts in a short time result in 404
+- **(Bug Fix)** Fix issue where a user may get stuck while attempting to login to Builder ID
+
 # _3.30_ (2024-09-27)
 - **(Bug Fix)** Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings
 - **(Bug Fix)** Automatically terminate orphaned process for `@workspace` helper

.editorconfig

@@ -70,4 +70,8 @@ tasks.runIde {
     systemProperty("ide.plugins.snapshot.on.unload.fail", true)
     systemProperty("memory.snapshots.path", project.rootDir)
     systemProperty("idea.auto.reload.plugins", false)
+
+    val home = project.layout.buildDirectory.dir("USER_HOME").get()
+    systemProperty("user.home", home)
+    environment("HOME", home)
 }

CHANGELOG.md

@@ -57,18 +57,14 @@ formatting:
   autoCorrect: true
   AnnotationOnSeparateLine:
     active: false
-    autoCorrect: true
   AnnotationSpacing:
     active: false
-    autoCorrect: true
   ArgumentListWrapping:
     active: true
-    autoCorrect: true
     indentSize: 4
     maxLineLength: 160
   Indentation:
     active: true
-    autoCorrect: true
     indentSize: 4
     excludes: [ '**/TelemetryDefinitions.kt' ]
   MaximumLineLength:
@@ -92,11 +88,13 @@ formatting:
     maxLineLength: 160
   SpacingBetweenDeclarationsWithComments:
     active: true
-    autoCorrect: true
     excludes: [ '**/icons/**' ]
+  #  TrailingCommaOnCallSite:
+  #    active: true
+  TrailingCommaOnDeclarationSite:
+    active: true
   Wrapping:
     active: true
-    autoCorrect: true
     indentSize: 4
     maxLineLength: 160
 

buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts

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