Split out CodeTransform and Q Chat extension declarations (#4198)

Author: rli

.github/CODEOWNERS

@@ -1,6 +1,10 @@
 * @aws/aws-ides-team
-codewhisperer/ @aws/codewhisperer-team
+
 amazonq/ @aws/aws-mynah
 amazonqFeatureDev/ @aws/earlybird
-mynah-ui/ @aws/aws-mynah
+
 codemodernizer/ @aws/elastic-gumby
+codetransform/ @aws/elastic-gumby
+codewhisperer/ @aws/codewhisperer-team
+
+mynah-ui/ @aws/aws-mynah

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -76,6 +76,11 @@ tasks.processResources {
     duplicatesStrategy = DuplicatesStrategy.WARN
 }
 
+tasks.processTestResources {
+    // TODO how can we remove this
+    duplicatesStrategy = DuplicatesStrategy.WARN
+}
+
 // Run after the project has been evaluated so that the extension (intellijToolkit) has been configured
 intellij {
     // find the name of first subproject depth, or root if not applied to a subproject hierarchy

gradle/libs.versions.toml

@@ -43,7 +43,6 @@ aws-cloudwatchlogs = { module = "software.amazon.awssdk:cloudwatchlogs", version
 aws-codecatalyst = { module = "software.amazon.awssdk:codecatalyst", version.ref = "awsSdk" }
 aws-codeGen = { module = "software.amazon.awssdk:codegen", version.ref = "awsSdk" }
 aws-cognitoidentity = { module = "software.amazon.awssdk:cognitoidentity", version.ref = "awsSdk" }
-aws-crt = { module = "software.amazon.awssdk:aws-crt-client", version.ref = "awsSdk" }
 aws-dynamodb = { module = "software.amazon.awssdk:dynamodb", version.ref = "awsSdk" }
 aws-ec2 = { module = "software.amazon.awssdk:ec2", version.ref = "awsSdk" }
 aws-ecr = { module = "software.amazon.awssdk:ecr", version.ref = "awsSdk" }

plugins/amazonq/build.gradle.kts

@@ -28,9 +28,11 @@ intellij {
 }
 
 dependencies {
-    implementation(project(":plugin-amazonq:shared"))
+    implementation(project(":plugin-amazonq:chat"))
+    implementation(project(":plugin-amazonq:codetransform"))
     implementation(project(":plugin-amazonq:codewhisperer"))
     implementation(project(":plugin-amazonq:mynah-ui"))
+    implementation(project(":plugin-amazonq:shared"))
 }
 
 configurations {

plugins/amazonq/chat/build.gradle.kts

@@ -0,0 +1,10 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+plugins {
+    id("java")
+}
+
+dependencies {
+    implementation(project(":plugin-amazonq:chat:jetbrains-community"))
+}

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

@@ -0,0 +1,20 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import software.aws.toolkits.gradle.intellij.IdeFlavor
+
+plugins {
+    id("toolkit-intellij-subplugin")
+}
+
+intellijToolkit {
+    ideFlavor.set(IdeFlavor.IC)
+}
+
+dependencies {
+    implementation(project(":plugin-amazonq:shared:jetbrains-community"))
+
+    compileOnly(project(":plugin-core:jetbrains-community"))
+
+    testImplementation(testFixtures(project(":plugin-core:jetbrains-community")))
+}

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

@@ -0,0 +1,91 @@
+<!-- Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<idea-plugin>
+    <extensionPoints>
+        <extensionPoint qualifiedName="aws.toolkit.amazonq.appFactory" interface="software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppFactory" dynamic="true" />
+    </extensionPoints>
+
+    <projectListeners>
+        <listener class="software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowListener"
+                  topic="com.intellij.openapi.wm.ex.ToolWindowManagerListener"/>
+    </projectListeners>
+
+    <extensions defaultExtensionNs="com.intellij">
+        <applicationService serviceImplementation="software.aws.toolkits.jetbrains.settings.MeetQSettings"/>
+
+        <projectService serviceImplementation="software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow" />
+
+        <!--Q Getting Started page -->
+        <fileEditorProvider implementation="software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.QGettingStartedEditorProvider"/>
+
+        <toolWindow id="amazon.q.window" anchor="right"
+                    factoryClass="software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory" icon="AwsIcons.Logos.AWS_Q" />
+    </extensions>
+
+    <extensions defaultExtensionNs="aws.toolkit.amazonq">
+        <appFactory implementation="software.aws.toolkits.jetbrains.services.cwc.AppFactory" />
+        <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevAppFactory" />
+        <appFactory implementation="software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformChatAppFactory" />
+    </extensions>
+
+    <actions>
+        <group id="aws.toolkit.q.idc.signed.in">
+            <action
+                id="q.openchat"
+                class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction"/>
+            <action
+                id="q.migrate"
+                class="software.aws.toolkits.jetbrains.services.amazonq.QMigrationNotificationAction"/>
+        </group>
+
+        <group id="aws.toolkit.q.sign.in">
+            <action id="q.sign.in" class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.SignInToQAction"/>
+            <action id="q.learn.more" class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.QLearnMoreAction"/>
+        </group>
+
+        <group id="aws.toolkit.q.enable">
+            <action class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.EnableQAction"/>
+            <reference id="q.learn.more"/>
+        </group>
+
+        <group id="aws.toolkit.q.expired">
+            <action class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.ReauthenticateWithQ"/>
+        </group>
+
+        <group
+            id="aws.toolkit.jetbrains.core.services.cwc.actions.ContextMenuActions"
+            class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToQActionGroup"
+            popup="true"
+        >
+            <add-to-group
+                group-id="EditorPopupMenu"
+                anchor="last"
+            />
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.ExplainCodeAction"
+                    class="software.aws.toolkits.jetbrains.services.cwc.commands.ExplainCodeAction">
+                <keyboard-shortcut keymap="$default" first-keystroke="meta alt E" />
+            </action>
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.RefactorCodeAction"
+                    class="software.aws.toolkits.jetbrains.services.cwc.commands.RefactorCodeAction">
+                <keyboard-shortcut keymap="$default" first-keystroke="meta alt U" />
+            </action>
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.FixCodeAction"
+                    class="software.aws.toolkits.jetbrains.services.cwc.commands.FixCodeAction">
+                <keyboard-shortcut keymap="$default" first-keystroke="meta alt Y" />
+            </action>
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.OptimizeCodeAction"
+                    class="software.aws.toolkits.jetbrains.services.cwc.commands.OptimizeCodeAction">
+                <keyboard-shortcut keymap="$default" first-keystroke="meta alt A" />
+            </action>
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.SendToPromptAction"
+                    class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToPromptAction">
+                <keyboard-shortcut keymap="$default" first-keystroke="meta alt S" />
+            </action>
+        </group>
+    </actions>
+</idea-plugin>

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/amazonq/QMigrationNotificationAction.kt renamed to plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QMigrationNotificationAction.kt

@@ -1,4 +1,4 @@
-// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package software.aws.toolkits.jetbrains.services.amazonq
@@ -8,7 +8,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.wm.ToolWindowManager
 import icons.AwsIcons
-import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
+import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AMAZON_Q_WINDOW_ID
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.UiTelemetry
@@ -18,6 +18,6 @@ class QOpenPanelAction : AnAction(message("action.q.openchat.text"), null, AwsIc
         if (isRunningOnRemoteBackend() || !isQSupportedInThisVersion()) return
         val project = e.getRequiredData(CommonDataKeys.PROJECT)
         UiTelemetry.click(project, "q_openChat")
-        ToolWindowManager.getInstance(project).getToolWindow(AmazonQToolWindowFactory.WINDOW_ID)?.activate(null, true)
+        ToolWindowManager.getInstance(project).getToolWindow(AMAZON_Q_WINDOW_ID)?.activate(null, true)
     }
 }