Merge branch 'main' into dmsWork

dhasani23 · web-flow · commit b8abfe34fb5a · 2024-11-15T17:17:51.000-08:00
diff --git a/.changes/3.40.json b/.changes/3.40.json
@@ -0,0 +1,14 @@
+{
+  "date" : "2024-11-14",
+  "version" : "3.40",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q /dev: Add an action to accept individual files"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix a bug when Amazon Q responds with still indexing message even when `@workspace` index is done"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where Amazon Q inline chat can be invoked from non-editor windows"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-0150eb94-2d05-40f5-8473-b2ee1fd6bf09.json b/.changes/next-release/bugfix-0150eb94-2d05-40f5-8473-b2ee1fd6bf09.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q chat: `@workspace` command shown in all tab types"
+}
diff --git a/.changes/next-release/bugfix-418aac17-9702-451e-8880-9c41b3441574.json b/.changes/next-release/bugfix-418aac17-9702-451e-8880-9c41b3441574.json
diff --git a/.changes/next-release/bugfix-4a387896-7a93-4474-a86d-f6dc5d53ab57.json b/.changes/next-release/bugfix-4a387896-7a93-4474-a86d-f6dc5d53ab57.json
diff --git a/.changes/next-release/feature-6403bbaf-0521-4d39-abbf-f9e25fe5a837.json b/.changes/next-release/feature-6403bbaf-0521-4d39-abbf-f9e25fe5a837.json
diff --git a/.changes/next-release/feature-7d7a7670-7076-4886-affe-0d784d4bbd27.json b/.changes/next-release/feature-7d7a7670-7076-4886-affe-0d784d4bbd27.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Code Transform: Enable support for Java 17 projects."
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# _3.40_ (2024-11-14)
+- **(Feature)** Amazon Q /dev: Add an action to accept individual files
+- **(Bug Fix)** Fix a bug when Amazon Q responds with still indexing message even when `@workspace` index is done
+- **(Bug Fix)** Fix issue where Amazon Q inline chat can be invoked from non-editor windows
+
 # _3.39_ (2024-11-12)
 - **(Bug Fix)** Fix poor inline suggestions from Amazon Q caused by improperly formatted supplemental context
 
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.40-SNAPSHOT
+toolkitVersion=3.41-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt
@@ -94,6 +94,7 @@ class ChatController private constructor(
 
     private val messagePublisher: MessagePublisher = context.messagesFromAppToUi
     private val telemetryHelper = TelemetryHelper(context.project, chatSessionStorage)
+
     constructor(
         context: AmazonQAppInitContext,
     ) : this(
@@ -144,7 +145,11 @@ class ChatController private constructor(
             } else {
                 sendOpenSettingsMessage(message.tabId)
             }
-        } else if (CodeWhispererSettings.getInstance().isProjectContextEnabled() && isInternalUser) {
+        } else if (
+            CodeWhispererSettings.getInstance().isProjectContextEnabled() &&
+            isInternalUser &&
+            ProjectContextController.getInstance(context.project).getProjectContextIndexComplete()
+        ) {
             // if user does not have @workspace in the prompt, but user is Amazon internal
             // add project context by default
             val projectContextController = ProjectContextController.getInstance(context.project)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
@@ -125,6 +125,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
     private val supportedJavaMappings = mapOf(
         JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17),
         JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17),
+        JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17),
     )
 
     init {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
@@ -250,6 +250,7 @@ fun buildLanguageUpgradeProjectValidChatContent() = CodeTransformChatMessageCont
 
 fun buildProjectInvalidChatContent(validationResult: ValidationResult): CodeTransformChatMessageContent {
     val errorMessage = when (validationResult.invalidTelemetryReason.category) {
+        CodeTransformPreValidationError.NoPom -> message("codemodernizer.chat.message.validation.error.no_pom", CODE_TRANSFORM_PREREQUISITES)
         CodeTransformPreValidationError.UnsupportedJavaVersion -> message("codemodernizer.chat.message.validation.error.unsupported_java_version")
         CodeTransformPreValidationError.RemoteRunProject -> message("codemodernizer.notification.warn.invalid_project.description.reason.remote_backend")
         CodeTransformPreValidationError.NonSsoLogin -> message("codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in")
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts
@@ -2,6 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import { QuickActionCommandGroup } from "@aws/mynah-ui-chat"
 
 type MessageCommand =
     | 'chat-prompt'
@@ -49,3 +50,13 @@ type MessageCommand =
     | 'store-code-result-message-id'
 
 export type ExtensionMessage = Record<string, any> & { command: MessageCommand }
+
+export const workspaceCommand: QuickActionCommandGroup = {
+    groupName: 'Mention code',
+    commands: [
+        {
+            command: '@workspace',
+            description: '(BETA) Reference all code in workspace.',
+        },
+    ],
+}
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/tabs/generator.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/tabs/generator.ts
@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChatItemType, MynahUIDataModel } from '@aws/mynah-ui-chat'
+import { ChatItemType, MynahUIDataModel, QuickActionCommandGroup } from '@aws/mynah-ui-chat'
 import { TabType } from '../storages/tabsStorage'
 import { FollowUpGenerator } from '../followUps/generator'
 import { QuickActionGenerator } from '../quickActions/generator'
+import { workspaceCommand } from '../commands'
 
 export interface TabDataGeneratorProps {
     isFeatureDevEnabled: boolean
@@ -57,6 +58,10 @@ What would you like to work on?`,
         ],
     ])
 
+    private tabContextCommand: Map<TabType, QuickActionCommandGroup[]> = new Map([
+        ['cwc', [workspaceCommand]],
+    ])
+
     constructor(props: TabDataGeneratorProps) {
         this.followUpsGenerator = new FollowUpGenerator()
         this.quickActionsGenerator = new QuickActionGenerator({
@@ -72,17 +77,7 @@ What would you like to work on?`,
                 'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).',
             quickActionCommands: this.quickActionsGenerator.generateForTab(tabType),
             promptInputPlaceholder: this.tabInputPlaceholder.get(tabType),
-            contextCommands: [
-                {
-                    groupName: 'Mention code',
-                    commands: [
-                        {
-                            command: '@workspace',
-                            description: '(BETA) Reference all code in workspace.',
-                        },
-                    ],
-                },
-            ],
+            contextCommands: this.tabContextCommand.get(tabType),
             chatItems: needWelcomeMessages
                 ? [
                       {
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -642,9 +642,9 @@ codemodernizer.chat.message.validation.error.invalid_target_db=I can only conver
 codemodernizer.chat.message.validation.error.missing_sct_file=An .sct file is required for transformation. Make sure that you've uploaded the .zip file you retrieved from your schema conversion in AWS DMS.
 codemodernizer.chat.message.validation.error.more_info=For more information, see the [Amazon Q documentation]({0}).
 codemodernizer.chat.message.validation.error.no_java_project=Sorry, I could not find an open Java module with embedded Oracle SQL statements. Make sure you have a Java module open that has at least 1 content root.
-codemodernizer.chat.message.validation.error.no_pom=Sorry, I couldn't find a module that I can upgrade. Currently, I can only upgrade Java 8 or Java 11 modules built on Maven. If you have a Java 8 or Java 11 module in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
-codemodernizer.chat.message.validation.error.other=Sorry, I couldn't find a module that I can upgrade. Currently, I can only upgrade Java 8 or Java 11 projects built on Maven. If you have a Java 8 or Java 11 module in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
-codemodernizer.chat.message.validation.error.unsupported_java_version=Sorry, I couldn't find a module that I can upgrade. Currently, I can only upgrade Java 8 or Java 11 modules built on Maven. If you have a Java 8 or Java 11 module in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
+codemodernizer.chat.message.validation.error.no_pom=I couldn't find a module that I can upgrade. Your Java project must be built on Maven and contain a pom.xml file. For more information, see the [Amazon Q documentation]({0}).
+codemodernizer.chat.message.validation.error.other=I couldn't find a module that I can upgrade. Currently, I support Java 8, Java 11, and Java 17 projects built on Maven. Make sure your project is open in the IDE. If you have a Java 8, Java 11, or Java 17 module in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
+codemodernizer.chat.message.validation.error.unsupported_java_version=I couldn't find a module that I can upgrade. Currently, I support Java 8, Java 11, and Java 17 projects built on Maven. Make sure your project is open in the IDE. If you have a Java 8, Java 11, or Java 17 in your workspace, you might need to configure your project so that I can find it. Go to File and choose Project Structure. In the Projects tab, set the correct project JDK and the correct language level. In the Modules tab, set the correct module JDK and language level.
 codemodernizer.chat.message.validation.no_jdk=I couldn't build your project with your current JDK configuration. To update your JDK, go to File and choose Project Structure. In the Projects tab, set the correct project JDK in the SDK field. In the Modules tab, set the correct module JDK in the SDK field. In Maven Runner settings, set the correct JDK in the JRE field.
 codemodernizer.chat.prompt.label.dependency_current_version=Current version
 codemodernizer.chat.prompt.label.dependency_name=Dependency name
@@ -719,9 +719,11 @@ codemodernizer.notification.warn.download_failed_other.content=Amazon Q ran into
 codemodernizer.notification.warn.download_failed_ssl.content=Please make sure all your certificates for your proxy client have been set up correctly for your IDE.
 codemodernizer.notification.warn.download_failed_wildcard.content=Check your IDE proxy settings and remove any wildcard (*) references, and then try viewing the diff again.
 codemodernizer.notification.warn.expired_credentials.title=Your connection to Q has expired
-codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots=None of your open modules are supported by Amazon Q Code Transformation. Currently, Amazon Q can only upgrade projects with content roots configured.
+codemodernizer.notification.warn.invalid_project.description.reason.invalid_jdk_versions=None of your open modules are supported for code transformation with Amazon Q. Amazon Q can upgrade Java 8, Java 11, and Java 17 projects built on Maven.
+codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots=None of your open modules are supported for code transformation with Amazon Q. Amazon Q can upgrade Java 8, Java 11, and Java 17 projects built on Maven.
+codemodernizer.notification.warn.invalid_project.description.reason.no_valid_files=None of your open modules are supported for code transformation with Amazon Q. A pom.xml is required for transformation. Amazon Q can upgrade Java 8, Java 11, and Java 17 projects built on Maven.
 codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in=Amazon Q cannot start the transformation as you are not logged in with Identity Center or Builder ID. Also ensure that you are not using IntelliJ version 232.8660.185 and that you are not developing on a remote host (uncommon).
-codemodernizer.notification.warn.invalid_project.description.reason.remote_backend=None of your open modules are supported by Amazon Q Code Transformation. Currently, Amazon Q cannot upgrade projects running on a remote host.
+codemodernizer.notification.warn.invalid_project.description.reason.remote_backend=None of your open modules are supported for code transformation with Amazon Q. Amazon Q cannot transform projects running on a remote host.
 codemodernizer.notification.warn.maven_failed.content=Amazon Q could not run the Maven clean install command to build your module.
 codemodernizer.notification.warn.maven_failed.title=Amazon Q Code Transform unable to zip dependencies
 codemodernizer.notification.warn.on_resume.unknown_status_response.content=We received data from Amazon Q in a format that the plugin cannot handle. You may need to update the plugin and then try again.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Amazon Q chat: `@workspace` command shown in all tab types"
 +}
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`125`	`125`	`private val supportedJavaMappings = mapOf(`
`126`	`126`	`JavaSdkVersion.JDK_1_8 to setOf(JavaSdkVersion.JDK_17),`
`127`	`127`	`JavaSdkVersion.JDK_11 to setOf(JavaSdkVersion.JDK_17),`
	`128`	`+ JavaSdkVersion.JDK_17 to setOf(JavaSdkVersion.JDK_17),`
`128`	`129`	`)`
`129`	`130`
`130`	`131`	`init {`