Merge branch 'aws:master' into smai

yueny2020 · web-flow · commit abbfa101b9b8 · 2025-08-01T16:41:13.000-07:00
diff --git a/buildspec/linuxTests.yml b/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:
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -852,15 +852,21 @@
             },
             {
                 "command": "aws.amazonq.inline.acceptEdit",
-                "title": "%aws.amazonq.inline.acceptEdit%"
+                "title": "%AWS.amazonq.inline.acceptEdit%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
             },
             {
                 "command": "aws.amazonq.inline.rejectEdit",
-                "title": "%aws.amazonq.inline.rejectEdit%"
+                "title": "%AWS.amazonq.inline.rejectEdit%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
             },
             {
                 "command": "aws.amazonq.toggleNextEditPredictionPanel",
-                "title": "%aws.amazonq.toggleNextEditPredictionPanel%"
+                "title": "%AWS.amazonq.toggleNextEditPredictionPanel%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
             }
         ],
         "keybindings": [
diff --git a/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts b/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts
@@ -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))
             }
         }
 
diff --git a/packages/amazonq/src/app/inline/recommendationService.ts b/packages/amazonq/src/app/inline/recommendationService.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) {
diff --git a/packages/amazonq/src/util/timeoutUtil.ts b/packages/amazonq/src/util/timeoutUtil.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
+    })
+}
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
@@ -358,6 +358,7 @@
     "AWS.amazonq.codewhisperer.title": "Amazon Q",
     "AWS.amazonq.toggleCodeSuggestion": "Toggle Auto-Suggestions",
     "AWS.amazonq.toggleCodeScan": "Toggle Auto-Scans",
+    "AWS.amazonq.toggleNextEditPredictionPanel": "Toggle next edit suggestion",
     "AWS.amazonq.scans.scanProgress": "Sure. This may take a few minutes. I will send a notification when it’s complete if you navigate away from this panel.",
     "AWS.amazonq.scans.waitingForInput": "Waiting on your inputs...",
     "AWS.amazonq.scans.chooseScan.description": "Would you like to review your active file or the workspace you have open?",
@@ -465,6 +466,8 @@
     "AWS.amazonq.doc.pillText.reject": "Reject",
     "AWS.amazonq.doc.pillText.makeChanges": "Make changes",
     "AWS.amazonq.inline.invokeChat": "Inline chat",
+    "AWS.amazonq.inline.acceptEdit": "Accept edit suggestion",
+    "AWS.amazonq.inline.rejectEdit": "Reject edit suggestion",
     "AWS.amazonq.opensettings:": "Open settings",
     "AWS.toolkit.lambda.walkthrough.quickpickTitle": "Application Builder Walkthrough",
     "AWS.toolkit.lambda.walkthrough.title": "Get started building your application",
diff --git a/packages/core/src/shared/utilities/diffUtils.ts b/packages/core/src/shared/utilities/diffUtils.ts
@@ -152,24 +152,12 @@ export function getDiffCharsAndLines(
 }
 
 /**
- * Extracts modified lines from a unified diff string.
- * @param unifiedDiff The unified diff patch as a string.
+ * Extracts modified lines by comparing added and removed lines.
+ * @param addedLines The array of added lines.
+ * @param removedLines The array of removed lines.
  * @returns A Map where keys are removed lines and values are the corresponding modified (added) lines.
  */
-export function getModifiedLinesFromUnifiedDiff(unifiedDiff: string): Map<string, string> {
-    const removedLines: string[] = []
-    const addedLines: string[] = []
-
-    // Parse the unified diff to extract removed and added lines
-    const lines = unifiedDiff.split('\n')
-    for (const line of lines) {
-        if (line.startsWith('-') && !line.startsWith('---')) {
-            removedLines.push(line.slice(1))
-        } else if (line.startsWith('+') && !line.startsWith('+++')) {
-            addedLines.push(line.slice(1))
-        }
-    }
-
+export function getModifiedLinesFromCode(addedLines: string[], removedLines: string[]): Map<string, string> {
     const modifiedMap = new Map<string, string>()
     let addedIndex = 0
 
