Merge branch 'aws:master' into master

Author: parameja1

buildspec/linuxTests.yml

@@ -48,7 +48,7 @@ phases:
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
-            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info || true
 
 reports:
     unit-test:

package-lock.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-31",
+	"version": "1.87.0",
+	"entries": []
+}

packages/amazonq/.changes/1.87.0.json

@@ -1,3 +1,7 @@
+## 1.87.0 2025-07-31
+
+- Miscellaneous non-user-facing changes
+
 ## 1.86.0 2025-07-30
 
 - **Bug Fix** Let Enter invoke auto completion more consistently

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.87.0-SNAPSHOT",
+    "version": "1.88.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { diffWordsWithSpace } from 'diff'
+import { diffWordsWithSpace, diffLines } from 'diff'
 import * as vscode from 'vscode'
 import { ToolkitError, getLogger } from 'aws-core-vscode/shared'
 import { diffUtilities } from 'aws-core-vscode/shared'
@@ -42,10 +42,6 @@ export class SvgGenerationService {
             throw new ToolkitError('udiff format error')
         }
         const newCode = await diffUtilities.getPatchedCode(filePath, udiff)
-        const modifiedLines = diffUtilities.getModifiedLinesFromUnifiedDiff(udiff)
-        // TODO remove
-        // eslint-disable-next-line aws-toolkits/no-json-stringify-in-log
-        logger.info(`Line mapping: ${JSON.stringify(modifiedLines)}`)
 
         const { createSVGWindow } = await import('svgdom')
 
