Merge branch 'master' into nep-flare

Author: atonaamz

packages/amazonq/package.json

@@ -925,7 +925,7 @@
             },
             {
                 "command": "aws.amazonq.fixCode",
-                "win": "win+alt+y",
+                "win": "win+alt+h",
                 "mac": "cmd+alt+y",
                 "linux": "meta+alt+y"
             },
@@ -943,7 +943,7 @@
             },
             {
                 "command": "aws.amazonq.generateUnitTests",
-                "key": "win+alt+t",
+                "key": "win+alt+n",
                 "mac": "cmd+alt+t",
                 "linux": "meta+alt+t"
             },

packages/amazonq/test/unit/codewhisperer/service/securityIssueTreeViewProvider.test.ts

@@ -150,7 +150,7 @@ describe('SecurityIssueTreeViewProvider', function () {
                         item.iconPath?.toString().includes(`${item.issue.severity.toLowerCase()}.svg`)
                     )
                 )
-                assert.ok(issueItems.every((item) => !item.description?.toString().startsWith('[Ln ')))
+                assert.ok(issueItems.every((item) => item.description?.toString().startsWith('[Ln ')))
             }
         })
     })

packages/core/src/codewhisperer/service/securityIssueTreeViewProvider.ts

@@ -189,8 +189,11 @@ export class IssueItem extends vscode.TreeItem {
     }
 
     private getDescription() {
+        const positionStr = `[Ln ${this.issue.startLine + 1}]`
         const groupingStrategy = CodeIssueGroupingStrategyState.instance.getState()
-        return groupingStrategy !== CodeIssueGroupingStrategy.FileLocation ? `${path.basename(this.filePath)}` : ''
+        return groupingStrategy !== CodeIssueGroupingStrategy.FileLocation
+            ? `${path.basename(this.filePath)} ${positionStr}`
+            : positionStr
     }
 
     private getContextValue() {