refactor(codewhisperer): Simplify pagination (#2904)

Author: leigaol

src/codewhisperer/service/inlineCompletionService.ts

@@ -174,11 +174,15 @@ export class InlineCompletionService {
     private hide: vscode.Disposable
     private next: vscode.Disposable
     private prev: vscode.Disposable
+    private _isPaginationRunning = false
 
     constructor() {
         this.prev = prevCommand.register(this)
         this.next = nextCommand.register(this)
         this.hide = hideCommand.register(this)
+        RecommendationHandler.instance.onDidReceiveRecommendation(e => {
+            this.tryShowRecommendation()
+        })
     }
 
     static #instance: InlineCompletionService
@@ -196,7 +200,7 @@ export class InlineCompletionService {
         this.hide = hideCommand.register(this)
     }
 
-    subscribeCommands() {
+    subscribeSuggestionCommands() {
         this.disposeCommandOverrides()
         this.registerCommandOverrides()
         globals.context.subscriptions.push(this.prev)
@@ -244,18 +248,38 @@ export class InlineCompletionService {
         this.clearRejectionTimer()
     }
 
+    async tryShowRecommendation() {
+        const editor = vscode.window.activeTextEditor
+        if (this.isSuggestionVisible() || editor === undefined) return
+        if (
+            editor.selection.active.isBefore(RecommendationHandler.instance.startPos) ||
+            editor.document.uri.fsPath !== this.documentUri?.fsPath
+        ) {
+            RecommendationHandler.instance.cancelPaginatedRequest()
+            RecommendationHandler.instance.recommendations.forEach((r, i) => {
+                RecommendationHandler.instance.setSuggestionState(i, 'Discard')
+            })
+            RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
+            RecommendationHandler.instance.clearRecommendations()
+        } else if (RecommendationHandler.instance.recommendations.length > 0) {
+            RecommendationHandler.instance.moveStartPositionToSkipSpaces(editor)
+            await HoverConfigUtil.instance.overwriteHoverConfig()
+            this.subscribeSuggestionCommands()
+            this.startRejectionTimer(editor)
+            await this.showRecommendation(0, true)
+        }
+    }
+
     async getPaginatedRecommendation(
         client: DefaultCodeWhispererClient,
         editor: vscode.TextEditor,
         triggerType: CodewhispererTriggerType,
         config: ConfigurationEntry,
         autoTriggerType?: CodewhispererAutomatedTriggerType
     ) {
-        if (vsCodeState.isCodeWhispererEditing || this.isPaginationRunning()) return
+        if (vsCodeState.isCodeWhispererEditing || this._isPaginationRunning) return
         await this.clearInlineCompletionStates(editor)
         this.setCodeWhispererStatusBarLoading()
-        await HoverConfigUtil.instance.overwriteHoverConfig()
-        this.subscribeCommands()
         RecommendationHandler.instance.checkAndResetCancellationTokens()
         this.documentUri = editor.document.uri
         try {
@@ -270,32 +294,12 @@ export class InlineCompletionService {
                     true,
                     page
                 )
-
                 if (RecommendationHandler.instance.checkAndResetCancellationTokens()) {
                     RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
                     RecommendationHandler.instance.clearRecommendations()
                     this.setCodeWhispererStatusBarOk()
                     return
                 }
-
-                if (!this.isSuggestionVisible()) {
-                    if (
-                        editor.selection.active.isBefore(RecommendationHandler.instance.startPos) ||
-                        editor.document.uri.fsPath !== this.documentUri?.fsPath
-                    ) {
-                        RecommendationHandler.instance.cancelPaginatedRequest()
-                        RecommendationHandler.instance.recommendations.forEach((r, i) => {
-                            RecommendationHandler.instance.setSuggestionState(i, 'Discard')
-                        })
-                        RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
-                        RecommendationHandler.instance.clearRecommendations()
-                    } else if (RecommendationHandler.instance.recommendations.length > 0) {
-                        RecommendationHandler.instance.moveStartPositionToSkipSpaces(editor)
-                        this.startRejectionTimer(editor)
-                        await this.showRecommendation(0, true)
-                    }
-                }
-
                 if (!RecommendationHandler.instance.hasNextToken()) break
                 page++
             }
@@ -310,9 +314,6 @@ export class InlineCompletionService {
                 showTimedMessage(CodeWhispererConstants.noSuggestions, 2000)
             }
         }
-        if (RecommendationHandler.instance.recommendations.length === 0) {
-            await HoverConfigUtil.instance.restoreHoverConfig()
-        }
     }
 
     async showRecommendation(indexShift: number, isFirstRecommendation: boolean = false) {
@@ -349,11 +350,13 @@ export class InlineCompletionService {
     }
 
     setCodeWhispererStatusBarLoading() {
+        this._isPaginationRunning = true
         this.statusBar.text = ` $(loading~spin)CodeWhisperer`
         this.statusBar.show()
     }
 
     setCodeWhispererStatusBarOk() {
+        this._isPaginationRunning = false
         this.statusBar.text = ` $(check)CodeWhisperer`
         this.statusBar.show()
     }
@@ -366,10 +369,6 @@ export class InlineCompletionService {
         return this.inlineCompletionProvider?.getActiveItemIndex !== undefined
     }
 
-    isPaginationRunning() {
-        return this.statusBar.text === ` $(loading~spin)CodeWhisperer`
-    }
-
     private clearRejectionTimer() {
         if (this._timer !== undefined) {
             clearTimeout(this._timer)

src/codewhisperer/service/recommendationHandler.ts

@@ -45,6 +45,8 @@ export class RecommendationHandler {
     private cancellationToken: vscode.CancellationTokenSource
     public errorMessagePrompt: string
     public isGenerateRecommendationInProgress: boolean
+    private _onDidReceiveRecommendation: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    public readonly onDidReceiveRecommendation: vscode.Event<void> = this._onDidReceiveRecommendation.event
 
     constructor() {
         this.requestId = ''
@@ -279,6 +281,7 @@ export class RecommendationHandler {
                 }
             })
             this.recommendations = isCloud9() ? recommendation : this.recommendations.concat(recommendation)
+            this._onDidReceiveRecommendation.fire()
         } else {
             TelemetryHelper.instance.recordUserDecisionTelemetryForEmptyList(
                 requestId,