@@ -57,7 +53,12 @@ export class SvgGenerationService {
         const currentTheme = this.getEditorTheme()
 
         // Get edit diffs with highlight
-        const { addedLines, removedLines } = this.getEditedLinesFromDiff(udiff)
+        const { addedLines, removedLines } = this.getEditedLinesFromCode(originalCode, newCode)
+
+        const modifiedLines = diffUtilities.getModifiedLinesFromCode(addedLines, removedLines)
+        // TODO remove
+        // eslint-disable-next-line aws-toolkits/no-json-stringify-in-log
+        logger.info(`Line mapping: ${JSON.stringify(modifiedLines)}`)
 
         // Calculate dimensions based on code content
         const { offset, editStartLine, isPositionValid } = this.calculatePosition(
@@ -175,43 +176,25 @@ export class SvgGenerationService {
     }
 
     /**
-     * Extract added and removed lines from the unified diff
-     * @param unifiedDiff The unified diff string
+     * Extract added and removed lines by comparing original and new code
+     * @param originalCode The original code string
+     * @param newCode The new code string
      * @returns Object containing arrays of added and removed lines
      */
-    private getEditedLinesFromDiff(unifiedDiff: string): { addedLines: string[]; removedLines: string[] } {
+    private getEditedLinesFromCode(
+        originalCode: string,
+        newCode: string
+    ): { addedLines: string[]; removedLines: string[] } {
         const addedLines: string[] = []
         const removedLines: string[] = []
-        const diffLines = unifiedDiff.split('\n')
-
-        // Find all hunks in the diff
-        const hunkStarts = diffLines
-            .map((line, index) => (line.startsWith('@@ ') ? index : -1))
-            .filter((index) => index !== -1)
 
-        // Process each hunk to find added and removed lines
-        for (const hunkStart of hunkStarts) {
-            const hunkHeader = diffLines[hunkStart]
-            const match = hunkHeader.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/)
+        const changes = diffLines(originalCode, newCode)
 
-            if (!match) {
-                continue
-            }
-
-            // Extract the content lines for this hunk
-            let i = hunkStart + 1
-            while (i < diffLines.length && !diffLines[i].startsWith('@@')) {
-                // Include lines that were added (start with '+')
-                if (diffLines[i].startsWith('+') && !diffLines[i].startsWith('+++')) {
-                    const lineContent = diffLines[i].substring(1)
-                    addedLines.push(lineContent)
-                }
-                // Include lines that were removed (start with '-')
-                else if (diffLines[i].startsWith('-') && !diffLines[i].startsWith('---')) {
-                    const lineContent = diffLines[i].substring(1)
-                    removedLines.push(lineContent)
-                }
-                i++
+        for (const change of changes) {
+            if (change.added) {
+                addedLines.push(...change.value.split('\n').filter((line) => line.length > 0))
+            } else if (change.removed) {
+                removedLines.push(...change.value.split('\n').filter((line) => line.length > 0))
             }
         }
 

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

@@ -36,6 +36,7 @@ import {
     getDiagnosticsDifferences,
     getDiagnosticsOfCurrentFile,
     toIdeDiagnostics,
+    handleExtraBrackets,
 } from 'aws-core-vscode/codewhisperer'
 import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
@@ -106,11 +107,12 @@ export class InlineCompletionManager implements Disposable {
             item: InlineCompletionItemWithReferences,
             editor: TextEditor,
             requestStartTime: number,
-            startLine: number,
+            position: vscode.Position,
             firstCompletionDisplayLatency?: number
         ) => {
             try {
                 vsCodeState.isCodeWhispererEditing = true
+                const startLine = position.line
                 // TODO: also log the seen state for other suggestions in session
                 // Calculate timing metrics before diagnostic delay
                 const totalSessionDisplayTime = performance.now() - requestStartTime
@@ -119,6 +121,11 @@ export class InlineCompletionManager implements Disposable {
                     this.sessionManager.getActiveSession()?.diagnosticsBeforeAccept,
                     getDiagnosticsOfCurrentFile()
                 )
+                // try remove the extra } ) ' " if there is a new reported problem
+                // the extra } will cause syntax error
+                if (diagnosticDiff.added.length > 0) {
+                    await handleExtraBrackets(editor, editor.selection.active, position)
+                }
                 const params: LogInlineCompletionSessionResultsParams = {
                     sessionId: sessionId,
                     completionSessionResult: {
@@ -255,7 +262,11 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             return []
         }
 
-        const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
+        // there is a bug in VS Code, when hitting Enter, the context.triggerKind is Invoke (0)
+        // when hitting other keystrokes, the context.triggerKind is Automatic (1)
+        // we only mark option + C as manual trigger
+        // this is a workaround since the inlineSuggest.trigger command take no params
+        const isAutoTrigger = performance.now() - vsCodeState.lastManualTriggerTime > 50
         if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
             // return early when suggestions are disabled with auto trigger
             return []
@@ -304,7 +315,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                                 item,
                                 editor,
                                 prevSession?.requestStartTime,
-                                position.line,
+                                position,
                                 prevSession?.firstCompletionDisplayLatency,
                             ],
                         }
@@ -348,7 +359,10 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 this.languageClient,
                 document,
                 position,
-                context,
+                {
+                    triggerKind: isAutoTrigger ? 1 : 0,
+                    selectedCompletionInfo: context.selectedCompletionInfo,
+                },
                 token,
                 isAutoTrigger,
                 getAllRecommendationsOptions,
@@ -441,7 +455,7 @@ ${itemLog}
                             item,
                             editor,
                             session.requestStartTime,
-                            cursorPosition.line,
+                            cursorPosition,
                             session.firstCompletionDisplayLatency,
                         ],
                     }

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

@@ -12,10 +12,16 @@ import {
 import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
 import { SessionManager } from './sessionManager'
-import { AuthUtil, CodeWhispererStatusBarManager, vsCodeState } from 'aws-core-vscode/codewhisperer'
+import {
+    AuthUtil,
+    CodeWhispererConstants,
+    CodeWhispererStatusBarManager,
+    vsCodeState,
+} from 'aws-core-vscode/codewhisperer'
 import { TelemetryHelper } from './telemetryHelper'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
 import { getLogger } from 'aws-core-vscode/shared'
+import { asyncCallWithTimeout } from '../../util/timeoutUtil'
 
 export interface GetAllRecommendationsOptions {
     emitTelemetry?: boolean
@@ -35,6 +41,23 @@ export class RecommendationService {
         this.cursorUpdateRecorder = recorder
     }
 
+    async getRecommendationsWithTimeout(
+        languageClient: LanguageClient,
+        request: InlineCompletionWithReferencesParams,
+        token: CancellationToken
+    ) {
+        const resultPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
+            inlineCompletionWithReferencesRequestType.method,
+            request,
+            token
+        )
+        return await asyncCallWithTimeout<InlineCompletionListWithReferences>(
+            resultPromise,
+            `${inlineCompletionWithReferencesRequestType.method} time out`,
+            CodeWhispererConstants.promiseTimeoutLimit * 1000
+        )
+    }
+
     async getAllRecommendations(
         languageClient: LanguageClient,
         document: TextDocument,
@@ -93,11 +116,9 @@ export class RecommendationService {
                 },
             })
             const t0 = performance.now()
-            const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
-                inlineCompletionWithReferencesRequestType.method,
-                request,
-                token
-            )
+
+            const result = await this.getRecommendationsWithTimeout(languageClient, request, token)
+
             getLogger().info('Received inline completion response from LSP: %O', {
                 sessionId: result.sessionId,
                 latency: performance.now() - t0,
@@ -181,11 +202,7 @@ export class RecommendationService {
         while (nextToken) {
             const request = { ...initialRequest, partialResultToken: nextToken }
 
-            const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
-                inlineCompletionWithReferencesRequestType.method,
-                request,
-                token
-            )
+            const result = await this.getRecommendationsWithTimeout(languageClient, request, token)
             // when pagination is in progress, but user has already accepted or rejected an inline completion
             // then stop pagination
             if (this.sessionManager.getActiveSession() === undefined || vsCodeState.isCodeWhispererEditing) {

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

@@ -23,6 +23,7 @@ import {
     CodeWhispererSettings,
     getSelectedCustomization,
     TelemetryHelper,
+    vsCodeState,
 } from 'aws-core-vscode/codewhisperer'
 import {
     Settings,
@@ -367,6 +368,7 @@ async function onLanguageServerReady(
             sessionManager.checkInlineSuggestionVisibility()
         }),
         Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
+            vsCodeState.lastManualTriggerTime = performance.now()
             await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
         }),
         Commands.register('aws.amazonq.refreshAnnotation', async (forceProceed: boolean) => {

packages/amazonq/src/lsp/client.ts

@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export function asyncCallWithTimeout<T>(asyncPromise: Promise<T>, message: string, timeLimit: number): Promise<T> {
+    let timeoutHandle: NodeJS.Timeout
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        timeoutHandle = setTimeout(() => reject(new Error(message)), timeLimit)
+    })
+    return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutHandle)
+        return result as T
+    })
+}