fix: avoid relying on session state

Author: Hweinstock

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

@@ -158,39 +158,6 @@ export class InlineCompletionManager implements Disposable {
             this.languageClient.sendNotification(this.logSessionResultMessageName, params)
         }
         commands.registerCommand('aws.amazonq.rejectCodeSuggestion', onInlineRejection)
-
-        /*
-            We have to overwrite the prev. and next. commands because the inlineCompletionProvider only contained the current item
-            To show prev. and next. recommendation we need to re-register a new provider with the previous or next item
-        */
-
-        const swapProviderAndShow = async () => {
-            await commands.executeCommand('editor.action.inlineSuggest.hide')
-            this.disposable.dispose()
-            this.disposable = languages.registerInlineCompletionItemProvider(
-                CodeWhispererConstants.platformLanguageIds,
-                new AmazonQInlineCompletionItemProvider(
-                    this.languageClient,
-                    this.recommendationService,
-                    this.sessionManager,
-                    this.inlineTutorialAnnotation,
-                    false
-                )
-            )
-            await commands.executeCommand('editor.action.inlineSuggest.trigger')
-        }
-
-        const prevCommandHandler = async () => {
-            this.sessionManager.decrementActiveIndex()
-            await swapProviderAndShow()
-        }
-        commands.registerCommand('editor.action.inlineSuggest.showPrevious', prevCommandHandler)
-
-        const nextCommandHandler = async () => {
-            this.sessionManager.incrementActiveIndex()
-            await swapProviderAndShow()
-        }
-        commands.registerCommand('editor.action.inlineSuggest.showNext', nextCommandHandler)
     }
 }
 
@@ -199,8 +166,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         private readonly languageClient: LanguageClient,
         private readonly recommendationService: RecommendationService,
         private readonly sessionManager: SessionManager,
-        private readonly inlineTutorialAnnotation: InlineTutorialAnnotation,
-        private readonly isNewSession: boolean = true
+        private readonly inlineTutorialAnnotation: InlineTutorialAnnotation
     ) {}
 
     provideInlineCompletionItems = debounce(
@@ -215,29 +181,28 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         context: InlineCompletionContext,
         token: CancellationToken
     ): Promise<InlineCompletionItem[]> {
+        getLogger().debug(`provideInlineCompletionItems: ${context.triggerKind}`)
         try {
             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)
-                TelemetryHelper.instance.setInvokeSuggestionStartTime()
-                TelemetryHelper.instance.setTriggerType(context.triggerKind)
-
-                // make service requests if it's a new session
-                await this.recommendationService.getAllRecommendations(
-                    this.languageClient,
-                    document,
-                    position,
-                    context,
-                    token
-                )
+            getLogger().debug(`provideInlineCompletionItems triggered`)
+            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)
+            TelemetryHelper.instance.setInvokeSuggestionStartTime()
+            TelemetryHelper.instance.setTriggerType(context.triggerKind)
+
+            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()

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

@@ -74,27 +74,10 @@ export class SessionManager {
      */
 
     public getActiveRecommendation(): InlineCompletionItemWithReferences[] {
-        let suggestionCount = this.activeSession?.suggestions.length
-        if (!suggestionCount) {
-            return []
-        }
-        if (suggestionCount === 1 && this.activeSession?.isRequestInProgress) {
-            suggestionCount += 1
-        }
-
-        const activeSuggestion = this.activeSession?.suggestions[this.activeIndex]
-        if (!activeSuggestion) {
+        if (!this.activeSession) {
             return []
         }
-        const items = [activeSuggestion]
-        // to make the total number of suggestions match the actual number
-        for (let i = 1; i < suggestionCount; i++) {
-            items.push({
-                ...activeSuggestion,
-                insertText: `${i}`,
-            })
-        }
-        return items
+        return this.activeSession.suggestions
     }
 
     public get acceptedSuggestionCount(): number {

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

@@ -320,30 +320,12 @@ describe('InlineCompletionManager', () => {
                     assert(getAllRecommendationsStub.calledOnce)
                     assert.deepStrictEqual(items, mockSuggestions)
                 }),
-                it('should not call recommendation service for existing sessions', async () => {
-                    provider = new AmazonQInlineCompletionItemProvider(
-                        languageClient,
-                        recommendationService,
-                        mockSessionManager,
-                        inlineTutorialAnnotation,
-                        false
-                    )
-                    const items = await provider.provideInlineCompletionItems(
-                        mockDocument,
-                        mockPosition,
-                        mockContext,
-                        mockToken
-                    )
-                    assert(getAllRecommendationsStub.notCalled)
-                    assert.deepStrictEqual(items, mockSuggestions)
-                }),
                 it('should handle reference if there is any', async () => {
                     provider = new AmazonQInlineCompletionItemProvider(
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        inlineTutorialAnnotation,
-                        false
+                        inlineTutorialAnnotation
                     )
                     await provider.provideInlineCompletionItems(mockDocument, mockPosition, mockContext, mockToken)
                     assert(setInlineReferenceStub.calledOnce)
@@ -360,8 +342,7 @@ describe('InlineCompletionManager', () => {
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        inlineTutorialAnnotation,
-                        true
+                        inlineTutorialAnnotation
                     )
                     getActiveRecommendationStub.returns([
                         {
@@ -391,8 +372,7 @@ describe('InlineCompletionManager', () => {
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        inlineTutorialAnnotation,
-                        true
+                        inlineTutorialAnnotation
                     )
                     const expectedText = 'this is my text'
                     getActiveRecommendationStub.returns([
@@ -415,8 +395,7 @@ describe('InlineCompletionManager', () => {
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        inlineTutorialAnnotation,
-                        true
+                        inlineTutorialAnnotation
                     )
                     getActiveRecommendationStub.returns([])
                     const messageShown = new Promise((resolve) =>
@@ -449,8 +428,7 @@ describe('InlineCompletionManager', () => {
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        inlineTutorialAnnotation,
-                        false
+                        inlineTutorialAnnotation
                     )
                     const p1 = provider.provideInlineCompletionItems(mockDocument, mockPosition, mockContext, mockToken)
                     const p2 = provider.provideInlineCompletionItems(mockDocument, mockPosition, mockContext, mockToken)