Merge master into feature/emr

Author: aws-toolkit-automation

package-lock.json

@@ -6,7 +6,7 @@
 import { getContext, getLogger, setContext } from 'aws-core-vscode/shared'
 import * as vscode from 'vscode'
 import { applyPatch, diffLines } from 'diff'
-import { LanguageClient } from 'vscode-languageclient'
+import { BaseLanguageClient } from 'vscode-languageclient'
 import { CodeWhispererSession } from '../sessionManager'
 import { LogInlineCompletionSessionResultsParams } from '@aws/language-server-runtimes/protocol'
 import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
@@ -309,7 +309,7 @@ export async function displaySvgDecoration(
     newCode: string,
     originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>,
     session: CodeWhispererSession,
-    languageClient: LanguageClient,
+    languageClient: BaseLanguageClient,
     item: InlineCompletionItemWithReferences,
     inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
 ) {
@@ -323,7 +323,7 @@ export async function displaySvgDecoration(
     if (Math.abs(startLine - currentCursorLine) >= autoDiscardEditCursorDistance) {
         // Emit DISCARD telemetry for edit suggestion that can't be shown because the suggestion is too far away
         const params = createDiscardTelemetryParams(session, item)
-        languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         logSuggestionFailure('DISCARD', 'cursor is too far away', item.insertText as string)
         return
     }
@@ -342,7 +342,7 @@ export async function displaySvgDecoration(
 
         // Emit DISCARD telemetry for edit suggestion that can't be shown due to active completion
         const params = createDiscardTelemetryParams(session, item)
-        languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         logSuggestionFailure('DISCARD', 'Conflicting active inline completion', item.insertText as string)
         return
     }
@@ -355,7 +355,7 @@ export async function displaySvgDecoration(
 
         const params = createDiscardTelemetryParams(session, item)
         // TODO: this session is closed on flare side hence discarded is not emitted in flare
-        languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         logSuggestionFailure('DISCARD', 'Invalid patch', item.insertText as string)
         return
     }
@@ -433,7 +433,7 @@ export async function displaySvgDecoration(
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
                 isInlineEdit: true,
             }
-            languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+            void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
             session.triggerOnAcceptance = true
         },
         async (isDiscard: boolean) => {
@@ -466,7 +466,7 @@ export async function displaySvgDecoration(
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
                 isInlineEdit: true,
             }
-            languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+            void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         },
         originalCode,
         newCode,

packages/amazonq/src/app/inline/EditRendering/displayImage.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import { displaySvgDecoration } from './displayImage'
 import { SvgGenerationService } from './svgGenerator'
 import { getLogger } from 'aws-core-vscode/shared'
-import { LanguageClient } from 'vscode-languageclient'
+import { BaseLanguageClient } from 'vscode-languageclient'
 import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
 import { CodeWhispererSession } from '../sessionManager'
 import type { AmazonQInlineCompletionItemProvider } from '../completion'
@@ -16,7 +16,7 @@ export async function showEdits(
     item: InlineCompletionItemWithReferences,
     editor: vscode.TextEditor | undefined,
     session: CodeWhispererSession,
-    languageClient: LanguageClient,
+    languageClient: BaseLanguageClient,
     inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
 ) {
     if (!editor) {

packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts

@@ -23,9 +23,9 @@ import {
     vsCodeState,
 } from 'aws-core-vscode/codewhisperer'
 import { Commands, getLogger, globals, sleep } from 'aws-core-vscode/shared'
-import { LanguageClient } from 'vscode-languageclient'
+import { BaseLanguageClient } from 'vscode-languageclient'
 
-export async function activate(languageClient: LanguageClient) {
+export async function activate(languageClient: BaseLanguageClient) {
     const codewhispererSettings = CodeWhispererSettings.instance
     const client = new DefaultCodeWhispererClient()
 

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

@@ -18,7 +18,7 @@ import {
     InlineCompletionTriggerKind,
     Range,
 } from 'vscode'
-import { LanguageClient } from 'vscode-languageclient'
+import { BaseLanguageClient } from 'vscode-languageclient'
 import {
     InlineCompletionItemWithReferences,
     LogInlineCompletionSessionResultsParams,
@@ -50,7 +50,7 @@ import { DocumentEventListener } from './documentEventListener'
 export class InlineCompletionManager implements Disposable {
     private disposable: Disposable
     private inlineCompletionProvider: AmazonQInlineCompletionItemProvider
-    private languageClient: LanguageClient
+    private languageClient: BaseLanguageClient
     private sessionManager: SessionManager
     private recommendationService: RecommendationService
     private lineTracker: LineTracker
@@ -60,7 +60,7 @@ export class InlineCompletionManager implements Disposable {
     private documentEventListener: DocumentEventListener
 
     constructor(
-        languageClient: LanguageClient,
+        languageClient: BaseLanguageClient,
         sessionManager: SessionManager,
         lineTracker: LineTracker,
         inlineTutorialAnnotation: InlineTutorialAnnotation,
@@ -140,7 +140,7 @@ export class InlineCompletionManager implements Disposable {
                     addedDiagnostics: diagnosticDiff.added.map((it) => toIdeDiagnostics(it)),
                     removedDiagnostics: diagnosticDiff.removed.map((it) => toIdeDiagnostics(it)),
                 }
-                this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.disposable.dispose()
                 this.disposable = languages.registerInlineCompletionItemProvider(
                     CodeWhispererConstants.platformLanguageIds,
@@ -200,7 +200,7 @@ export class InlineCompletionManager implements Disposable {
                     firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
                     totalSessionDisplayTime: totalSessionDisplayTime,
                 }
-                this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 // clear session manager states once rejected
                 this.sessionManager.clear()
             } finally {
@@ -216,7 +216,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
     private pendingRequest: Promise<InlineCompletionItem[]> | undefined
 
     constructor(
-        private readonly languageClient: LanguageClient,
+        private readonly languageClient: BaseLanguageClient,
         private readonly recommendationService: RecommendationService,
         private readonly sessionManager: SessionManager,
         private readonly inlineTutorialAnnotation: InlineTutorialAnnotation,
@@ -282,7 +282,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
                 totalSessionDisplayTime: Date.now() - session.requestStartTime,
             }
-            this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+            void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
         }
     }
 
@@ -427,7 +427,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                     firstCompletionDisplayLatency: prevSession.firstCompletionDisplayLatency,
                     totalSessionDisplayTime: Date.now() - prevSession.requestStartTime,
                 }
-                this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
                 // Do not make auto trigger if user rejects a suggestion
                 // by typing characters that does not match
@@ -499,7 +499,7 @@ ${itemLog}
                             },
                         },
                     }
-                    this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                    void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                     this.sessionManager.clear()
                     logstr += `- cursor moved behind trigger position. Discarding completion suggestion...`
                     return []
@@ -566,7 +566,7 @@ ${itemLog}
                         },
                     },
                 }
-                this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
                 logstr += `- suggestion does not match user typeahead from insertion position. Discarding suggestion...`
                 return []