Merge master branch and resolve conflicts

Author: singhAws

package-lock.json

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

packages/amazonq/.changes/1.85.0.json

@@ -1,3 +1,7 @@
+## 1.85.0 2025-07-19
+
+- Miscellaneous non-user-facing changes
+
 ## 1.84.0 2025-07-17
 
 - **Bug Fix** Slightly delay rendering inline completion when user is typing

packages/amazonq/.changes/next-release/Bug Fix-316fb610-0ea9-40d1-bdb7-d371a6be4a4e.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.85.0-SNAPSHOT",
+    "version": "1.86.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/.changes/next-release/Bug Fix-9d694e40-7fc7-4504-b08c-6b22a5ebcb1c.json

@@ -29,12 +29,6 @@ export async function showEdits(
         const { svgImage, startLine, newCode, origionalCodeHighlightRange } =
             await svgGenerationService.generateDiffSvg(currentFile, item.insertText as string)
 
-        // TODO: To investigate why it fails and patch [generateDiffSvg]
-        if (newCode.length === 0) {
-            getLogger('nextEditPrediction').warn('not able to apply provided edit suggestion, skip rendering')
-            return
-        }
-
         if (svgImage) {
             // display the SVG image
             await displaySvgDecoration(

packages/amazonq/CHANGELOG.md

@@ -241,12 +241,6 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             return []
         }
 
-        const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
-        if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
-            // return early when suggestions are disabled with auto trigger
-            return []
-        }
-
         // yield event loop to let the document listen catch updates
         await sleep(1)
         // prevent user deletion invoking auto trigger
@@ -260,6 +254,12 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         try {
             const t0 = performance.now()
             vsCodeState.isRecommendationsActive = true
+            const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
+            if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
+                // return early when suggestions are disabled with auto trigger
+                return []
+            }
+
             // handling previous session
             const prevSession = this.sessionManager.getActiveSession()
             const prevSessionId = prevSession?.sessionId
@@ -335,8 +335,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 context,
                 token,
                 isAutoTrigger,
-                getAllRecommendationsOptions,
-                this.documentEventListener.getLastDocumentChangeEvent(document.uri.fsPath)?.event
+                getAllRecommendationsOptions
             )
             // get active item from session for displaying
             const items = this.sessionManager.getActiveRecommendation()

packages/amazonq/package.json

@@ -21,11 +21,6 @@ export class DocumentEventListener {
                     this.lastDocumentChangeEventMap.clear()
                 }
                 this.lastDocumentChangeEventMap.set(e.document.uri.fsPath, { event: e, timestamp: performance.now() })
-                // The VS Code provideInlineCompletionCallback may not trigger when Enter is pressed, especially in Python files
-                // manually make this trigger. In case of duplicate, the provideInlineCompletionCallback is already debounced
-                if (this.isEnter(e) && vscode.window.activeTextEditor) {
-                    void vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
-                }
             }
         })
     }
@@ -52,18 +47,4 @@ export class DocumentEventListener {
             this.documentChangeListener.dispose()
         }
     }
-
-    private isEnter(e: vscode.TextDocumentChangeEvent): boolean {
-        if (e.contentChanges.length !== 1) {
-            return false
-        }
-        const str = e.contentChanges[0].text
-        if (str.length === 0) {
-            return false
-        }
-        return (
-            (str.startsWith('\r\n') && str.substring(2).trim() === '') ||
-            (str[0] === '\n' && str.substring(1).trim() === '')
-        )
-    }
 }

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

@@ -2,12 +2,10 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import * as vscode from 'vscode'
 import {
     InlineCompletionListWithReferences,
     InlineCompletionWithReferencesParams,
     inlineCompletionWithReferencesRequestType,
-    TextDocumentContentChangeEvent,
 } from '@aws/language-server-runtimes/protocol'
 import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
@@ -42,28 +40,17 @@ export class RecommendationService {
         context: InlineCompletionContext,
         token: CancellationToken,
         isAutoTrigger: boolean,
-        options: GetAllRecommendationsOptions = { emitTelemetry: true, showUi: true },
-        documentChangeEvent?: vscode.TextDocumentChangeEvent
+        options: GetAllRecommendationsOptions = { emitTelemetry: true, showUi: true }
     ) {
         // Record that a regular request is being made
         this.cursorUpdateRecorder?.recordCompletionRequest()
-        const documentChangeParams = documentChangeEvent
-            ? {
-                  textDocument: {
-                      uri: document.uri.toString(),
-                      version: document.version,
-                  },
-                  contentChanges: documentChangeEvent.contentChanges.map((x) => x as TextDocumentContentChangeEvent),
-              }
-            : undefined
 
         let request: InlineCompletionWithReferencesParams = {
             textDocument: {
                 uri: document.uri.toString(),
             },
             position,
             context,
-            documentChangeParams: documentChangeParams,
         }
         if (options.editsStreakToken) {
             request = { ...request, partialResultToken: options.editsStreakToken }