Merge branch 'main' into rli/onboarding-limit

rli · web-flow · commit 797a7a32f99e · 2024-12-04T11:18:23.000-08:00
diff --git a/.changes/3.44.json b/.changes/3.44.json
@@ -0,0 +1,20 @@
+{
+  "date" : "2024-12-04",
+  "version" : "3.44",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: UI improvements to chat: New splash loader animation, initial streaming card animation, improved button colours"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q: Navigate through prompt history by using the up/down arrows"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where Amazon Q Code Transform is unable to start"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix DynamoDB viewer throwing 'ActionGroup should be registered using <group> tag' on IDE start (#5012) (#5120)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix chat syntax highlighting when using several different themes"
+  } ]
+}
diff --git a/.editorconfig b/.editorconfig
@@ -42,7 +42,7 @@ ij_kotlin_allow_trailing_comma = true
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
-ij_kotlin_packages_to_use_import_on_demand = unset
+ij_kotlin_packages_to_use_import_on_demand = ""
 
 [{*.markdown,*.md}]
 ij_markdown_force_one_space_after_blockquote_symbol = true
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -5,9 +5,9 @@ codemodernizer/ @aws/elastic-gumby
 codetransform/ @aws/elastic-gumby
 codewhisperer/ @aws/codewhisperer-team
 
