fix: few fixes to pass GitHub checks

Author: floralph

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

@@ -192,10 +192,20 @@ export class EditDecorationManager {
         this.imageDecorationType.dispose()
         this.removedCodeDecorationType.dispose()
     }
+
+    // Use process-wide singleton to prevent multiple instances on Windows
+    static readonly decorationManagerKey = Symbol.for('aws.amazonq.decorationManager')
+
+    static getDecorationManager(): EditDecorationManager {
+        const globalObj = global as any
+        if (!globalObj[this.decorationManagerKey]) {
+            globalObj[this.decorationManagerKey] = new EditDecorationManager()
+        }
+        return globalObj[this.decorationManagerKey]
+    }
 }
 
-// Create a singleton instance of the decoration manager
-export const decorationManager = new EditDecorationManager()
+export const decorationManager = EditDecorationManager.getDecorationManager()
 
 /**
  * Function to replace editor's content with new code

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

@@ -209,8 +209,16 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         token: CancellationToken,
         getAllRecommendationsOptions?: GetAllRecommendationsOptions
     ): Promise<InlineCompletionItem[]> {
+        getLogger().info('_provideInlineCompletionItems called with: %O', {
+            documentUri: document.uri.toString(),
+            position,
+            context,
+            triggerKind: context.triggerKind === InlineCompletionTriggerKind.Automatic ? 'Automatic' : 'Invoke',
+        })
+
         // prevent concurrent API calls and write to shared state variables
         if (vsCodeState.isRecommendationsActive) {
+            getLogger().info('Recommendations already active, returning empty')
             return []
         }
         let logstr = `GenerateCompletion metadata:\\n`

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

@@ -15,7 +15,7 @@ import { InlineGeneratingMessage } from './inlineGeneratingMessage'
 import { CodeWhispererStatusBarManager } from 'aws-core-vscode/codewhisperer'
 import { TelemetryHelper } from './telemetryHelper'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
-import { globals } from 'aws-core-vscode/shared'
+import { globals, getLogger } from 'aws-core-vscode/shared'
 
 export interface GetAllRecommendationsOptions {
     emitTelemetry?: boolean
@@ -70,11 +70,31 @@ export class RecommendationService {
             }
 
             // Handle first request
+            getLogger().info('Sending inline completion request: %O', {
+                method: inlineCompletionWithReferencesRequestType.method,
+                request: {
+                    textDocument: request.textDocument,
+                    position: request.position,
+                    context: request.context,
+                },
+            })
             let result: InlineCompletionListWithReferences = await languageClient.sendRequest(
                 inlineCompletionWithReferencesRequestType.method,
                 request,
                 token
             )
+            getLogger().info('Received inline completion response: %O', {
+                sessionId: result.sessionId,
+                itemCount: result.items?.length || 0,
+                items: result.items?.map((item) => ({
+                    itemId: item.itemId,
+                    insertText:
+                        (typeof item.insertText === 'string' ? item.insertText : String(item.insertText))?.substring(
+                            0,
+                            50
+                        ) + '...',
+                })),
+            })
 
             TelemetryHelper.instance.setSdkApiCallEndTime()
             TelemetryHelper.instance.setSessionId(result.sessionId)
@@ -112,7 +132,7 @@ export class RecommendationService {
             TelemetryHelper.instance.setAllPaginationEndTime()
             options.emitTelemetry && TelemetryHelper.instance.tryRecordClientComponentLatency()
         } catch (error) {
-            console.error('Error getting recommendations:', error)
+            getLogger().error('Error getting recommendations: %O', error)
             return []
         } finally {
             // Remove all UI indicators if UI is enabled

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

@@ -211,7 +211,8 @@ describe('RecommendationService', () => {
             sinon.assert.calledOnce(cursorUpdateManager.recordCompletionRequest as sinon.SinonStub)
         })
 
-        it('should not show UI indicators when showUi option is false', async () => {
+        // Helper function to setup UI test
+        function setupUITest() {
             const mockFirstResult = {
                 sessionId: 'test-session',
                 items: [mockInlineCompletionItemOne],
@@ -224,6 +225,12 @@ describe('RecommendationService', () => {
             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, mockDocument, mockPosition, mockContext, mockToken, {
                 showUi: false,
@@ -238,17 +245,7 @@ describe('RecommendationService', () => {
         })
 
         it('should show UI indicators when showUi option is true (default)', async () => {
-            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')
+            const { showGeneratingStub, hideGeneratingStub } = setupUITest()
 
             // Call with default options (showUi: true)
             await service.getAllRecommendations(languageClient, mockDocument, mockPosition, mockContext, mockToken)

packages/amazonq/test/unit/app/inline/EditRendering/displayImage.test.ts

@@ -93,7 +93,8 @@ describe('EditDecorationManager', function () {
         assert.strictEqual(removedCodeCall.args[0], manager['removedCodeDecorationType'])
     })
 
-    it('should trigger accept handler when command is executed', function () {
+    // Helper function to setup edit suggestion test
+    function setupEditSuggestionTest() {
         // Create a fake SVG image URI
         const svgUri = vscode.Uri.parse('file:///path/to/image.svg')
 
@@ -113,6 +114,12 @@ describe('EditDecorationManager', function () {
             [{ line: 0, start: 0, end: 0 }]
         )
 
+        return { acceptHandler, rejectHandler }
+    }
+
+    it('should trigger accept handler when command is executed', function () {
+        const { acceptHandler, rejectHandler } = setupEditSuggestionTest()
+
         // Find the command handler that was registered for accept
         const acceptCommandArgs = commandsStub.registerCommand.args.find(
             (args) => args[0] === 'aws.amazonq.inline.acceptEdit'
@@ -132,24 +139,7 @@ describe('EditDecorationManager', function () {
     })
 
     it('should trigger reject handler when command is executed', function () {
-        // Create a fake SVG image URI
-        const svgUri = vscode.Uri.parse('file:///path/to/image.svg')
-
-        // Create accept and reject handlers
-        const acceptHandler = sandbox.stub()
-        const rejectHandler = sandbox.stub()
-
-        // Display the edit suggestion
-        manager.displayEditSuggestion(
-            editorStub as unknown as vscode.TextEditor,
-            svgUri,
-            0,
-            acceptHandler,
-            rejectHandler,
-            'Original code',
-            'New code',
-            [{ line: 0, start: 0, end: 0 }]
-        )
+        const { acceptHandler, rejectHandler } = setupEditSuggestionTest()
 
         // Find the command handler that was registered for reject
         const rejectCommandArgs = commandsStub.registerCommand.args.find(

packages/amazonq/test/unit/app/inline/cursorUpdateManager.test.ts

@@ -129,7 +129,8 @@ describe('CursorUpdateManager', () => {
         assert.ok(stopSpy.called)
     })
 
-    it('should send cursor update requests at intervals', () => {
+    // Helper function to setup cursor update test
+    function setupCursorUpdateTest() {
         // Setup test data
         const position = new vscode.Position(1, 2)
         const uri = 'file:///test.ts'
@@ -156,8 +157,14 @@ describe('CursorUpdateManager', () => {
             provideInlineCompletionItems: provideStub,
         }
 
+        return { provideStub, position, uri }
+    }
+
+    it('should send cursor update requests at intervals', () => {
+        const { provideStub } = setupCursorUpdateTest()
+
         // Start the manager - we're not awaiting this since we're just setting up the test
-        cursorUpdateManager.start()
+        void cursorUpdateManager.start()
 
         // Reset the sendRequestStub to clear the call from start()
         sendRequestStub.resetHistory()
@@ -173,18 +180,7 @@ describe('CursorUpdateManager', () => {
     })
 
     it('should not send cursor update if a regular request was made recently', async () => {
-        // Setup test data
-        const position = new vscode.Position(1, 2)
-        const uri = 'file:///test.ts'
-        cursorUpdateManager.updatePosition(position, uri)
-
-        // Mock the active editor
-        const mockEditor = {
-            document: {
-                uri: { toString: () => uri },
-            },
-        }
-        sinon.stub(vscode.window, 'activeTextEditor').get(() => mockEditor as any)
+        setupCursorUpdateTest()
 
         // Start the manager
         await cursorUpdateManager.start()
@@ -206,32 +202,8 @@ describe('CursorUpdateManager', () => {
         assert.strictEqual(sendRequestStub.called, false)
     })
 
-    it.only('should not send cursor update if position has not changed since last update', async () => {
-        // Setup test data
-        const position = new vscode.Position(1, 2)
-        const uri = 'file:///test.ts'
-        cursorUpdateManager.updatePosition(position, uri)
-
-        // Mock the active editor
-        const mockEditor = {
-            document: {
-                uri: { toString: () => uri },
-            },
-        }
-        sinon.stub(vscode.window, 'activeTextEditor').get(() => mockEditor as any)
-
-        // Create a mock cancellation token source
-        const mockCancellationTokenSource = {
-            token: {} as vscode.CancellationToken,
-            dispose: sinon.stub(),
-        }
-        sinon.stub(cursorUpdateManager as any, 'createCancellationTokenSource').returns(mockCancellationTokenSource)
-
-        // Mock the provideInlineCompletionItems method
-        const provideStub = sinon.stub().resolves([])
-        ;(cursorUpdateManager as any).inlineCompletionProvider = {
-            provideInlineCompletionItems: provideStub,
-        }
+    it('should not send cursor update if position has not changed since last update', async () => {
+        const { provideStub } = setupCursorUpdateTest()
 
         // Start the manager
         await cursorUpdateManager.start()
@@ -256,7 +228,7 @@ describe('CursorUpdateManager', () => {
 
         // Now change the position
         const newPosition = new vscode.Position(1, 3)
-        cursorUpdateManager.updatePosition(newPosition, uri)
+        cursorUpdateManager.updatePosition(newPosition, 'file:///test.ts')
 
         // Third call to sendCursorUpdate with changed position - should send update
         await (cursorUpdateManager as any).sendCursorUpdate()

packages/core/src/testLint/gitSecrets.test.ts

@@ -115,6 +115,7 @@ ${mySecretAccessKey}
     })
 
     it('ensures no git secrets are found', function () {
+        this.timeout(10000)
         const result = runCmd([gitSecrets, '--scan'], { cwd: toolkitProjectDir })
         assert.strictEqual(result.status, 0, `Failure output: ${result.stderr.toString()}`)
     })