Merge branch 'main' into main

Author: bryceitoc9

.changes/next-release/feature-00347743-35b5-4e83-8f89-c86f23a05e3f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q /dev: support `.gradle` files"
+}

.changes/next-release/feature-2c399a8b-1bee-48eb-8674-96fac8004d5f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Inline Auto trigger will now happen more consistently and will not conflict with JetBrains code completion."
+}

.changes/next-release/feature-625c1f2c-3dfd-47cb-8907-408041a3642c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Uses AB variation as the name for overriden customizations"
+}

.changes/next-release/feature-8414d10c-d000-4488-9bc7-3a4616b9c7d5.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "The key shortcuts for Q inline suggestions are now configurable from keymap settings. Default key shortcuts for navigating through suggestions are changed from left/right arrow keys to option(alt) + [ and option(alt) + ], respectively."
+}

.changes/next-release/feature-8be25635-8a25-4526-9f1c-515685fa32b4.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "The Q suggestion inline popup will now hide by default and will show when the user hovers over the suggestion text, the IDE code suggestion popup will also appear to be more transparent to unblock seeing the multi-line suggestions."
+}

.github/workflows/mac.yml

@@ -24,4 +24,4 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew check coverageReport --info --full-stacktrace --console plain
+      run: ./gradlew check coverageReport -x :plugin-toolkit:jetbrains-rider:test --info --full-stacktrace --console plain

buildspec/linuxIntegrationTests.yml

@@ -39,7 +39,7 @@ phases:
       - ls -alh $AWS_CONFIG_FILE
       - cat $AWS_CONFIG_FILE
       - chmod +x gradlew
-      - DISPLAY=:22 ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME integrationTest coverageReport --info --console plain
+      - DISPLAY=:22 ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME integrationTest coverageReport -x :plugin-toolkit:jetbrains-rider:integrationTest --info --console plain
       - |
         if [ $(docker ps -q | wc -l) -gt 0 ]; then
             echo 'Docker containers were not completely cleaned up!';

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

@@ -145,7 +145,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
 
         when (message) {
             is BrowserMessage.PrepareUi -> {
-                this.prepareBrowser(BrowserState(FeatureId.Q, false))
+                this.prepareBrowser(BrowserState(FeatureId.AmazonQ, false))
                 WebviewTelemetry.amazonqSignInOpened(
                     project,
                     reAuth = isQExpired(project)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt

@@ -95,7 +95,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         val component = if (isQConnected(project) && !isQExpired(project)) {
             AmazonQToolWindow.getInstance(project).component
         } else {
-            QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Q))
+            QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AmazonQ))
             QWebviewPanel.getInstance(project).component
         }
 
@@ -141,7 +141,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             openMeetQPage(project)
         }
 
-        QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Q))
+        QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AmazonQ))
 
         // isQConnected alone is not robust and there is race condition (read/update connection states)
         val component = if (isNewConnectionForQ || (isQConnected(project) && !isQExpired(project))) {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClient.kt

@@ -89,6 +89,42 @@ class FeatureDevClient(
             requestBuilder.userContext(featureDevUserContext)
         }
 
+    fun sendFeatureDevCodeGenerationEvent(
+        conversationId: String,
+        linesOfCodeGenerated: Int,
+        charactersOfCodeGenerated: Int,
+    ): SendTelemetryEventResponse =
+        bearerClient().sendTelemetryEvent { requestBuilder ->
+            requestBuilder.telemetryEvent { telemetryEventBuilder ->
+                telemetryEventBuilder.featureDevCodeGenerationEvent {
+                    it
+                        .conversationId(conversationId)
+                        .linesOfCodeGenerated(linesOfCodeGenerated)
+                        .charactersOfCodeGenerated(charactersOfCodeGenerated)
+                }
+            }
+            requestBuilder.optOutPreference(getTelemetryOptOutPreference())
+            requestBuilder.userContext(featureDevUserContext)
+        }
+
+    fun sendFeatureDevCodeAcceptanceEvent(
+        conversationId: String,
+        linesOfCodeAccepted: Int,
+        charactersOfCodeAccepted: Int,
+    ): SendTelemetryEventResponse =
+        bearerClient().sendTelemetryEvent { requestBuilder ->
+            requestBuilder.telemetryEvent { telemetryEventBuilder ->
+                telemetryEventBuilder.featureDevCodeAcceptanceEvent {
+                    it
+                        .conversationId(conversationId)
+                        .linesOfCodeAccepted(linesOfCodeAccepted)
+                        .charactersOfCodeAccepted(charactersOfCodeAccepted)
+                }
+            }
+            requestBuilder.optOutPreference(getTelemetryOptOutPreference())
+            requestBuilder.userContext(featureDevUserContext)
+        }
+
     fun createTaskAssistConversation(): CreateTaskAssistConversationResponse =
         bearerClient().createTaskAssistConversation(
             CreateTaskAssistConversationRequest.builder().build(),