feat(amazonq): configuration support for vscode

Author: zixlin7

server/aws-lsp-codewhisperer/src/language-server/codeWhispererServer.ts

@@ -14,6 +14,7 @@ import {
     TextDocument,
     Workspace,
     SDKInitializator,
+    DidChangeConfigurationParams,
 } from '@aws/language-server-runtimes/server-interface'
 import { AWSError } from 'aws-sdk'
 import { autoTrigger, triggerType } from './auto-trigger/autoTrigger'
@@ -36,7 +37,7 @@ import {
 } from './telemetry/types'
 import { getCompletionType, getEndPositionForAcceptedSuggestion, isAwsError } from './utils'
 import { getUserAgent, makeUserContextObject } from './utilities/telemetryUtils'
-import { Q_CONFIGURATION_SECTION } from './configuration/qConfigurationServer'
+import { Q_CONFIGURATION_SECTION, Q_CONFIGURATION_VSC } from './configuration/qConfigurationServer'
 import { fetchSupplementalContext } from './utilities/supplementalContextUtil/supplementalContextUtil'
 import { undefinedIfEmpty } from './utilities/textUtils'
 import { TelemetryService } from './telemetryService'
@@ -640,8 +641,21 @@ export const CodewhispererServerFactory =
             await emitUserTriggerDecisionTelemetry(telemetry, telemetryService, session, timeSinceLastUserModification)
         }
 
-        const updateConfiguration = async () => {
+        const updateConfiguration = async (params?: DidChangeConfigurationParams) => {
             try {
+                const ideCategory = telemetryService.getUserContext()?.ideCategory
+                if (ideCategory === 'VSCODE') {
+                    const vscConfig = await lsp.workspace.getConfiguration(Q_CONFIGURATION_VSC)
+                    const optOutTelemetryPreference = vscConfig['shareContentWithAWS'] === true ? 'OPTOUT' : 'OPTIN'
+                    telemetryService.updateOptOutPreference(optOutTelemetryPreference)
+                    includeSuggestionsWithCodeReferences = vscConfig['showCodeWithReferences'] === true
+                    codeWhispererService.customizationArn = undefinedIfEmpty(params?.settings['customization'])
+                    codePercentageTracker.customizationArn = undefinedIfEmpty(params?.settings['customization'])
+                    logging.log(
+                        `Inline completion configuration updated to use ${codeWhispererService.customizationArn}`
+                    )
+                    return
+                }
                 const qConfig = await lsp.workspace.getConfiguration(Q_CONFIGURATION_SECTION)
                 if (qConfig) {
                     codeWhispererService.customizationArn = undefinedIfEmpty(qConfig.customization)
@@ -679,8 +693,8 @@ export const CodewhispererServerFactory =
 
         lsp.extensions.onInlineCompletionWithReferences(onInlineCompletionHandler)
         lsp.extensions.onLogInlineCompletionSessionResults(onLogInlineCompletionSessionResultsHandler)
-        lsp.onInitialized(updateConfiguration)
-        lsp.didChangeConfiguration(updateConfiguration)
+        lsp.onInitialized(() => updateConfiguration())
+        lsp.didChangeConfiguration(params => updateConfiguration(params))
 
         lsp.onDidChangeTextDocument(async p => {
             const textDocument = await workspace.getTextDocument(p.textDocument.uri)

server/aws-lsp-codewhisperer/src/language-server/configuration/qConfigurationServer.ts

@@ -13,6 +13,7 @@ import { SDKInitializator } from '@aws/language-server-runtimes/server-interface
 
 // The configuration section that the server will register and listen to
 export const Q_CONFIGURATION_SECTION = 'aws.q'
+export const Q_CONFIGURATION_VSC = 'amazonQ'
 export const QConfigurationServerToken =
     (
         service: (

server/aws-lsp-codewhisperer/src/language-server/telemetryService.ts

@@ -76,6 +76,10 @@ export class TelemetryService extends CodeWhispererServiceToken {
         this.userContext = userContext
     }
 
+    public getUserContext() {
+        return this.userContext
+    }
+
     public updateOptOutPreference(optOutPreference: OptOutPreference): void {
         this.optOutPreference = optOutPreference
     }

server/aws-lsp-codewhisperer/src/language-server/utilities/telemetryUtils.test.ts

@@ -125,7 +125,7 @@ describe('makeUserContextObject', () => {
                         name: 'test-custom-client-name',
                         version: '1.2.3',
                         extension: {
-                            name: 'AmazonQ-For-VSCode',
+                            name: 'AWS IDE Extensions for VSCode',
                             version: '2.2.2',
                         },
                         clientId: 'test-client-id',
@@ -178,7 +178,7 @@ describe('makeUserContextObject', () => {
 
     it('should handle all possible client name values to define ideCategory', () => {
         const clientNames = [
-            'AmazonQ-For-VSCode',
+            'AWS IDE Extensions for VSCode',
             'Amazon-Q-For-JetBrains',
             'AmazonQ-For-Eclipse',
             'AWS-Toolkit-For-VisualStudio',
@@ -190,7 +190,7 @@ describe('makeUserContextObject', () => {
 
             const result = makeUserContextObject(mockInitializeParams, 'linux', 'TestProduct')
             switch (clientName) {
-                case 'AmazonQ-For-VSCode':
+                case 'AWS IDE Extensions for VSCode':
                     assert.strictEqual(result?.ideCategory, 'VSCODE')
                     break
                 case 'Amazon-Q-For-JetBrains':

server/aws-lsp-codewhisperer/src/language-server/utilities/telemetryUtils.ts

@@ -47,7 +47,7 @@ export const getUserAgent = (initializeParams: InitializeParams, serverInfo?: Se
 }
 
 const IDE_CATEGORY_MAP: { [key: string]: IdeCategory } = {
-    'AmazonQ-For-VSCode': 'VSCODE',
+    'AWS IDE Extensions for VSCode': 'VSCODE',
     'Amazon-Q-For-JetBrains': 'JETBRAINS',
     'AmazonQ-For-Eclipse': 'ECLIPSE',
     'AWS-Toolkit-For-VisualStudio': 'VISUAL_STUDIO',