Merge branch 'aws:master' into feat/amazonq-mcp-admin-config

Author: ashishrp-aws

.gitignore

@@ -31,7 +31,6 @@ src.gen/*
 **/src/shared/telemetry/clienttelemetry.d.ts
 **/src/codewhisperer/client/codewhispererclient.d.ts
 **/src/codewhisperer/client/codewhispereruserclient.d.ts
-**/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
 **/src/auth/sso/oidcclientpkce.d.ts
 
 # Generated by tests

packages/amazonq/.changes/next-release/Bug Fix-7261a487-e80a-440f-b311-2688e256a886.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Faster and more responsive inline completion UX"
+}

packages/amazonq/package.json

@@ -975,6 +975,10 @@
                 "command": "aws.amazonq.showPrev",
                 "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
             },
+            {
+                "command": "aws.amazonq.checkInlineSuggestionVisibility",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            },
             {
                 "command": "aws.amazonq.inline.invokeChat",
                 "win": "ctrl+i",

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

@@ -30,7 +30,7 @@ export class SvgGenerationService {
         origionalCodeHighlightRange: Range[]
     }> {
         const textDoc = await vscode.workspace.openTextDocument(filePath)
-        const originalCode = textDoc.getText()
+        const originalCode = textDoc.getText().replaceAll('\r\n', '\n')
         if (originalCode === '') {
             logger.error(`udiff format error`)
             throw new ToolkitError('udiff format error')

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

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
+import * as vscode from 'vscode'
 import {
     CancellationToken,
     InlineCompletionContext,
@@ -32,7 +32,6 @@ import {
     ImportAdderProvider,
     CodeSuggestionsState,
     vsCodeState,
-    inlineCompletionsDebounceDelay,
     noInlineSuggestionsMsg,
     getDiagnosticsDifferences,
     getDiagnosticsOfCurrentFile,
@@ -42,7 +41,7 @@ import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 import { TelemetryHelper } from './telemetryHelper'
 import { Experiments, getLogger, sleep } from 'aws-core-vscode/shared'
-import { debounce, messageUtils } from 'aws-core-vscode/utils'
+import { messageUtils } from 'aws-core-vscode/utils'
 import { showEdits } from './EditRendering/imageRenderer'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
 import { DocumentEventListener } from './documentEventListener'
@@ -214,13 +213,23 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
     ) {}
 
     private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
-    provideInlineCompletionItems = debounce(
-        this._provideInlineCompletionItems.bind(this),
-        inlineCompletionsDebounceDelay,
-        true
-    )
 
-    private async _provideInlineCompletionItems(
+    // Ideally use this API handleDidShowCompletionItem
+    // https://github.com/microsoft/vscode/blob/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts#L83
+    // we need this because the returned items of provideInlineCompletionItems may not be actually rendered on screen
+    // if VS Code believes the user is actively typing then it will not show such item
+    async checkWhetherInlineCompletionWasShown() {
+        // this line is to force VS Code to re-render the inline completion
+        // if it decides the inline completion can be shown
+        await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+        // yield event loop to let backend state transition finish plus wait for vsc to render
+        await sleep(10)
+        // run the command to detect if inline suggestion is really shown or not
+        await vscode.commands.executeCommand(`aws.amazonq.checkInlineSuggestionVisibility`)
+    }
+
+    // this method is automatically invoked by VS Code as user types
+    async provideInlineCompletionItems(
         document: TextDocument,
         position: Position,
         context: InlineCompletionContext,
@@ -307,17 +316,18 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 if (prevItemMatchingPrefix.length > 0) {
                     logstr += `- not call LSP and reuse previous suggestions that match user typed characters
                     - duration between trigger to completion suggestion is displayed ${performance.now() - t0}`
+                    void this.checkWhetherInlineCompletionWasShown()
                     return prevItemMatchingPrefix
                 }
-                getLogger().debug(`Auto rejecting suggestions from previous session`)
-                // if no such suggestions, report the previous suggestion as Reject
+
+                // if no such suggestions, report the previous suggestion as Reject or Discarded
                 const params: LogInlineCompletionSessionResultsParams = {
                     sessionId: prevSessionId,
                     completionSessionResult: {
                         [prevItemId]: {
-                            seen: true,
+                            seen: prevSession.displayed,
                             accepted: false,
-                            discarded: false,
+                            discarded: !prevSession.displayed,
                         },
                     },
                     totalSessionDisplayTime: performance.now() - prevSession.requestStartTime,
@@ -461,6 +471,7 @@ ${itemLog}
             this.sessionManager.updateCodeReferenceAndImports()
             // suggestions returned here will be displayed on screen
             logstr += `- duration between trigger to completion suggestion is displayed: ${performance.now() - t0}ms`
+            void this.checkWhetherInlineCompletionWasShown()
             return itemsMatchingTypeahead as InlineCompletionItem[]
         } catch (e) {
             getLogger('amazonqLsp').error('Failed to provide completion items: %O', e)

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

@@ -24,6 +24,8 @@ export interface CodeWhispererSession {
     // partialResultToken for the next trigger if user accepts an EDITS suggestion
     editsStreakPartialResultToken?: number | string
     triggerOnAcceptance?: boolean
+    // whether any suggestion in this session was displayed on screen
+    displayed: boolean
 }
 
 export class SessionManager {
@@ -49,6 +51,7 @@ export class SessionManager {
             startPosition,
             firstCompletionDisplayLatency,
             diagnosticsBeforeAccept,
+            displayed: false,
         }
         this._currentSuggestionIndex = 0
     }
@@ -128,6 +131,12 @@ export class SessionManager {
         }
     }
 
+    public checkInlineSuggestionVisibility() {
+        if (this.activeSession) {
+            this.activeSession.displayed = true
+        }
+    }
+
     private clearReferenceInlineHintsAndImportHints() {
         ReferenceInlineProvider.instance.removeInlineReference()
         ImportAdderProvider.instance.clear()

packages/amazonq/src/lsp/client.ts

@@ -39,6 +39,7 @@ import {
     getClientId,
     extensionVersion,
     isSageMaker,
+    DevSettings,
 } from 'aws-core-vscode/shared'
 import { processUtils } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
@@ -130,6 +131,15 @@ export async function startLanguageServer(
 
     await validateNodeExe(executable, resourcePaths.lsp, argv, logger)
 
+    const endpointOverride = DevSettings.instance.get('codewhispererService', {}).endpoint ?? undefined
+    const textDocSection = {
+        inlineEditSupport: Experiments.instance.get('amazonqLSPNEP', true),
+    } as any
+
+    if (endpointOverride) {
+        textDocSection.endpointOverride = endpointOverride
+    }
+
     // Options to control the language client
     const clientOptions: LanguageClientOptions = {
         // Register the server for json documents
@@ -179,9 +189,7 @@ export async function startLanguageServer(
                         showLogs: true,
                     },
                     textDocument: {
-                        inlineCompletionWithReferences: {
-                            inlineEditSupport: Experiments.instance.get('amazonqLSPNEP', true),
-                        },
+                        inlineCompletionWithReferences: textDocSection,
                     },
                 },
                 contextConfiguration: {
@@ -354,6 +362,10 @@ async function onLanguageServerReady(
             await vscode.commands.executeCommand('editor.action.inlineSuggest.showNext')
             sessionManager.onNextSuggestion()
         }),
+        // this is a workaround since handleDidShowCompletionItem is not public API
+        Commands.register('aws.amazonq.checkInlineSuggestionVisibility', async () => {
+            sessionManager.checkInlineSuggestionVisibility()
+        }),
         Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
             await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
         }),

packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts

@@ -378,7 +378,7 @@ describe('InlineCompletionManager', () => {
                     )
                     await messageShown
                 })
-            describe('debounce behavior', function () {
+            describe.skip('debounce behavior', function () {
                 let clock: ReturnType<typeof installFakeClock>
 
                 beforeEach(function () {
@@ -389,7 +389,7 @@ describe('InlineCompletionManager', () => {
                     clock.uninstall()
                 })
 
-                it('should only trigger once on rapid events', async () => {
+                it.skip('should only trigger once on rapid events', async () => {
                     provider = new AmazonQInlineCompletionItemProvider(
                         languageClient,
                         recommendationService,