-mynah-ui/ @aws/dexp
-mynah-ui/package.json @aws/dexp @aws/elastic-gumby @aws/earlybird @aws/codewhisperer-team
-mynah-ui/package-lock.json @aws/dexp @aws/elastic-gumby @aws/earlybird @aws/codewhisperer-team
+mynah-ui/ @aws/flare
+mynah-ui/package.json @aws/flare @aws/elastic-gumby @aws/earlybird @aws/codewhisperer-team
+mynah-ui/package-lock.json @aws/flare @aws/elastic-gumby @aws/earlybird @aws/codewhisperer-team
 
 # nested within chat/, so needs to be after to take precedence
 amazonqFeatureDev/ @aws/earlybird
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# _3.44_ (2024-12-04)
+- **(Feature)** Amazon Q: UI improvements to chat: New splash loader animation, initial streaming card animation, improved button colours
+- **(Feature)** Amazon Q: Navigate through prompt history by using the up/down arrows
+- **(Bug Fix)** Fix issue where Amazon Q Code Transform is unable to start
+- **(Bug Fix)** Fix DynamoDB viewer throwing 'ActionGroup should be registered using <group> tag' on IDE start ([#5012](https://github.com/aws/aws-toolkit-jetbrains/issues/5012)) ([#5120](https://github.com/aws/aws-toolkit-jetbrains/issues/5120))
+- **(Bug Fix)** Amazon Q: Fix chat syntax highlighting when using several different themes
+
 # _3.43_ (2024-12-03)
 - **(Feature)** `/review` in Q chat to scan your code for vulnerabilities and quality issues, and generate fixes
 - **(Feature)** `/test` in Q chat to generate unit tests for java and python
diff --git a/detekt-rules/detekt.yml b/detekt-rules/detekt.yml
@@ -72,7 +72,7 @@ formatting:
     maxLineLength: 160
     ignoreBackTickedIdentifier: true
   NoWildcardImports:
-    # no `packagesToUseImportOnDemandProperty` because we don't want to allow any star imports
+    packagesToUseImportOnDemandProperty: ""
     active: true
   ParameterListWrapping:
     active: true
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.44-SNAPSHOT
+toolkitVersion=3.45-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatItems.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatItems.kt
@@ -128,7 +128,8 @@ fun buildClearPromptProgressMessage(tabId: String) = PromptProgressMessage(
     tabId = tabId
 )
 
-val runCodeScanMessage = CodeScanChatMessage(messageType = ChatMessageType.Prompt, command = "review", tabId = UUID.randomUUID().toString())
+val runCodeScanMessage
+    get() = CodeScanChatMessage(messageType = ChatMessageType.Prompt, command = "review", tabId = UUID.randomUUID().toString())
 
 val cancelFileScanButton = Button(
     id = CodeScanButtonId.StopFileScan.id,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererCodeTestSession.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererCodeTestSession.kt
@@ -23,7 +23,7 @@ import software.aws.toolkits.jetbrains.utils.assertIsNonDispatchThread
 import java.nio.file.Path
 import java.time.Duration
 import java.time.Instant
-import java.util.*
+import java.util.UUID
 import kotlin.coroutines.coroutineContext
 
 // TODO: Refactor with CodeWhispererCodeScanSession code since both are about zip CreateUploadUrl logic
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -41,6 +41,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTo
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.sessionconfig.CodeTestSessionConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
+import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
 import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
@@ -511,6 +512,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
                     isSupportedLanguage = true,
+                    credentialStartUrl = getStartUrl(project),
                     jobGroup = session.testGenerationJobGroupName,
                     jobId = session.testGenerationJob,
                     result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -77,6 +77,7 @@ import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerTy
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.v1.ChatSessionV1.Companion.validLanguages
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticPrompt
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticTextResponse
+import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContext
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContextExtractor
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ExtractionTriggerType
@@ -285,6 +286,7 @@ class CodeTestChatController(
                 cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                 hasUserPromptSupplied = session.hasUserPromptSupplied,
                 isSupportedLanguage = false,
+                credentialStartUrl = getStartUrl(project),
                 result = MetricResult.Succeeded,
                 perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration)
             )
@@ -583,6 +585,7 @@ class CodeTestChatController(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
                     isSupportedLanguage = true,
+                    credentialStartUrl = getStartUrl(project = context.project),
                     jobGroup = session.testGenerationJobGroupName,
                     jobId = session.testGenerationJob,
                     acceptedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
@@ -775,6 +778,7 @@ class CodeTestChatController(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
                     isSupportedLanguage = true,
+                    credentialStartUrl = getStartUrl(project = context.project),
                     jobGroup = session.testGenerationJobGroupName,
                     jobId = session.testGenerationJob,
                     acceptedCount = 0,
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/AmazonQCodeFixSession.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/AmazonQCodeFixSession.kt
@@ -96,7 +96,7 @@ class AmazonQCodeFixSession(val project: Project) {
             val createCodeFixResponse = createCodeFixJob(
                 sourceZipUploadResponse.uploadId(),
                 issueRange,
-                issue.description.toString(),
+                issue.recommendation.text,
                 codeFixName,
                 issue.ruleId
             )
diff --git a/plugins/amazonq/mynah-ui/package-lock.json b/plugins/amazonq/mynah-ui/package-lock.json
diff --git a/plugins/amazonq/mynah-ui/package.json b/plugins/amazonq/mynah-ui/package.json
@@ -12,7 +12,7 @@
         "lintfix": "eslint -c .eslintrc.js --fix --ext .ts ."
     },
     "dependencies": {
-        "@aws/mynah-ui-chat": "npm:@aws/mynah-ui@4.18.1",
+        "@aws/mynah-ui-chat": "npm:@aws/mynah-ui@4.21.0",
         "@types/node": "^14.18.5",
         "fs-extra": "^10.0.1",
         "sanitize-html": "^2.12.1",
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/connector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/connector.ts
@@ -542,6 +542,9 @@ export class Connector {
             case 'codetest':
                 this.codeTestChatConnector.onFormButtonClick(tabId, messageId ?? '', action)
                 break
+            case 'codetransform':
+                this.codeTransformChatConnector.onFormButtonClick(tabId, action)
+                break
             case 'doc':
                 this.docChatConnector.onFormButtonClick(tabId, action)
                 break
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/walkthrough/agent.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/walkthrough/agent.ts
@@ -11,7 +11,6 @@ function createdTabbedData(examples: string[], agent: string): ChatItemContent['
         {
             label: 'Examples',
             value: 'examples',
-            icon: MynahIcons.PLAY,
             content: {
                 body: `**Example use cases:**\n${exampleText}\n\nEnter ${agent} in Q Chat to get started`,
             },
@@ -59,6 +58,7 @@ Implement features or make changes across your workspace, all from a single prom
                     status: 'main',
                     disabled: false,
                     flash: 'once',
+                    fillState: 'hover',
                     icon: MynahIcons.RIGHT_OPEN,
                     id: 'quick-start-featuredev',
                     text: `Quick start with **/dev**`,
@@ -86,10 +86,11 @@ Automatically generate unit tests for your active file.
                     text: 'Read user guide',
                 },
                 {
-                    status: 'primary',
+                    status: 'main',
                     disabled: false,
-                    icon: MynahIcons.RIGHT_OPEN,
                     flash: 'once',
+                    fillState: 'hover',
+                    icon: MynahIcons.RIGHT_OPEN,
                     id: 'quick-start-codetest',
                     text: `Quick start with **/test**`,
                 },
@@ -120,9 +121,11 @@ Create and update READMEs for better documented code.
                     text: 'Read user guide',
                 },
                 {
+                    status: 'main',
                     disabled: false,
+                    flash: 'once',
+                    fillState: 'hover',
                     icon: MynahIcons.RIGHT_OPEN,
-                    flash: 'infinite',
                     id: 'quick-start-doc',
                     text: `Quick start with **/doc**`,
                 },
@@ -153,9 +156,11 @@ Review code for issues, then get suggestions to fix your code instantaneously.
                     text: 'Read user guide',
                 },
                 {
+                    status: 'main',
                     disabled: false,
+                    flash: 'once',
+                    fillState: 'hover',
                     icon: MynahIcons.RIGHT_OPEN,
-                    flash: 'infinite',
                     id: 'quick-start-codescan',
                     text: `Quick start with **/review**`,
                 },
@@ -182,9 +187,11 @@ Upgrade library and language versions in your codebase.
                     text: 'Read user guide',
                 },
                 {
+                    status: 'main',
                     disabled: false,
+                    flash: 'once',
+                    fillState: 'hover',
                     icon: MynahIcons.RIGHT_OPEN,
-                    flash: 'infinite',
                     id: 'quick-start-codetransform',
                     text: `Quick start with **/transform**`,
                 },
diff --git a/plugins/amazonq/src/main/resources/META-INF/plugin.xml b/plugins/amazonq/src/main/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
     <p><code>/dev</code> to task Amazon Q with generating new code across your entire project and implement features.</p>
 
     <h3>Generate documentation</h3>
-    <p><code>/docs</code> to task Amazon Q with writing API, technical design, and onboarding documentation.</p>
+    <p><code>/doc</code> to task Amazon Q with writing API, technical design, and onboarding documentation.</p>
 
     <h3>Automate code reviews</h3>
     <p><code>/review</code> to ask Amazon Q to perform code reviews, flagging suspicious code patterns and assessing deployment risk.</p>
diff --git a/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/settings/AwsSettings.kt b/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/settings/AwsSettings.kt
@@ -6,7 +6,7 @@ package migration.software.aws.toolkits.jetbrains.settings
 import com.intellij.openapi.components.service
 import software.aws.toolkits.jetbrains.settings.ProfilesNotification
 import software.aws.toolkits.jetbrains.settings.UseAwsCredentialRegion
-import java.util.*
+import java.util.UUID
 
 interface AwsSettings {
     var isTelemetryEnabled: Boolean
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt
@@ -16,6 +16,7 @@ import com.intellij.openapi.project.Project
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.inputStream
+import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.utils.notifyStickyWithData
 import java.nio.file.Paths
 import java.util.concurrent.atomic.AtomicBoolean
@@ -38,12 +39,17 @@ class ProcessNotificationsBase(
     }
 
     private fun getNotificationsFromFile(): NotificationsList? {
-        val path = Paths.get(PathManager.getSystemPath(), NOTIFICATIONS_PATH)
-        val content = path.inputStream().bufferedReader().use { it.readText() }
-        if (content.isEmpty()) {
+        try {
+            val path = Paths.get(PathManager.getSystemPath(), NOTIFICATIONS_PATH)
+            val content = path.inputStream().bufferedReader().use { it.readText() }
+            if (content.isEmpty()) {
+                return null
+            }
+            return NotificationMapperUtil.mapper.readValue(content)
+        } catch (e: Exception) {
+            LOG.warn { "Error reading notifications file: $e" }
             return null
         }
-        return NotificationMapperUtil.mapper.readValue(content)
     }
 
     fun retrieveStartupAndEmergencyNotifications() {
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -13,7 +13,6 @@ action.aws.caws.rebuildAction.text=Rebuild Dev Environment
 action.aws.caws.updateDevfile.text=Update Devfile...
 action.aws.toolkit.caws.logout.text=Sign out
 action.aws.toolkit.caws.profile.text=View Profile...
-action.aws.toolkit.dynamoViewer.changeMaxResults.text=Max Results
 action.aws.toolkit.dynamodb.delete_table.text=Delete Table...
 action.aws.toolkit.ecr.repository.pull.text=Pull from Repository...
 action.aws.toolkit.ecr.repository.push.text=Push to Repository...
@@ -1446,6 +1445,7 @@ gettingstarted.setup.tabs.builderid=AWS Builder ID
 gettingstarted.setup.tabs.iam=IAM Credentials
 gettingstarted.setup.tabs.idc=IAM Identity Center
 gettingstarted.setup.title=AWS Toolkit: Setup Authentication
+group.aws.toolkit.dynamoViewer.changeMaxResults.text=Max Results
 group.aws.toolkit.dynamoViewer.toolbar.settings.text=Settings
 group.aws.toolkit.jetbrains.core.services.cwc.actions.ContextMenuActions.text=Amazon Q
 group.aws.toolkit.s3viewer.contextMenu.copyGroup.text=Copy
diff --git a/plugins/core/webview/package-lock.json b/plugins/core/webview/package-lock.json
diff --git a/plugins/toolkit/jetbrains-core/resources/META-INF/plugin.xml b/plugins/toolkit/jetbrains-core/resources/META-INF/plugin.xml
@@ -624,7 +624,7 @@
 
         <group id="aws.toolkit.dynamoViewer.toolbar.secondary">
             <group popup="true" id="aws.toolkit.dynamoViewer.toolbar.settings" icon="AllIcons.General.GearPlain">
-                <action id="aws.toolkit.dynamoViewer.changeMaxResults"
+                <group id="aws.toolkit.dynamoViewer.changeMaxResults"
                         class="software.aws.toolkits.jetbrains.services.dynamodb.editor.actions.ConfigureMaxResultsAction"/>
             </group>
         </group>

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,8 @@ fun buildClearPromptProgressMessage(tabId: String) = PromptProgressMessage(`
`128`	`128`	`tabId = tabId`
`129`	`129`	`)`
`130`	`130`
`131`		`-val runCodeScanMessage = CodeScanChatMessage(messageType = ChatMessageType.Prompt, command = "review", tabId = UUID.randomUUID().toString())`
	`131`	`+val runCodeScanMessage`
	`132`	`+ get() = CodeScanChatMessage(messageType = ChatMessageType.Prompt, command = "review", tabId = UUID.randomUUID().toString())`
`132`	`133`
`133`	`134`	`val cancelFileScanButton = Button(`
`134`	`135`	`id = CodeScanButtonId.StopFileScan.id,`