Merge branch 'aws:master' into master

parameja1 · web-flow · commit 022c81c6df34 · 2025-07-30T17:21:14.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.86.0.json b/packages/amazonq/.changes/1.86.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-30",
+	"version": "1.86.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Let Enter invoke auto completion more consistently"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Faster and more responsive inline completion UX"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Use documentChangeEvent as auto trigger condition"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-316fb610-0ea9-40d1-bdb7-d371a6be4a4e.json b/packages/amazonq/.changes/next-release/Bug Fix-316fb610-0ea9-40d1-bdb7-d371a6be4a4e.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-7261a487-e80a-440f-b311-2688e256a886.json b/packages/amazonq/.changes/next-release/Bug Fix-7261a487-e80a-440f-b311-2688e256a886.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-9d694e40-7fc7-4504-b08c-6b22a5ebcb1c.json b/packages/amazonq/.changes/next-release/Bug Fix-9d694e40-7fc7-4504-b08c-6b22a5ebcb1c.json
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.86.0 2025-07-30
+
+- **Bug Fix** Let Enter invoke auto completion more consistently
+- **Bug Fix** Faster and more responsive inline completion UX
+- **Bug Fix** Use documentChangeEvent as auto trigger condition
+
 ## 1.85.0 2025-07-19
 
 - Miscellaneous non-user-facing changes
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.86.0-SNAPSHOT",
+    "version": "1.87.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/amazonq/src/app/amazonqScan/app.ts b/packages/amazonq/src/app/amazonqScan/app.ts
@@ -19,6 +19,7 @@ import { Messenger } from './chat/controller/messenger/messenger'
 import { UIMessageListener } from './chat/views/actions/uiMessageListener'
 import { debounce } from 'lodash'
 import { Commands, placeholder } from 'aws-core-vscode/shared'
