fix

Author: jpinkney-aws

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

@@ -204,54 +204,64 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         context: InlineCompletionContext,
         token: CancellationToken
     ): Promise<InlineCompletionItem[] | InlineCompletionList> {
-        vsCodeState.isRecommendationsActive = true
-        if (this.isNewSession) {
-            const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
-            if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
-                // return early when suggestions are disabled with auto trigger
-                return []
-            }
+        try {
+            // exposed only for testing
+            vsCodeState.isRecommendationsActive = true
+            if (this.isNewSession) {
+                const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
+                if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
+                    // return early when suggestions are disabled with auto trigger
+                    return []
+                }
 
-            // tell the tutorial that completions has been triggered
-            await this.inlineTutorialAnnotation.triggered(context.triggerKind)
+                // tell the tutorial that completions has been triggered
+                await this.inlineTutorialAnnotation.triggered(context.triggerKind)
 
-            // make service requests if it's a new session
-            await this.recommendationService.getAllRecommendations(
-                this.languageClient,
-                document,
-                position,
-                context,
-                token
-            )
-        }
-        // get active item from session for displaying
-        const items = this.sessionManager.getActiveRecommendation()
-        const session = this.sessionManager.getActiveSession()
-        if (!session || !items.length) {
-            return []
-        }
-        const editor = window.activeTextEditor
-        for (const item of items) {
-            item.command = {
-                command: 'aws.amazonq.acceptInline',
-                title: 'On acceptance',
-                arguments: [
-                    session.sessionId,
-                    item,
-                    editor,
-                    session.requestStartTime,
+                // make service requests if it's a new session
+                await this.recommendationService.getAllRecommendations(
+                    this.languageClient,
+                    document,
+                    position,
+                    context,
+                    token
+                )
+            }
+            // get active item from session for displaying
+            const items = this.sessionManager.getActiveRecommendation()
+            const session = this.sessionManager.getActiveSession()
+            if (!session || !items.length) {
+                return []
+            }
+            const editor = window.activeTextEditor
+            for (const item of items) {
+                item.command = {
+                    command: 'aws.amazonq.acceptInline',
+                    title: 'On acceptance',
+                    arguments: [
+                        session.sessionId,
+                        item,
+                        editor,
+                        session.requestStartTime,
+                        position.line,
+                        session.firstCompletionDisplayLatency,
+                    ],
+                }
+                ReferenceInlineProvider.instance.setInlineReference(
                     position.line,
-                    session.firstCompletionDisplayLatency,
-                ],
+                    item.insertText as string,
+                    item.references
+                )
+                ImportAdderProvider.instance.onShowRecommendation(document, position.line, item)
             }
-            ReferenceInlineProvider.instance.setInlineReference(
-                position.line,
-                item.insertText as string,
-                item.references
-            )
-            ImportAdderProvider.instance.onShowRecommendation(document, position.line, item)
+            // exposed only for testing
+            vsCodeState.isRecommendationsActive = false
+
+            return items as InlineCompletionItem[]
+        } catch {
+            return []
+        } finally {
+            // exposed only for testing
+            vsCodeState.isRecommendationsActive = false
         }
-        vsCodeState.isRecommendationsActive = false
-        return items as InlineCompletionItem[]
     }
 }