fix(codewhisperer): remove hover config hack #3016

Problem:
CodeWhisperer (temporarily) disables the hover in user config to disable the
vscode-driven inline-suggestions popup while CodeWhisperer is presenting
suggestions.
Reason for this:
- The vscode-driven popup only shows when user hovers the mouse over the
  suggestion.
- GitHub CoPilot shows confusing messaging in the popup.

However, AWS Toolkit sometimes fails to restore the hover setting:
microsoft/vscode#165988

Solution:
To fix the immediate problem, remove the logic that temporarily disables the
hover setting.

Author: leigaol

src/codewhisperer/activation.ts

@@ -45,7 +45,6 @@ import { RecommendationHandler } from './service/recommendationHandler'
 import { Commands } from '../shared/vscode/commands2'
 import { InlineCompletionService, refreshStatusBar } from './service/inlineCompletionService'
 import { isInlineCompletionEnabled } from './util/commonUtil'
-import { HoverConfigUtil } from './util/hoverConfigUtil'
 import { CodeWhispererCodeCoverageTracker } from './tracker/codewhispererCodeCoverageTracker'
 import { AuthUtil, isUpgradeableConnection } from './util/authUtil'
 import globals from '../shared/extensionGlobals'
@@ -56,11 +55,6 @@ import { showViewLogsMessage } from '../shared/utilities/messages'
 const performance = globalThis.performance ?? require('perf_hooks').performance
 
 export async function activate(context: ExtContext): Promise<void> {
-    // No need to await. This can be removed once the 'hover.enabled' hack is no longer needed.
-    HoverConfigUtil.instance.restoreHoverConfig().catch(err => {
-        getLogger().warn('codewhisperer: failed to restore "editor.hover.enabled" setting: %s', err)
-    })
-
     const codewhispererSettings = CodeWhispererSettings.instance
     // initialize AuthUtil earlier to make sure it can listen to connection change events.
     const auth = AuthUtil.instance
@@ -70,7 +64,6 @@ export async function activate(context: ExtContext): Promise<void> {
     if (isCloud9()) {
         await enableDefaultConfigCloud9()
     }
-
     /**
      * CodeWhisperer security panel
      */
@@ -631,7 +624,6 @@ export async function shutdown() {
     }
     if (isInlineCompletionEnabled()) {
         await InlineCompletionService.instance.clearInlineCompletionStates(vscode.window.activeTextEditor)
-        await HoverConfigUtil.instance.restoreHoverConfig()
     } else {
         if (vscode.window.activeTextEditor) {
             await InlineCompletion.instance.resetInlineStates(vscode.window.activeTextEditor)

src/codewhisperer/service/inlineCompletionService.ts

@@ -18,7 +18,6 @@ import { getLogger } from '../../shared/logger/logger'
 import { TelemetryHelper } from '../util/telemetryHelper'
 import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
 import { Commands } from '../../shared/vscode/commands2'
-import { HoverConfigUtil } from '../util/hoverConfigUtil'
 import { getPrefixSuffixOverlap } from '../util/commonUtil'
 import globals from '../../shared/extensionGlobals'
 import { AuthUtil } from '../util/authUtil'
@@ -153,6 +152,10 @@ class CodeWhispererInlineCompletionItemProvider implements vscode.InlineCompleti
         const start = RecommendationHandler.instance.startPos
         const end = position
         const iteratingIndexes = this.getIteratingIndexes()
+        const prefix = document.getText(new vscode.Range(start, end)).replace(/\r\n/g, '\n')
+        const matchedCount = RecommendationHandler.instance.recommendations.filter(
+            r => r.content.length > 0 && r.content.startsWith(prefix)
+        ).length
         for (const i of iteratingIndexes) {
             const r = RecommendationHandler.instance.recommendations[i]
             const item = this.getInlineCompletionItem(document, r, start, end, i)
@@ -168,6 +171,9 @@ class CodeWhispererInlineCompletionItemProvider implements vscode.InlineCompleti
             )
             this.nextMove = 0
             this._onDidShow.fire()
+            if (matchedCount >= 2 || RecommendationHandler.instance.hasNextToken()) {
+                return [item, { insertText: 'x' }]
+            }
             return [item]
         }
         ReferenceInlineProvider.instance.removeInlineReference()
@@ -284,7 +290,6 @@ export class InlineCompletionService {
             this.disposeCommandOverrides()
         } finally {
             this.clearRejectionTimer()
-            await HoverConfigUtil.instance.restoreHoverConfig()
         }
     }
 
@@ -362,6 +367,9 @@ export class InlineCompletionService {
     }
 
     async showRecommendation(indexShift: number, isFirstRecommendation: boolean = false) {
+        if (vscode.window.activeTextEditor) {
+            vscode.window.showTextDocument(vscode.window.activeTextEditor.document)
+        }
         this.inlineCompletionProvider = new CodeWhispererInlineCompletionItemProvider(
             this.inlineCompletionProvider?.getActiveItemIndex,
             indexShift
@@ -427,7 +435,6 @@ export class InlineCompletionService {
         if (this._timer !== undefined) {
             return
         }
-        await HoverConfigUtil.instance.overwriteHoverConfig()
         this._timer = globals.clock.setInterval(async () => {
             if (!this.isSuggestionVisible()) {
                 getLogger().verbose(`Clearing cached suggestion`)