+import { codeReviewInChat } from './models/constants'
 
 export function init(appContext: AmazonQAppInitContext) {
     const scanChatControllerEventEmitters: ScanChatControllerEventEmitters = {
@@ -74,17 +75,19 @@ export function init(appContext: AmazonQAppInitContext) {
         return debouncedEvent()
     })
 
-    Commands.register('aws.amazonq.security.scan-statusbar', async () => {
-        if (AuthUtil.instance.isConnectionExpired()) {
-            await AuthUtil.instance.notifyReauthenticate()
-        }
-        return focusAmazonQPanel.execute(placeholder, 'amazonq.security.scan').then(() => {
-            DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
-                sender: 'amazonqCore',
-                command: 'review',
+    if (!codeReviewInChat) {
+        Commands.register('aws.amazonq.security.scan-statusbar', async () => {
+            if (AuthUtil.instance.isConnectionExpired()) {
+                await AuthUtil.instance.notifyReauthenticate()
+            }
+            return focusAmazonQPanel.execute(placeholder, 'amazonq.security.scan').then(() => {
+                DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
+                    sender: 'amazonqCore',
+                    command: 'review',
+                })
             })
         })
-    })
+    }
 
     codeScanState.setChatControllers(scanChatControllerEventEmitters)
     onDemandFileScanState.setChatControllers(scanChatControllerEventEmitters)
diff --git a/packages/amazonq/src/app/amazonqScan/models/constants.ts b/packages/amazonq/src/app/amazonqScan/models/constants.ts
@@ -97,3 +97,5 @@ const getIconForStep = (targetStep: number, currentStep: number) => {
           ? checkIcons.done
           : checkIcons.wait
 }
+
+export const codeReviewInChat = true
diff --git a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts
@@ -26,8 +26,10 @@ export async function showEdits(
         const svgGenerationService = new SvgGenerationService()
         // Generate your SVG image with the file contents
         const currentFile = editor.document.uri.fsPath
-        const { svgImage, startLine, newCode, origionalCodeHighlightRange } =
-            await svgGenerationService.generateDiffSvg(currentFile, item.insertText as string)
+        const { svgImage, startLine, newCode, originalCodeHighlightRange } = await svgGenerationService.generateDiffSvg(
+            currentFile,
+            item.insertText as string
+        )
 
         // TODO: To investigate why it fails and patch [generateDiffSvg]
         if (newCode.length === 0) {
@@ -42,7 +44,7 @@ export async function showEdits(
                 svgImage,
                 startLine,
                 newCode,
-                origionalCodeHighlightRange,
+                originalCodeHighlightRange,
                 session,
                 languageClient,
                 item,
diff --git a/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts b/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts
@@ -11,6 +11,12 @@ type Range = { line: number; start: number; end: number }
 
 const logger = getLogger('nextEditPrediction')
 export const imageVerticalOffset = 1
+export const emptyDiffSvg = {
+    svgImage: vscode.Uri.parse(''),
+    startLine: 0,
+    newCode: '',
+    originalCodeHighlightRange: [],
+}
 
 export class SvgGenerationService {
     /**
@@ -27,7 +33,7 @@ export class SvgGenerationService {
         svgImage: vscode.Uri
         startLine: number
         newCode: string
-        origionalCodeHighlightRange: Range[]
+        originalCodeHighlightRange: Range[]
     }> {
         const textDoc = await vscode.workspace.openTextDocument(filePath)
         const originalCode = textDoc.getText().replaceAll('\r\n', '\n')
@@ -52,6 +58,21 @@ export class SvgGenerationService {
 
         // Get edit diffs with highlight
         const { addedLines, removedLines } = this.getEditedLinesFromDiff(udiff)
+
+        // Calculate dimensions based on code content
+        const { offset, editStartLine, isPositionValid } = this.calculatePosition(
+            originalCode.split('\n'),
+            newCode.split('\n'),
+            addedLines,
+            currentTheme
+        )
+
+        // if the position for the EDITS suggestion is not valid (there is no difference between new
+        // and current code content), return EMPTY_DIFF_SVG and skip the suggestion.
+        if (!isPositionValid) {
+            return emptyDiffSvg
+        }
+
         const highlightRanges = this.generateHighlightRanges(removedLines, addedLines, modifiedLines)
         const diffAddedWithHighlight = this.getHighlightEdit(addedLines, highlightRanges.addedRanges)
 
@@ -61,13 +82,6 @@ export class SvgGenerationService {
         registerWindow(window, document)
         const draw = SVG(document.documentElement) as any
 
-        // Calculate dimensions based on code content
-        const { offset, editStartLine } = this.calculatePosition(
-            originalCode.split('\n'),
-            newCode.split('\n'),
-            addedLines,
-            currentTheme
-        )
         const { width, height } = this.calculateDimensions(addedLines, currentTheme)
         draw.size(width + offset, height)
 
@@ -86,7 +100,7 @@ export class SvgGenerationService {
             svgImage: vscode.Uri.parse(svgResult),
             startLine: editStartLine,
             newCode: newCode,
-            origionalCodeHighlightRange: highlightRanges.removedRanges,
+            originalCodeHighlightRange: highlightRanges.removedRanges,
         }
     }
 
@@ -356,12 +370,23 @@ export class SvgGenerationService {
         newLines: string[],
         diffLines: string[],
         theme: editorThemeInfo
-    ): { offset: number; editStartLine: number } {
+    ): { offset: number; editStartLine: number; isPositionValid: boolean } {
         // Determine the starting line of the edit in the original file
         let editStartLineInOldFile = 0
         const maxLength = Math.min(originalLines.length, newLines.length)
 
         for (let i = 0; i <= maxLength; i++) {
+            // if there is no difference between the original lines and the new lines, skip calculating for the start position.
+            if (i === maxLength && originalLines[i] === newLines[i] && originalLines.length === newLines.length) {
+                logger.info(
+                    'There is no difference between current and new code suggestion. Skip calculating for start position.'
+                )
+                return {
+                    offset: 0,
+                    editStartLine: 0,
+                    isPositionValid: false,
+                }
+            }
             if (originalLines[i] !== newLines[i] || i === maxLength) {
                 editStartLineInOldFile = i
                 break
@@ -386,7 +411,7 @@ export class SvgGenerationService {
         const startLineLength = originalLines[startLine]?.length || 0
         const offset = (maxLineLength - startLineLength) * theme.fontSize * 0.7 + 10 // padding
 
-        return { offset, editStartLine: editStartLineInOldFile }
+        return { offset, editStartLine: editStartLineInOldFile, isPositionValid: true }
     }
 
     private escapeHtml(text: string): string {
diff --git a/packages/amazonq/src/lsp/chat/commands.ts b/packages/amazonq/src/lsp/chat/commands.ts
@@ -6,10 +6,12 @@
 import { Commands, globals } from 'aws-core-vscode/shared'
 import { window } from 'vscode'
 import { AmazonQChatViewProvider } from './webviewProvider'
-import { CodeScanIssue } from 'aws-core-vscode/codewhisperer'
+import { CodeScanIssue, AuthUtil } from 'aws-core-vscode/codewhisperer'
 import { getLogger } from 'aws-core-vscode/shared'
 import * as vscode from 'vscode'
 import * as path from 'path'
+import { codeReviewInChat } from '../../app/amazonqScan/models/constants'
+import { telemetry, AmazonqCodeReviewTool } from 'aws-core-vscode/telemetry'
 
 /**
  * TODO: Re-enable these once we can figure out which path they're going to live in
@@ -29,7 +31,8 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
                 filePath,
                 'Explain',
                 'Provide a small description of the issue. You must not attempt to fix the issue. You should only give a small summary of it to the user.',
-                provider
+                provider,
+                'explainIssue'
             )
         ),
         Commands.register('aws.amazonq.generateFix', (issue: CodeScanIssue, filePath: string) =>
@@ -38,7 +41,8 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
                 filePath,
                 'Fix',
                 'Generate a fix for the following code issue. You must not explain the issue, just generate and explain the fix. The user should have the option to accept or reject the fix before any code is changed.',
-                provider
+                provider,
+                'applyFix'
             )
         ),
         Commands.register('aws.amazonq.sendToPrompt', (data) => {
@@ -64,14 +68,20 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
         registerShellCommandShortCut('aws.amazonq.rejectCmdExecution', 'reject-shell-command', provider),
         registerShellCommandShortCut('aws.amazonq.stopCmdExecution', 'stop-shell-command', provider)
     )
+    if (codeReviewInChat) {
+        globals.context.subscriptions.push(
+            registerGenericCommand('aws.amazonq.security.scan-statusbar', 'Review', provider)
+        )
+    }
 }
 
 async function handleIssueCommand(
     issue: CodeScanIssue,
     filePath: string,
     action: string,
     contextPrompt: string,
-    provider: AmazonQChatViewProvider
+    provider: AmazonQChatViewProvider,
+    metricName: string
 ) {
     await focusAmazonQPanel()
 
@@ -95,6 +105,16 @@ async function handleIssueCommand(
             autoSubmit: true,
         },
     })
+
+    telemetry.amazonq_codeReviewTool.emit({
+        findingId: issue.findingId,
+        detectorId: issue.detectorId,
+        ruleId: issue.ruleId,
+        credentialStartUrl: AuthUtil.instance.startUrl,
+        autoDetected: issue.autoDetected,
+        result: 'Succeeded',
+        reason: metricName,
+    } as AmazonqCodeReviewTool)
 }
 
 async function openFileWithSelection(issue: CodeScanIssue, filePath: string) {
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -52,6 +52,7 @@ import { SessionManager } from '../app/inline/sessionManager'
 import { LineTracker } from '../app/inline/stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from '../app/inline/tutorials/inlineTutorialAnnotation'
 import { InlineChatTutorialAnnotation } from '../app/inline/tutorials/inlineChatTutorialAnnotation'
+import { codeReviewInChat } from '../app/amazonqScan/models/constants'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
@@ -180,7 +181,7 @@ export async function startLanguageServer(
                         reroute: true,
                         modelSelection: true,
                         workspaceFilePath: vscode.workspace.workspaceFile?.fsPath,
-                        codeReviewInChat: false,
+                        codeReviewInChat: codeReviewInChat,
                     },
                     window: {
                         notifications: true,
diff --git a/packages/amazonq/test/unit/app/inline/EditRendering/imageRenderer.test.ts b/packages/amazonq/test/unit/app/inline/EditRendering/imageRenderer.test.ts
@@ -30,7 +30,7 @@ describe('showEdits', function () {
             svgImage: vscode.Uri.file('/path/to/generated.svg'),
             startLine: 5,
             newCode: 'console.log("Hello World");',
-            origionalCodeHighlightRange: [{ line: 5, start: 0, end: 10 }],
+            originalCodeHighlightRange: [{ line: 5, start: 0, end: 10 }],
             ...overrides,
         }
     }
@@ -167,7 +167,7 @@ describe('showEdits', function () {
             mockSvgResult.svgImage,
             mockSvgResult.startLine,
             mockSvgResult.newCode,
-            mockSvgResult.origionalCodeHighlightRange,
+            mockSvgResult.originalCodeHighlightRange,
             sessionStub,
             languageClientStub,
             itemStub
diff --git a/packages/toolkit/.changes/3.70.0.json b/packages/toolkit/.changes/3.70.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-07-30",
+	"version": "3.70.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Improved connection actions for SSO"
+		}
+	]
+}
diff --git a/packages/toolkit/.changes/next-release/Feature-852d6637-ac3c-4b7f-b846-649d23da87e3.json b/packages/toolkit/.changes/next-release/Feature-852d6637-ac3c-4b7f-b846-649d23da87e3.json
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.70.0 2025-07-30
+
+- **Feature** Improved connection actions for SSO
+
 ## 3.69.0 2025-07-16
 
 - **Bug Fix** SageMaker: Enable per-region manual filtering of Spaces
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.",
-    "version": "3.70.0-SNAPSHOT",
+    "version": "3.71.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

Original file line number	Diff line number	Diff line change
`@@ -97,3 +97,5 @@ const getIconForStep = (targetStep: number, currentStep: number) => {`
`97`	`97`	`? checkIcons.done`
`98`	`98`	`: checkIcons.wait`
`99`	`99`	`}`
	`100`	`+`
	`101`	`+export const codeReviewInChat = true`