Merge branch 'main' into samgst/fixNotifBaseCacheAccess

samgst-amazon · web-flow · commit fed762c8745b · 2024-12-03T14:58:37.000-08:00
diff --git a/.changes/next-release/bugfix-7391344e-e006-4fc0-bea0-0c5ee2db3be0.json b/.changes/next-release/bugfix-7391344e-e006-4fc0-bea0-0c5ee2db3be0.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q: Fix chat syntax highlighting when using several different themes"
+}
diff --git a/.changes/next-release/feature-3171e147-0136-449d-b5d7-25c176447b86.json b/.changes/next-release/feature-3171e147-0136-449d-b5d7-25c176447b86.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: UI improvements to chat: New splash loader animation, initial streaming card animation, improved button colours"
+}
diff --git a/.changes/next-release/feature-f74db7ad-9389-44af-8acb-2d64e9b99427.json b/.changes/next-release/feature-f74db7ad-9389-44af-8acb-2d64e9b99427.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: Navigate through prompt history by using the up/down arrows"
+}
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/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/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/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/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/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

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Amazon Q: Fix chat syntax highlighting when using several different themes"
 +}
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,`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class AmazonQCodeFixSession(val project: Project) {`
`96`	`96`	`val createCodeFixResponse = createCodeFixJob(`
`97`	`97`	`sourceZipUploadResponse.uploadId(),`
`98`	`98`	`issueRange,`
`99`		`- issue.description.toString(),`
	`99`	`+ issue.recommendation.text,`
`100`	`100`	`codeFixName,`
`101`	`101`	`issue.ruleId`
`102`	`102`	`)`