Resolved merge conflicts

Author: manodnyab

.changes/3.36.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2024-10-30",
+  "version" : "3.36",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix inline chat default key binding not working on windows and linux"
+  } ]
+}

.changes/3.37.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2024-10-31",
+  "version" : "3.37",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q /dev: Fix the issue resulting in the first request per conversation to /dev failing"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix inline chat shortcut hint breaking text selection on remote editors"
+  } ]
+}

.github/workflows/prerelease.yml

@@ -20,12 +20,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: remove unwanted dependencies
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+      - name: Maximize Build Space
+        if: runner.os == 'Linux'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          large-packages: false
       - uses: actions/setup-java@v4
         with:
           distribution: 'corretto'

CHANGELOG.md

@@ -1,3 +1,10 @@
+# _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
+
+# _3.36_ (2024-10-30)
+- **(Bug Fix)** Fix inline chat default key binding not working on windows and linux
+
 # _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

buildSrc/src/main/kotlin/toolkit-detekt.gradle.kts

@@ -16,6 +16,7 @@ dependencies {
     detektPlugins(project(":detekt-rules"))
 }
 
+// detekt with type introspection configured in kotlin conventions
 private val detektFiles = fileTree(projectDir).matching {
     include("**/*.kt", "**/*.kts")
     exclude("**/build")

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

@@ -60,17 +60,17 @@ project.afterEvaluate {
     }
 }
 
-// can't figure out why exclude() doesn't work on the generated source tree, so copy logic from detekt
+// detekt applies sources directly from source sets in this scenario
+// can't figure out why source is empty in the detekt conventions
 project.extensions.getByType(KotlinJvmProjectExtension::class.java).target.compilations.configureEach {
-    val inputSource = kotlinSourceSets
-        .map { it.kotlin.sourceDirectories.filter { !it.path.contains("build") } }
-        .fold(project.files() as FileCollection) { collection, next -> collection.plus(next) }
+    // can't figure out why exclude("build/**") doesn't work
+    fun FileTree.withoutBuild() = filter { f -> f.path.split(File.separatorChar).none { it == "build" } }.asFileTree
 
     tasks.named<Detekt>(DetektPlugin.DETEKT_TASK_NAME + name.capitalize()).configure {
-        setSource(inputSource)
+        source = source.withoutBuild()
     }
 
     tasks.named<DetektCreateBaselineTask>(DetektPlugin.BASELINE_TASK_NAME + name.capitalize()).configure {
-        setSource(inputSource)
+        source = source.withoutBuild()
     }
 }

gradle.properties

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

gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
 apache-commons-collections = "4.4"
 apache-commons-io = "2.16.0"
+apache-commons-text = "1.12.0"
 assertJ = "3.26.3"
 # match with <root>/settings.gradle.kts
 awsSdk = "2.26.25"
@@ -26,7 +27,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.272"
+telemetryGenerator = "1.0.278"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime
@@ -70,6 +71,7 @@ aws-sts = { module = "software.amazon.awssdk:sts", version.ref = "awsSdk" }
 commonmark = { module = "org.commonmark:commonmark", version.ref = "commonmark" }
 commons-collections = { module = "org.apache.commons:commons-collections4", version.ref = "apache-commons-collections" }
 commons-io = { module = "commons-io:commons-io", version.ref = "apache-commons-io" }
+commons-text = {module = "org.apache.commons:commons-text", version.ref = "apache-commons-text"}
 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" }

plugins/amazonq/chat/jetbrains-community/build.gradle.kts

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

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -20,6 +20,7 @@
                     factoryClass="software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory" icon="AwsIcons.Logos.AWS_Q" />
 
         <postStartupActivity implementation="software.aws.toolkits.jetbrains.services.amazonq.startup.AmazonQStartupActivity"/>
+        <actionPromoter order="last" implementation="software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatActionPromoter"/>
     </extensions>
 
     <extensions defaultExtensionNs="amazon.q">