Merge branch 'main' into dmsWork

dhasani23 · web-flow · commit 79544a94051f · 2024-11-18T11:13:11.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/amazonqFeatureDev/util/DiffMetrics.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/DiffMetrics.kt
@@ -0,0 +1,73 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util
+
+import com.intellij.diff.comparison.ComparisonManager
+import com.intellij.diff.comparison.ComparisonPolicy
+import com.intellij.diff.fragments.LineFragment
+import com.intellij.openapi.progress.EmptyProgressIndicator
+
+data class DiffMetrics(
+    val insertedLines: Int,
+    val insertedCharacters: Int,
+)
+
+fun lineEnding(content: String, curr: Int, end: Int): Int {
+    require(curr <= end) { "curr must be within end of range" }
+    require(end <= content.length) { "end must be within content" }
+
+    return if (curr == end) {
+        -1
+    } else if (content[curr] == '\r') {
+        if ((curr + 1 < end) && (content[curr + 1] == '\n')) {
+            2
+        } else {
+            1
+        }
+    } else if (content[curr] == '\n') {
+        1
+    } else {
+        -1
+    }
+}
+
+fun getDiffMetrics(before: String, after: String): DiffMetrics {
+    val comparisonManager = ComparisonManager.getInstance()
+    val fragments = comparisonManager.compareLines(
+        before,
+        after,
+        ComparisonPolicy.DEFAULT,
+        EmptyProgressIndicator()
+    )
+
+    var accLineCount = 0
+    var accCharCount = 0
+
+    fragments.forEach { fragment: LineFragment ->
+        var curr = fragment.startOffset2
+        val end = fragment.endOffset2
+
+        while (curr < end) {
+            accLineCount += 1
+
+            // Consume leading whitespace:
+            while (curr < end && lineEnding(after, curr, end) == -1 && after[curr].isWhitespace()) curr++
+
+            // Consume through EOL:
+            val lineContentStart = curr
+            while (curr < end && lineEnding(after, curr, end) == -1) curr++
+            var lineContentEnd = curr
+            curr += maxOf(lineEnding(after, curr, end), 0)
+
+            // Walk back trailing whitespace and record character count before continuing to next line:
+            while (lineContentEnd > lineContentStart && after[lineContentEnd - 1].isWhitespace()) lineContentEnd--
+            accCharCount += lineContentEnd - lineContentStart
+        }
+    }
+
+    return DiffMetrics(
+        insertedLines = accLineCount,
+        insertedCharacters = accCharCount,
+    )
+}
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/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/DiffMetricsTest.kt b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/DiffMetricsTest.kt
@@ -0,0 +1,126 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util
+
+import com.intellij.testFramework.LightPlatformTestCase
+import com.intellij.testFramework.TestApplicationManager
+
+class DiffMetricsTest : LightPlatformTestCase() {
+    override fun setUp() {
+        super.setUp()
+        TestApplicationManager.getInstance()
+    }
+
+    fun `test empty input`() {
+        val metrics = getDiffMetrics("", "")
+        assertEquals(0, metrics.insertedLines)
+        assertEquals(0, metrics.insertedCharacters)
+    }
+
+    fun `test insertions are counted`() {
+        val before = """
+            line1
+            line2
+        """.trimIndent()
+
+        val after = """
+            line1
+            inserted
+            line2
+        """.trimIndent()
+
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(1, metrics.insertedLines)
+        assertEquals(8, metrics.insertedCharacters)
+    }
+
+    fun `test modifications are counted`() {
+        val before = """
+            line1
+            line2
+            line3
+        """.trimIndent()
+
+        val after = """
+            line1
+            modified
+            line3
+        """.trimIndent()
+
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(1, metrics.insertedLines)
+        assertEquals(8, metrics.insertedCharacters)
+    }
+
+    fun `test deletions are counted`() {
+        val before = """
+            line1
+            line2
+            line3
+        """.trimIndent()
+
+        val after = """
+            line1
+            line3
+        """.trimIndent()
+
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(0, metrics.insertedLines)
+        assertEquals(0, metrics.insertedCharacters)
+    }
+
+    fun `test multiline and multiple hunks are counted`() {
+        val before = """
+            line1
+            line2
+            line3
+        """.trimIndent()
+
+        val after = """
+            inserted1
+            line1
+            inserted2
+            inserted3
+            line3
+            inserted4
+        """.trimIndent()
+
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(4, metrics.insertedLines)
+        assertEquals(36, metrics.insertedCharacters)
+    }
+
+    fun `test empty lines are counted`() {
+        val before = "line1"
+        val after = "line1\n\nline2"
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(2, metrics.insertedLines)
+        assertEquals(5, metrics.insertedCharacters)
+    }
+
+    fun `test trailing newline is not counted`() {
+        val before = "line1"
+        val after = "line1\nline2\n"
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(1, metrics.insertedLines)
+        assertEquals(5, metrics.insertedCharacters)
+    }
+
+    fun `test newline sequences are counted`() {
+        val before = "line1"
+        val after = "line1\nline2\rline3\r\nline4"
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(3, metrics.insertedLines)
+        assertEquals(15, metrics.insertedCharacters)
+    }
+
+    fun `test leading and trailing whitespace are not counted as characters`() {
+        val before = "line1\nline2"
+        val after = "line1\n    line2"
+
+        val metrics = getDiffMetrics(before, after)
+        assertEquals(1, metrics.insertedLines)
+        assertEquals(5, metrics.insertedCharacters)
+    }
+}
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

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Amazon Q chat: `@workspace` command shown in all tab types"
 +}