Skip to content

Commit 33b526a

Browse files
authored
fix(review): code issues ellipses menu displaying toolkit options (aws#6799)
Fixes aws#6787. Only happens when toolkit is installed otherwise there is no ellipses menu. Before <img width="687" alt="image" src="https://github.com/user-attachments/assets/d9b704e7-a136-4a73-9a0c-7fef004627c8" /> After <img width="794" alt="image" src="https://github.com/user-attachments/assets/dea75e37-b106-43be-afd0-7516eb10b765" /> --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 76ebe24 commit 33b526a

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "/review: Code Issues ellipses menu displays AWS Toolkit options, if installed."
4+
}

packages/amazonq/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
},
221221
{
222222
"type": "webview",
223-
"id": "aws.AmazonQChatView",
223+
"id": "aws.amazonq.AmazonQChatView",
224224
"name": "%AWS.amazonq.chat%",
225225
"when": "!aws.isWebExtHost && !aws.amazonq.showLoginView"
226226
}
@@ -340,32 +340,32 @@
340340
},
341341
{
342342
"command": "aws.amazonq.openReferencePanel",
343-
"when": "view == aws.AmazonQChatView",
343+
"when": "view == aws.amazonq.AmazonQChatView",
344344
"group": "0_topAmazonQ@1"
345345
},
346346
{
347347
"command": "aws.amazonq.learnMore",
348-
"when": "view == aws.AmazonQChatView || view == aws.amazonq.AmazonCommonAuth",
348+
"when": "view =~ /^aws\\.amazonq/",
349349
"group": "1_amazonQ@1"
350350
},
351351
{
352352
"command": "aws.amazonq.signout",
353-
"when": "(view == aws.AmazonQChatView) && aws.codewhisperer.connected",
353+
"when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected",
354354
"group": "2_amazonQ@4"
355355
},
356356
{
357357
"command": "aws.amazonq.reconnect",
358-
"when": "(view == aws.AmazonQChatView) && aws.codewhisperer.connectionExpired",
358+
"when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connectionExpired",
359359
"group": "2_amazonQ@3"
360360
},
361361
{
362362
"submenu": "aws.amazonq.submenu.feedback",
363-
"when": "view == aws.AmazonQChatView || view == aws.amazonq.AmazonCommonAuth",
363+
"when": "view =~ /^aws\\.amazonq/",
364364
"group": "y_toolkitMeta@1"
365365
},
366366
{
367367
"submenu": "aws.amazonq.submenu.help",
368-
"when": "view == aws.AmazonQChatView || view == aws.amazonq.AmazonCommonAuth",
368+
"when": "view =~ /^aws\\.amazonq/",
369369
"group": "y_toolkitMeta@2"
370370
},
371371
{

packages/core/src/amazonq/webview/webView.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { TabType } from './ui/storages/tabsStorage'
2222
import { amazonqMark } from '../../shared/performance/marks'
2323

2424
export class AmazonQChatViewProvider implements WebviewViewProvider {
25-
public static readonly viewType = 'aws.AmazonQChatView'
25+
public static readonly viewType = 'aws.amazonq.AmazonQChatView'
2626

2727
webViewContentGenerator: WebViewContentGenerator
2828
webView: Webview | undefined

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ export class FeatureDevController {
603603
open
604604
)
605605
if (resp === open) {
606-
await vscode.commands.executeCommand('aws.AmazonQChatView.focus')
606+
await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
607607
// TODO add focusing on the specific tab once that's implemented
608608
}
609609
}

packages/core/src/codewhispererChat/commands/registerCommands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const focusAmazonQPanel = Commands.declare(
2525
* So when we try to focus the following Views, only one will show depending
2626
* on the context.
2727
*/
28-
await vscode.commands.executeCommand('aws.AmazonQChatView.focus')
28+
await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
2929
await vscode.commands.executeCommand('aws.amazonq.AmazonCommonAuth.focus')
3030
}
3131
)

packages/toolkit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,12 +1353,12 @@
13531353
},
13541354
{
13551355
"submenu": "aws.toolkit.submenu.feedback",
1356-
"when": "view =~ /^aws\\./ && view != aws.AmazonQChatView && view != aws.amazonq.AmazonCommonAuth",
1356+
"when": "view =~ /^aws\\./ && !(view =~ /^aws\\.amazonq/)",
13571357
"group": "y_toolkitMeta@1"
13581358
},
13591359
{
13601360
"submenu": "aws.toolkit.submenu.help",
1361-
"when": "view =~ /^aws\\./ && view != aws.AmazonQChatView && view != aws.amazonq.AmazonCommonAuth",
1361+
"when": "view =~ /^aws\\./ && !(view =~ /^aws\\.amazonq/)",
13621362
"group": "y_toolkitMeta@2"
13631363
},
13641364
{

0 commit comments

Comments
 (0)