get ws id from flare

Author: leigaol

packages/amazonq/src/extension.ts

@@ -41,6 +41,7 @@ import * as vscode from 'vscode'
 import { registerCommands } from './commands'
 import { focusAmazonQPanel } from 'aws-core-vscode/codewhispererChat'
 import { activate as activateAmazonqLsp } from './lsp/activation'
+import { activate as activateInlineCompletion } from './app/inline/activation'
 
 export const amazonQContextPrefix = 'amazonq'
 
@@ -117,9 +118,8 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
     }
     // This contains every lsp agnostic things (auth, security scan, code scan)
     await activateCodeWhisperer(extContext as ExtContext)
-    Experiments.instance.get('amazonqLSP', false)
     await activateAmazonqLsp(context)
-
+    await activateInlineCompletion()
     // Generic extension commands
     registerGenericCommands(context, amazonQContextPrefix)
 

packages/amazonq/src/lsp/activation.ts

@@ -6,22 +6,24 @@
 import vscode from 'vscode'
 import { startLanguageServer } from './client'
 import { AmazonQLspInstaller } from './lspInstaller'
-import { Commands, lspSetupStage, ToolkitError } from 'aws-core-vscode/shared'
+import { Commands, Experiments, lspSetupStage, ToolkitError } from 'aws-core-vscode/shared'
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     try {
         await lspSetupStage('all', async () => {
             const installResult = await new AmazonQLspInstaller().resolve()
             await lspSetupStage('launch', async () => await startLanguageServer(ctx, installResult.resourcePaths))
         })
-        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')
-            })
-        )
+        if (Experiments.instance.get('amazonqLSP', false) && false) {
+            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/client.ts

@@ -6,8 +6,8 @@
 import vscode, { env, version } from 'vscode'
 import * as nls from 'vscode-nls'
 import * as crypto from 'crypto'
-import { LanguageClient, LanguageClientOptions } from 'vscode-languageclient'
-import { InlineCompletionManager } from '../app/inline/completion'
+import { LanguageClient, LanguageClientOptions, RequestType } from 'vscode-languageclient'
+//import { InlineCompletionManager } from '../app/inline/completion'
 import { AmazonQLspAuth, encryptionKey, notificationTypes } from './auth'
 import { AuthUtil } from 'aws-core-vscode/codewhisperer'
 import {
@@ -16,7 +16,9 @@ import {
     DeleteFilesParams,
     DidChangeWorkspaceFoldersParams,
     DidSaveTextDocumentParams,
+    GetConfigurationFromServerParams,
     RenameFilesParams,
+    ResponseMessage,
     WorkspaceFolder,
 } from '@aws/language-server-runtimes/protocol'
 import { Settings, oidcClientName, createServerOptions, globals, Experiments, getLogger } from 'aws-core-vscode/shared'
@@ -102,8 +104,8 @@ export async function startLanguageServer(
 
     return client.onReady().then(async () => {
         await auth.init()
-        const inlineManager = new InlineCompletionManager(client)
-        inlineManager.registerInlineCompletion()
+        //const inlineManager = new InlineCompletionManager(client)
+        //inlineManager.registerInlineCompletion()
         if (Experiments.instance.get('amazonqChatLSP', false)) {
             activate(client, encryptionKey, resourcePaths.mynahUI)
         }
@@ -134,6 +136,15 @@ export async function startLanguageServer(
             AuthUtil.instance.auth.onDidDeleteConnection(async () => {
                 client.sendNotification(notificationTypes.deleteBearerToken.method)
             }),
+            vscode.commands.registerCommand('aws.amazonq.getWorkspaceId', async () => {
+                const requestType = new RequestType<GetConfigurationFromServerParams, ResponseMessage, Error>(
+                    'aws/getConfigurationFromServer'
+                )
+                const workspaceIdResp = await client.sendRequest(requestType.method, {
+                    section: 'aws.q.workspaceContext',
+                })
+                return workspaceIdResp
+            }),
             vscode.workspace.onDidCreateFiles((e) => {
                 client.sendNotification('workspace/didCreateFiles', {
                     files: e.files.map((it) => {
@@ -179,8 +190,8 @@ export async function startLanguageServer(
                         }),
                     },
                 } as DidChangeWorkspaceFoldersParams)
-            }),
-            inlineManager
+            })
+            //inlineManager
         )
     })
 }

packages/amazonq/src/lsp/config.ts

@@ -8,7 +8,7 @@ import { LspConfig } from 'aws-core-vscode/amazonq'
 
 export const defaultAmazonQLspConfig: LspConfig = {
     manifestUrl: 'https://aws-language-servers-gamma.amazonaws.com/remoteWorkspaceContext/0/manifest.json',
-    supportedVersions: '0.1.2-rc.8',
+    supportedVersions: '0.1.2-rc.19',
     id: 'AmazonQ', // used for identification in global storage/local disk location. Do not change.
     path: undefined,
 }