fix(amazonq): isEditSuggestionActive to use boolean flag

Author: floralph

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

@@ -12,7 +12,8 @@ import { LogInlineCompletionSessionResultsParams } from '@aws/language-server-ru
 import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
 import path from 'path'
 import { imageVerticalOffset } from './svgGenerator'
-import { AmazonQInlineCompletionItemProvider } from '../completion'
+import { EditSuggestionState } from '../editSuggestionState'
+import type { AmazonQInlineCompletionItemProvider } from '../completion'
 import { vsCodeState } from 'aws-core-vscode/codewhisperer'
 
 export class EditDecorationManager {
@@ -136,6 +137,7 @@ export class EditDecorationManager {
         await this.clearDecorations(editor)
 
         await setContext('aws.amazonq.editSuggestionActive' as any, true)
+        EditSuggestionState.setEditSuggestionActive(true)
 
         this.acceptHandler = onAccept
         this.rejectHandler = onReject
@@ -166,6 +168,7 @@ export class EditDecorationManager {
         this.acceptHandler = undefined
         this.rejectHandler = undefined
         await setContext('aws.amazonq.editSuggestionActive' as any, false)
+        EditSuggestionState.setEditSuggestionActive(false)
     }
 
     /**

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

@@ -10,7 +10,7 @@ import { getLogger } from 'aws-core-vscode/shared'
 import { LanguageClient } from 'vscode-languageclient'
 import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
 import { CodeWhispererSession } from '../sessionManager'
-import { AmazonQInlineCompletionItemProvider } from '../completion'
+import type { AmazonQInlineCompletionItemProvider } from '../completion'
 
 export async function showEdits(
     item: InlineCompletionItemWithReferences,

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

@@ -41,9 +41,10 @@ import {
 import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 import { TelemetryHelper } from './telemetryHelper'
-import { Experiments, getContext, getLogger, sleep } from 'aws-core-vscode/shared'
+import { Experiments, getLogger, sleep } from 'aws-core-vscode/shared'
 import { messageUtils } from 'aws-core-vscode/utils'
 import { showEdits } from './EditRendering/imageRenderer'
+import { EditSuggestionState } from './editSuggestionState'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
 import { DocumentEventListener } from './documentEventListener'
 
@@ -291,7 +292,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
      * Check if an edit suggestion is currently active
      */
     private isEditSuggestionActive(): boolean {
-        return getContext('aws.amazonq.editSuggestionActive') || false
+        return EditSuggestionState.isEditSuggestionActive()
     }
 
     // this method is automatically invoked by VS Code as user types

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

@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Manages the state of edit suggestions to avoid circular dependencies
+ */
+export class EditSuggestionState {
+    private static isEditSuggestionCurrentlyActive = false
+
+    static setEditSuggestionActive(active: boolean): void {
+        this.isEditSuggestionCurrentlyActive = active
+    }
+
+    static isEditSuggestionActive(): boolean {
+        return this.isEditSuggestionCurrentlyActive
+    }
+}

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

@@ -17,6 +17,7 @@ import assert from 'assert'
 import { LanguageClient } from 'vscode-languageclient'
 import { StringValue } from 'vscode-languageserver-types'
 import { AmazonQInlineCompletionItemProvider, InlineCompletionManager } from '../../../../../src/app/inline/completion'
+import { EditSuggestionState } from '../../../../../src/app/inline/editSuggestionState'
 import { RecommendationService } from '../../../../../src/app/inline/recommendationService'
 import { SessionManager } from '../../../../../src/app/inline/sessionManager'
 import { createMockDocument, createMockTextEditor, getTestWindow, installFakeClock } from 'aws-core-vscode/test'
@@ -429,8 +430,8 @@ describe('InlineCompletionManager', () => {
                     documentEventListener
                 )
 
-                // Stub the private method to return true (following existing pattern)
-                sandbox.stub(provider as any, 'isEditSuggestionActive').returns(true)
+                // Set edit suggestion active to trigger discard behavior
+                EditSuggestionState.setEditSuggestionActive(true)
 
                 const result = await provider.provideInlineCompletionItems(
                     mockDocument,
@@ -463,7 +464,7 @@ describe('InlineCompletionManager', () => {
                     documentEventListener
                 )
 
-                sandbox.stub(provider as any, 'isEditSuggestionActive').returns(true)
+                EditSuggestionState.setEditSuggestionActive(true)
 
                 // Mix of inline edits and completions
                 const mixedSuggestions = [
@@ -498,7 +499,7 @@ describe('InlineCompletionManager', () => {
                     documentEventListener
                 )
 
-                sandbox.stub(provider as any, 'isEditSuggestionActive').returns(true)
+                EditSuggestionState.setEditSuggestionActive(true)
 
                 // Set up suggestions where some don't have itemId
                 const suggestionsWithoutId = [
@@ -533,10 +534,28 @@ describe('InlineCompletionManager', () => {
                         documentEventListener
                     )
 
-                    // Since getContext returns undefined by default, this should return false
+                    // Set the static property to false
+                    EditSuggestionState.setEditSuggestionActive(false)
+
                     const result = (provider as any).isEditSuggestionActive()
                     assert.strictEqual(result, false)
                 })
+
+                it('should return true when edit suggestion is active', () => {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        documentEventListener
+                    )
+
+                    // Set the static property to true
+                    EditSuggestionState.setEditSuggestionActive(true)
+
+                    const result = (provider as any).isEditSuggestionActive()
+                    assert.strictEqual(result, true)
+                })
             })
         })
     })

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

@@ -102,7 +102,7 @@ describe('AmazonQInlineCompletionItemProvider', function () {
         it('should not send notification when no valid items', function () {
             const items = [
                 { itemId: 'item1', isInlineEdit: true }, // Filtered out
-                { itemId: null, isInlineEdit: false }, // No itemId
+                { itemId: undefined, isInlineEdit: false }, // No itemId
             ]
 
             const session = {