Merge master into feature/ui-e2e-tests

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Removal-083c6e6d-e543-4df7-86ae-0c0f8c0a27ee.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Deprecate \"amazon q is generating...\" UI for inline suggestion"
+}

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

@@ -122,19 +122,19 @@ export class EditDecorationManager {
     /**
      * Displays an edit suggestion as an SVG image in the editor and highlights removed code
      */
-    public displayEditSuggestion(
+    public async displayEditSuggestion(
         editor: vscode.TextEditor,
         svgImage: vscode.Uri,
         startLine: number,
-        onAccept: () => void,
-        onReject: () => void,
+        onAccept: () => Promise<void>,
+        onReject: () => Promise<void>,
         originalCode: string,
         newCode: string,
         originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>
-    ): void {
-        this.clearDecorations(editor)
+    ): Promise<void> {
+        await this.clearDecorations(editor)
 
-        void setContext('aws.amazonq.editSuggestionActive' as any, true)
+        await setContext('aws.amazonq.editSuggestionActive' as any, true)
 
         this.acceptHandler = onAccept
         this.rejectHandler = onReject
@@ -157,14 +157,14 @@ export class EditDecorationManager {
     /**
      * Clears all edit suggestion decorations
      */
-    public clearDecorations(editor: vscode.TextEditor): void {
+    public async clearDecorations(editor: vscode.TextEditor): Promise<void> {
         editor.setDecorations(this.imageDecorationType, [])
         editor.setDecorations(this.removedCodeDecorationType, [])
         this.currentImageDecoration = undefined
         this.currentRemovedCodeDecorations = []
         this.acceptHandler = undefined
         this.rejectHandler = undefined
-        void setContext('aws.amazonq.editSuggestionActive' as any, false)
+        await setContext('aws.amazonq.editSuggestionActive' as any, false)
     }
 
     /**
@@ -285,7 +285,7 @@ export async function displaySvgDecoration(
 ) {
     const originalCode = editor.document.getText()
 
-    decorationManager.displayEditSuggestion(
+    await decorationManager.displayEditSuggestion(
         editor,
         svgImage,
         startLine,
@@ -303,7 +303,7 @@ export async function displaySvgDecoration(
             // Move cursor to end of the actual changed content
             editor.selection = new vscode.Selection(endPosition, endPosition)
 
-            decorationManager.clearDecorations(editor)
+            await decorationManager.clearDecorations(editor)
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: session.sessionId,
                 completionSessionResult: {
@@ -330,10 +330,10 @@ export async function displaySvgDecoration(
                 )
             }
         },
-        () => {
+        async () => {
             // Handle reject
             getLogger().info('Edit suggestion rejected')
-            decorationManager.clearDecorations(editor)
+            await decorationManager.clearDecorations(editor)
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: session.sessionId,
                 completionSessionResult: {

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

@@ -36,7 +36,6 @@ import {
     noInlineSuggestionsMsg,
     ReferenceInlineProvider,
 } from 'aws-core-vscode/codewhisperer'
-import { InlineGeneratingMessage } from './inlineGeneratingMessage'
 import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 import { TelemetryHelper } from './telemetryHelper'
@@ -55,7 +54,7 @@ export class InlineCompletionManager implements Disposable {
     private sessionManager: SessionManager
     private recommendationService: RecommendationService
     private lineTracker: LineTracker
-    private incomingGeneratingMessage: InlineGeneratingMessage
+
     private inlineTutorialAnnotation: InlineTutorialAnnotation
     private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
     private documentChangeListener: Disposable
@@ -70,12 +69,7 @@ export class InlineCompletionManager implements Disposable {
         this.languageClient = languageClient
         this.sessionManager = sessionManager
         this.lineTracker = lineTracker
-        this.incomingGeneratingMessage = new InlineGeneratingMessage(this.lineTracker)
-        this.recommendationService = new RecommendationService(
-            this.sessionManager,
-            this.incomingGeneratingMessage,
-            cursorUpdateRecorder
-        )
+        this.recommendationService = new RecommendationService(this.sessionManager, cursorUpdateRecorder)
         this.inlineTutorialAnnotation = inlineTutorialAnnotation
         this.inlineCompletionProvider = new AmazonQInlineCompletionItemProvider(
             languageClient,
@@ -105,7 +99,6 @@ export class InlineCompletionManager implements Disposable {
     public dispose(): void {
         if (this.disposable) {
             this.disposable.dispose()
-            this.incomingGeneratingMessage.dispose()
             this.lineTracker.dispose()
         }
         if (this.documentChangeListener) {

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

@@ -11,7 +11,6 @@ import {
 import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
 import { SessionManager } from './sessionManager'
-import { InlineGeneratingMessage } from './inlineGeneratingMessage'
 import { AuthUtil, CodeWhispererStatusBarManager } from 'aws-core-vscode/codewhisperer'
 import { TelemetryHelper } from './telemetryHelper'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
@@ -26,7 +25,6 @@ export interface GetAllRecommendationsOptions {
 export class RecommendationService {
     constructor(
         private readonly sessionManager: SessionManager,
-        private readonly inlineGeneratingMessage: InlineGeneratingMessage,
         private cursorUpdateRecorder?: ICursorUpdateRecorder
     ) {}
     /**
@@ -69,7 +67,6 @@ export class RecommendationService {
         try {
             // Show UI indicators only if UI is enabled
             if (options.showUi) {
-                await this.inlineGeneratingMessage.showGenerating(context.triggerKind)
                 await statusBar.setLoading()
             }
 
@@ -165,7 +162,6 @@ export class RecommendationService {
         } finally {
             // Remove all UI indicators if UI is enabled
             if (options.showUi) {
-                this.inlineGeneratingMessage.hideGenerating()
                 void statusBar.refreshStatusBar() // effectively "stop loading"
             }
         }

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

@@ -26,7 +26,6 @@ import {
     ReferenceLogViewProvider,
     vsCodeState,
 } from 'aws-core-vscode/codewhisperer'
-import { InlineGeneratingMessage } from '../../../../../src/app/inline/inlineGeneratingMessage'
 import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from '../../../../../src/app/inline/tutorials/inlineTutorialAnnotation'
 
@@ -247,9 +246,8 @@ describe('InlineCompletionManager', () => {
 
             beforeEach(() => {
                 const lineTracker = new LineTracker()
-                const activeStateController = new InlineGeneratingMessage(lineTracker)
                 inlineTutorialAnnotation = new InlineTutorialAnnotation(lineTracker, mockSessionManager)
-                recommendationService = new RecommendationService(mockSessionManager, activeStateController)
+                recommendationService = new RecommendationService(mockSessionManager)
                 vsCodeState.isRecommendationsActive = false
                 mockSessionManager = {
                     getActiveSession: getActiveSessionStub,

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

@@ -10,8 +10,6 @@ import assert from 'assert'
 import { RecommendationService } from '../../../../../src/app/inline/recommendationService'
 import { SessionManager } from '../../../../../src/app/inline/sessionManager'
 import { createMockDocument } from 'aws-core-vscode/test'
-import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
-import { InlineGeneratingMessage } from '../../../../../src/app/inline/inlineGeneratingMessage'
 // Import CursorUpdateManager directly instead of the interface
 import { CursorUpdateManager } from '../../../../../src/app/inline/cursorUpdateManager'
 import { CodeWhispererStatusBarManager } from 'aws-core-vscode/codewhisperer'
@@ -22,8 +20,6 @@ describe('RecommendationService', () => {
     let sendRequestStub: sinon.SinonStub
     let sandbox: sinon.SinonSandbox
     let sessionManager: SessionManager
-    let lineTracker: LineTracker
-    let activeStateController: InlineGeneratingMessage
     let service: RecommendationService
     let cursorUpdateManager: CursorUpdateManager
     let statusBarStub: any
@@ -69,8 +65,6 @@ describe('RecommendationService', () => {
         } as unknown as LanguageClient
 
         sessionManager = new SessionManager()
-        lineTracker = new LineTracker()
-        activeStateController = new InlineGeneratingMessage(lineTracker)
 
         // Create cursor update manager mock
         cursorUpdateManager = {
@@ -94,7 +88,7 @@ describe('RecommendationService', () => {
         sandbox.stub(CodeWhispererStatusBarManager, 'instance').get(() => statusBarStub)
 
         // Create the service without cursor update recorder initially
-        service = new RecommendationService(sessionManager, activeStateController)
+        service = new RecommendationService(sessionManager)
     })
 
     afterEach(() => {
@@ -104,11 +98,7 @@ describe('RecommendationService', () => {
 
     describe('constructor', () => {
         it('should initialize with optional cursorUpdateRecorder', () => {
-            const serviceWithRecorder = new RecommendationService(
-                sessionManager,
-                activeStateController,
-                cursorUpdateManager
-            )
+            const serviceWithRecorder = new RecommendationService(sessionManager, cursorUpdateManager)
 
             // Verify the service was created with the recorder
             assert.strictEqual(serviceWithRecorder['cursorUpdateRecorder'], cursorUpdateManager)
@@ -232,26 +222,7 @@ describe('RecommendationService', () => {
             sinon.assert.calledOnce(cursorUpdateManager.recordCompletionRequest as sinon.SinonStub)
         })
 
-        // Helper function to setup UI test
-        function setupUITest() {
-            const mockFirstResult = {
-                sessionId: 'test-session',
-                items: [mockInlineCompletionItemOne],
-                partialResultToken: undefined,
-            }
-
-            sendRequestStub.resolves(mockFirstResult)
-
-            // Spy on the UI methods
-            const showGeneratingStub = sandbox.stub(activeStateController, 'showGenerating').resolves()
-            const hideGeneratingStub = sandbox.stub(activeStateController, 'hideGenerating')
-
-            return { showGeneratingStub, hideGeneratingStub }
-        }
-
         it('should not show UI indicators when showUi option is false', async () => {
-            const { showGeneratingStub, hideGeneratingStub } = setupUITest()
-
             // Call with showUi: false option
             await service.getAllRecommendations(
                 languageClient,
@@ -267,15 +238,11 @@ describe('RecommendationService', () => {
             )
 
             // Verify UI methods were not called
-            sinon.assert.notCalled(showGeneratingStub)
-            sinon.assert.notCalled(hideGeneratingStub)
             sinon.assert.notCalled(statusBarStub.setLoading)
             sinon.assert.notCalled(statusBarStub.refreshStatusBar)
         })
 
         it('should show UI indicators when showUi option is true (default)', async () => {
-            const { showGeneratingStub, hideGeneratingStub } = setupUITest()
-
             // Call with default options (showUi: true)
             await service.getAllRecommendations(
                 languageClient,
@@ -287,8 +254,6 @@ describe('RecommendationService', () => {
             )
 
             // Verify UI methods were called
-            sinon.assert.calledOnce(showGeneratingStub)
-            sinon.assert.calledOnce(hideGeneratingStub)
             sinon.assert.calledOnce(statusBarStub.setLoading)
             sinon.assert.calledOnce(statusBarStub.refreshStatusBar)
         })
@@ -304,10 +269,6 @@ describe('RecommendationService', () => {
             // Set up UI options
             const options = { showUi: true }
 
-            // Stub the UI methods to avoid errors
-            // const showGeneratingStub = sandbox.stub(activeStateController, 'showGenerating').resolves()
-            const hideGeneratingStub = sandbox.stub(activeStateController, 'hideGenerating')
-
             // Temporarily replace console.error with a no-op function to prevent test failure
             const originalConsoleError = console.error
             console.error = () => {}
@@ -328,7 +289,6 @@ describe('RecommendationService', () => {
                 assert.deepStrictEqual(result, [])
 
                 // Verify the UI indicators were hidden even when an error occurs
-                sinon.assert.calledOnce(hideGeneratingStub)
                 sinon.assert.calledOnce(statusBarStub.refreshStatusBar)
             } finally {
                 // Restore the original console.error function