fix(codewhisperer): more inline suggestion "hover config" updates (#2914)

Author: JadenSimon

src/codewhisperer/commands/onInlineAcceptance.ts

@@ -59,7 +59,12 @@ export const acceptSuggestion = Commands.declare(
                     references,
                 },
                 context.extensionContext.globalState
-            )
+            ).finally(async () => {
+                if (isInlineCompletionEnabled()) {
+                    // at the end of recommendation acceptance, clear recommendations.
+                    await InlineCompletionService.instance.clearInlineCompletionStates(editor)
+                }
+            })
         }
 )
 /**
@@ -149,7 +154,4 @@ export async function onInlineAcceptance(
             )
         }
     }
-
-    // at the end of recommendation acceptance, clear recommendations.
-    await InlineCompletionService.instance.clearInlineCompletionStates(acceptanceEntry.editor)
 }

src/codewhisperer/service/inlineCompletionService.ts

@@ -240,16 +240,19 @@ export class InlineCompletionService {
     }
 
     async clearInlineCompletionStates(editor: vscode.TextEditor | undefined) {
-        await HoverConfigUtil.instance.restoreHoverConfig()
-        vsCodeState.isCodeWhispererEditing = false
-        ReferenceInlineProvider.instance.removeInlineReference()
-        RecommendationHandler.instance.cancelPaginatedRequest()
-        RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
-        RecommendationHandler.instance.clearRecommendations()
-        this.disposeInlineCompletion()
-        this.setCodeWhispererStatusBarOk()
-        this.disposeCommandOverrides()
-        this.clearRejectionTimer()
+        try {
+            vsCodeState.isCodeWhispererEditing = false
+            ReferenceInlineProvider.instance.removeInlineReference()
+            RecommendationHandler.instance.cancelPaginatedRequest()
+            RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
+            RecommendationHandler.instance.clearRecommendations()
+            this.disposeInlineCompletion()
+            this.setCodeWhispererStatusBarOk()
+            this.disposeCommandOverrides()
+        } finally {
+            this.clearRejectionTimer()
+            await HoverConfigUtil.instance.restoreHoverConfig()
+        }
     }
 
     async tryShowRecommendation() {
@@ -267,9 +270,8 @@ export class InlineCompletionService {
             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.startRejectionTimer(editor)
             await this.showRecommendation(0, true)
         }
     }
@@ -325,9 +327,6 @@ export class InlineCompletionService {
             this.inlineCompletionProvider?.getActiveItemIndex,
             indexShift
         )
-        this.inlineCompletionProvider.onDidShow(e => {
-            this._timer?.refresh()
-        })
         this.inlineCompletionProviderDisposable?.dispose()
         // when suggestion is active, registering a new provider will let VS Code invoke inline API automatically
         this.inlineCompletionProviderDisposable = vscode.languages.registerInlineCompletionItemProvider(
@@ -375,24 +374,25 @@ export class InlineCompletionService {
 
     private clearRejectionTimer() {
         if (this._timer !== undefined) {
-            clearTimeout(this._timer)
+            clearInterval(this._timer)
             this._timer = undefined
         }
     }
 
     /*
      * This startRejectionTimer function is to mark recommendation as rejected
-     * when the suggestions are no longer been shown to users for more than 10 seconds
+     * when the suggestions are no longer been shown to users for more than 5 seconds
      */
     private async startRejectionTimer(editor: vscode.TextEditor): Promise<void> {
         if (this._timer !== undefined) {
             return
         }
-        this._timer = globals.clock.setTimeout(async () => {
+        await HoverConfigUtil.instance.overwriteHoverConfig()
+        this._timer = globals.clock.setInterval(async () => {
             if (!this.isSuggestionVisible()) {
                 getLogger().info(`Clearing cached suggestion`)
                 await this.clearInlineCompletionStates(editor)
             }
-        }, 10 * 1000)
+        }, 5 * 1000)
     }
 }

src/test/codewhisperer/service/completionProvider.test.ts

@@ -60,8 +60,8 @@ describe('completionProviderService', function () {
                         new vscode.Range(0, 0, 0, 0),
                         1,
                         "\n\t\tconsole.log('Hello world!');\n\t}",
-                        '',
-                        '',
+                        'test',
+                        'test',
                         'OnDemand',
                         'Line',
                         'javascript',