merge

Author: leigaol

docs/lsp.md

@@ -45,8 +45,16 @@ sequenceDiagram
     npm run package
     ```
     to get the project setup
-3. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
-4. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
+3. Enable the lsp experiment:
+    ```
+    "aws.experiments": {
+      "amazonqLSP": true,
+      "amazonqLSPInline": true, // optional: enables inline completion from flare
+      "amazonqLSPChat": true // optional: enables chat from flare
+    }
+    ```
+4. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
+5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
 
 ## Amazon Q Inline Activation
 

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q chat: `@prompts` not added to context"
+}

packages/amazonq/.changes/next-release/Bug Fix-ccbc5e50-0a90-4340-b6d5-e57537949898.json

@@ -119,6 +119,14 @@
                         "ssoCacheError": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQWorkspaceLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false

packages/amazonq/package.json

@@ -29,6 +29,7 @@ import {
     ReferenceHoverProvider,
     ReferenceInlineProvider,
     ReferenceLogViewProvider,
+    ImportAdderProvider,
 } from 'aws-core-vscode/codewhisperer'
 
 export class InlineCompletionManager implements Disposable {
@@ -66,6 +67,7 @@ export class InlineCompletionManager implements Disposable {
             item: InlineCompletionItemWithReferences,
             editor: TextEditor,
             requestStartTime: number,
+            startLine: number,
             firstCompletionDisplayLatency?: number
         ) => {
             // TODO: also log the seen state for other suggestions in session
@@ -96,6 +98,9 @@ export class InlineCompletionManager implements Disposable {
                 ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
                 ReferenceHoverProvider.instance.addCodeReferences(item.insertText as string, item.references)
             }
+            if (item.mostRelevantMissingImports?.length) {
+                await ImportAdderProvider.instance.onAcceptRecommendation(editor, item, startLine)
+            }
         }
         commands.registerCommand('aws.amazonq.acceptInline', onInlineAcceptance)
 
@@ -200,6 +205,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                     item,
                     editor,
                     session.requestStartTime,
+                    position.line,
                     session.firstCompletionDisplayLatency,
                 ],
             }
@@ -208,6 +214,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 item.insertText as string,
                 item.references
             )
+            ImportAdderProvider.instance.onShowRecommendation(document, position.line, item)
         }
         return items as InlineCompletionItem[]
     }

packages/amazonq/src/app/inline/completion.ts

@@ -118,9 +118,14 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     }
     // This contains every lsp agnostic things (auth, security scan, code scan)
     await activateCodeWhisperer(extContext as ExtContext)
-    // start Amazon Q LSP for everyone
-    await activateAmazonqLsp(context)
-    await activateInlineCompletion()
+    if (Experiments.instance.get('amazonqLSP', false)) {
+        await activateAmazonqLsp(context)
+    }
+
+    if (!Experiments.instance.get('amazonqLSPInline', false)) {
+        await activateInlineCompletion()
+    }
+
     // Generic extension commands
     registerGenericCommands(context, amazonQContextPrefix)
 
@@ -154,7 +159,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
 
     context.subscriptions.push(
         Experiments.instance.onDidChange(async (event) => {
-            if (event.key === 'amazonqLSP' || event.key === 'amazonqChatLSP') {
+            if (event.key === 'amazonqLSP' || event.key === 'amazonqChatLSP' || event.key === 'amazonqLSPInline') {
                 await vscode.window
                     .showInformationMessage(
                         'Amazon Q LSP setting has changed. Reload VS Code for the changes to take effect.',

packages/amazonq/src/extension.ts

@@ -14,16 +14,6 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
             const installResult = await new AmazonQLspInstaller().resolve()
             await lspSetupStage('launch', async () => await startLanguageServer(ctx, installResult.resourcePaths))
         })
-        // Do not enable inline code path in LSP from 04/16 to 06/30.
-        // Workspace context needs to use IDE inline completion code path for AB test
-        // ctx.subscriptions.push(
-        //     Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
-        //         await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
-        //     }),
-        //     vscode.workspace.onDidCloseTextDocument(async () => {
-        //         await vscode.commands.executeCommand('aws.amazonq.rejectCodeSuggestion')
-        //     })
-        // )
     } catch (err) {
         const e = err as ToolkitError
         void vscode.window.showInformationMessage(`Unable to launch amazonq language server: ${e.message}`)

packages/amazonq/src/lsp/activation.ts

@@ -13,6 +13,7 @@ import {
     Uri,
 } from 'vscode'
 import { LanguageServerResolver } from 'aws-core-vscode/shared'
+import { QuickActionCommandGroup } from '@aws/mynah-ui'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
     public static readonly viewType = 'aws.amazonq.AmazonQChatView'
@@ -21,6 +22,24 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
 
     webview: Webview | undefined
 
+    private readonly quickActionCommands: QuickActionCommandGroup[] = [
+        {
+            groupName: 'Quick Actions',
+            commands: [
+                {
+                    command: '/help',
+                    icon: 'help',
+                    description: 'Learn more about Amazon Q',
+                },
+                {
+                    command: '/clear',
+                    icon: 'trash',
+                    description: 'Clear this session',
+                },
+            ],
+        },
+    ]
+
     constructor(private readonly mynahUIPath: string) {}
 
     public resolveWebviewView(webviewView: WebviewView, context: WebviewViewResolveContext, _token: CancellationToken) {
@@ -34,40 +53,40 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
         }
 
         const uiPath = webviewView.webview.asWebviewUri(Uri.parse(this.mynahUIPath)).toString()
-        webviewView.webview.html = getWebviewContent(uiPath)
+        webviewView.webview.html = this.getWebviewContent(uiPath)
 
         this.onDidResolveWebviewEmitter.fire()
     }
-}
 
-function getWebviewContent(mynahUIPath: string) {
-    return `
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Chat</title>
-        <style>
-            body,
-            html {
-                background-color: var(--mynah-color-bg);
-                color: var(--mynah-color-text-default);
-                height: 100%;
-                width: 100%;
-                overflow: hidden;
-                margin: 0;
-                padding: 0;
-            }
-        </style>
-    </head>
-    <body>
-        <script type="text/javascript" src="${mynahUIPath.toString()}" defer onload="init()"></script>
-        <script type="text/javascript">
-            const init = () => {
-                amazonQChat.createChat(acquireVsCodeApi(), {disclaimerAcknowledged: false});
-            }
-        </script>
-    </body>
-    </html>`
+    private getWebviewContent(mynahUIPath: string) {
+        return `
+        <!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>Chat</title>
+            <style>
+                body,
+                html {
+                    background-color: var(--mynah-color-bg);
+                    color: var(--mynah-color-text-default);
+                    height: 100%;
+                    width: 100%;
+                    overflow: hidden;
+                    margin: 0;
+                    padding: 0;
+                }
+            </style>
+        </head>
+        <body>
+            <script type="text/javascript" src="${mynahUIPath.toString()}" defer onload="init()"></script>
+            <script type="text/javascript">
+                const init = () => {
+                    amazonQChat.createChat(acquireVsCodeApi(), { disclaimerAcknowledged: false, quickActionCommands: ${JSON.stringify(this.quickActionCommands)}});
+                }
+            </script>
+        </body>
+        </html>`
+    }
 }

packages/amazonq/src/lsp/chat/webviewProvider.ts

@@ -21,9 +21,18 @@ import {
     ResponseMessage,
     WorkspaceFolder,
 } from '@aws/language-server-runtimes/protocol'
-import { Settings, oidcClientName, createServerOptions, globals, Experiments, getLogger } from 'aws-core-vscode/shared'
+import {
+    Settings,
+    oidcClientName,
+    createServerOptions,
+    globals,
+    Experiments,
+    getLogger,
+    Commands,
+} from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
+import { InlineCompletionManager } from '../app/inline/completion'
 
 const localize = nls.loadMessageBundle()
 
@@ -103,21 +112,33 @@ export async function startLanguageServer(
     const auth = new AmazonQLspAuth(client)
 
     return client.onReady().then(async () => {
-        await auth.init()
-        //const inlineManager = new InlineCompletionManager(client)
-        //inlineManager.registerInlineCompletion()
-        if (Experiments.instance.get('amazonqChatLSP', false)) {
-            activate(client, encryptionKey, resourcePaths.mynahUI)
-        }
-
-        // Request handler for when the server wants to know about the clients auth connnection
+        // Request handler for when the server wants to know about the clients auth connnection. Must be registered before the initial auth init call
         client.onRequest<ConnectionMetadata, Error>(notificationTypes.getConnectionMetadata.method, () => {
             return {
                 sso: {
                     startUrl: AuthUtil.instance.auth.startUrl,
                 },
             }
         })
+        await auth.init()
+
+        if (Experiments.instance.get('amazonqLSPInline', false)) {
+            const inlineManager = new InlineCompletionManager(client)
+            inlineManager.registerInlineCompletion()
+            toDispose.push(
+                inlineManager,
+                Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
+                    await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+                }),
+                vscode.workspace.onDidCloseTextDocument(async () => {
+                    await vscode.commands.executeCommand('aws.amazonq.rejectCodeSuggestion')
+                })
+            )
+        }
+
+        if (Experiments.instance.get('amazonqChatLSP', false)) {
+            activate(client, encryptionKey, resourcePaths.mynahUI)
+        }
 
         // Temporary code for pen test. Will be removed when we switch to the real flare auth
         const authInterval = setInterval(async () => {