Skip to content

Commit ce3dd61

Browse files
authored
fix(amazonq): inline chat now activates independently of LSP chat aws#6973
## Problem When toggling the experiment via, the `aws.experiments.amazonqChatLSP` flag in settings, inline chat fails to activate. Specifically, it appears the command fails to register. ``` command 'aws.amazonq.inline.invokeChat' not found ``` This happened because inline chat was activated as part of regular chat. When we use LSP chat, this then never gets activated. ## Solution - Activate inline chat independently of regular chat. ## Testing - Verified the fix by running extension with and without `aws.experiments.amazonqChatLSP` flag and using inlineChat in both cases. One of these cases is shown in the demo below. ## Notes This will have to change once we consume LSP inline chat, as we don't want to activate both our inline chat and Flare's.
1 parent f540496 commit ce3dd61

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
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": "inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag"
4+
}

packages/amazonq/src/app/chat/activation.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { AuthUtil, CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
1010
import { Commands, placeholder, funcUtil } from 'aws-core-vscode/shared'
1111
import * as amazonq from 'aws-core-vscode/amazonq'
1212
import { scanChatAppInit } from '../amazonqScan'
13-
import { init as inlineChatInit } from '../../inlineChat/app'
1413

1514
export async function activate(context: ExtensionContext) {
1615
const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
@@ -72,7 +71,6 @@ function registerApps(appInitContext: amazonq.AmazonQAppInitContext, context: Ex
7271
amazonq.testChatAppInit(appInitContext)
7372
scanChatAppInit(appInitContext)
7473
amazonq.docChatAppInit(appInitContext)
75-
inlineChatInit(context)
7674
}
7775

7876
/**

packages/amazonq/src/extensionNode.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { DevOptions } from 'aws-core-vscode/dev'
2525
import { Auth, AuthUtils, getTelemetryMetadataForConn, isAnySsoConnection } from 'aws-core-vscode/auth'
2626
import api from './api'
2727
import { activate as activateCWChat } from './app/chat/activation'
28+
import { activate as activateInlineChat } from './inlineChat/activation'
2829
import { beta } from 'aws-core-vscode/dev'
2930
import { activate as activateNotifications, NotificationsController } from 'aws-core-vscode/notifications'
3031
import { AuthState, AuthUtil } from 'aws-core-vscode/codewhisperer'
@@ -55,6 +56,7 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
5556
await activateCWChat(context)
5657
await activateQGumby(extContext as ExtContext)
5758
}
59+
activateInlineChat(context)
5860

5961
const authProvider = new CommonAuthViewProvider(
6062
context,

packages/amazonq/src/inlineChat/app.ts renamed to packages/amazonq/src/inlineChat/activation.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
import * as vscode from 'vscode'
6-
import { InlineChatController } from '../inlineChat/controller/inlineChatController'
7-
import { registerInlineCommands } from '../inlineChat/command/registerInlineCommands'
6+
import { InlineChatController } from './controller/inlineChatController'
7+
import { registerInlineCommands } from './command/registerInlineCommands'
88

9-
export function init(context: vscode.ExtensionContext) {
9+
export function activate(context: vscode.ExtensionContext) {
1010
const inlineChatController = new InlineChatController(context)
1111
registerInlineCommands(context, inlineChatController)
1212
}

0 commit comments

Comments
 (0)