refactor(codewhisperer): onAccept command (#2901)

leigaol · web-flow · commit a84a7c184ff1 · 2022-09-21T16:15:54.000-07:00
diff --git a/src/codewhisperer/activation.ts b/src/codewhisperer/activation.ts
@@ -12,8 +12,7 @@ import { getCompletionItems } from './service/completionProvider'
 import { vsCodeState, ConfigurationEntry } from './models/model'
 import { InlineCompletion } from './service/inlineCompletion'
 import { invokeRecommendation } from './commands/invokeRecommendation'
-import { onAcceptance } from './commands/onAcceptance'
-import { onInlineAcceptance } from './commands/onInlineAcceptance'
+import { acceptSuggestion } from './commands/onInlineAcceptance'
 import { resetIntelliSenseState } from './util/globalStateUtil'
 import { CodeWhispererSettings } from './util/codewhispererSettings'
 import { ExtContext } from '../shared/extensions'
@@ -48,11 +47,6 @@ import { InlineCompletionService } from './service/inlineCompletionService'
 import { isInlineCompletionEnabled } from './util/commonUtil'
 import { HoverConfigUtil } from './util/hoverConfigUtil'
 import { CodeWhispererCodeCoverageTracker } from './tracker/codewhispererCodeCoverageTracker'
-import {
-    CodewhispererCompletionType,
-    CodewhispererLanguage,
-    CodewhispererTriggerType,
-} from '../shared/telemetry/telemetry'
 
 const performance = globalThis.performance ?? require('perf_hooks').performance
 
@@ -85,12 +79,6 @@ export async function activate(context: ExtContext): Promise<void> {
      */
     const client = new codewhispererClient.DefaultCodeWhispererClient()
 
-    const referenceHoverProvider = new ReferenceHoverProvider()
-    const referenceLogViewProvider = new ReferenceLogViewProvider(
-        context.extensionContext.extensionUri,
-        codewhispererSettings
-    )
-
     context.extensionContext.subscriptions.push(
         /**
          * Configuration change
@@ -111,7 +99,7 @@ export async function activate(context: ExtContext): Promise<void> {
                 vscode.commands.executeCommand('aws.codeWhisperer.refresh')
             }
             if (configurationChangeEvent.affectsConfiguration('aws.codeWhisperer')) {
-                referenceLogViewProvider.update()
+                ReferenceLogViewProvider.instance.update()
             }
             if (configurationChangeEvent.affectsConfiguration('editor.inlineSuggest.enabled')) {
                 await vscode.window
@@ -183,51 +171,18 @@ export async function activate(context: ExtContext): Promise<void> {
         /**
          * On recommendation acceptance
          */
-        Commands.register(
-            'aws.codeWhisperer.accept',
-            async (
-                range: vscode.Range,
-                acceptIndex: number,
-                recommendation: string,
-                requestId: string,
-                sessionId: string,
-                triggerType: CodewhispererTriggerType,
-                completionType: CodewhispererCompletionType,
-                language: CodewhispererLanguage,
-                references: codewhispererClient.References
-            ) => {
-                const editor = vscode.window.activeTextEditor
-                const onAcceptanceFunc = isInlineCompletionEnabled() ? onInlineAcceptance : onAcceptance
-                await onAcceptanceFunc(
-                    {
-                        editor,
-                        range,
-                        acceptIndex,
-                        recommendation,
-                        requestId,
-                        sessionId,
-                        triggerType,
-                        completionType,
-                        language,
-                        references,
-                    },
-                    context.extensionContext.globalState
-                )
-                if (references != undefined && editor != undefined) {
-                    const referenceLog = ReferenceLogViewProvider.getReferenceLog(recommendation, references, editor)
-                    referenceLogViewProvider.addReferenceLog(referenceLog)
-                    referenceHoverProvider.addCodeReferences(recommendation, references)
-                }
-            }
-        ),
+        acceptSuggestion.register(context),
         // on text document close.
         vscode.workspace.onDidCloseTextDocument(e => {
             RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(vscode.window.activeTextEditor, -1)
             RecommendationHandler.instance.clearRecommendations()
         }),
 
-        vscode.languages.registerHoverProvider([...CodeWhispererConstants.supportedLanguages], referenceHoverProvider),
-        vscode.window.registerWebviewViewProvider(ReferenceLogViewProvider.viewType, referenceLogViewProvider),
+        vscode.languages.registerHoverProvider(
+            [...CodeWhispererConstants.supportedLanguages],
+            ReferenceHoverProvider.instance
+        ),
+        vscode.window.registerWebviewViewProvider(ReferenceLogViewProvider.viewType, ReferenceLogViewProvider.instance),
         showReferenceLog.register(context),
         vscode.languages.registerCodeLensProvider(
             [...CodeWhispererConstants.supportedLanguages],
diff --git a/src/codewhisperer/commands/onAcceptance.ts b/src/codewhisperer/commands/onAcceptance.ts
@@ -16,6 +16,8 @@ import { isCloud9 } from '../../shared/extensionUtilities'
 import { handleExtraBrackets } from '../util/closingBracketUtil'
 import { RecommendationHandler } from '../service/recommendationHandler'
 import { InlineCompletion } from '../service/inlineCompletion'
+import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
+import { ReferenceHoverProvider } from '../service/referenceHoverProvider'
 
 /**
  * This function is called when user accepts a intelliSense suggestion or an inline suggestion
@@ -100,6 +102,18 @@ export async function onAcceptance(acceptanceEntry: OnRecommendationAcceptanceEn
             acceptanceEntry.editor.document.getText(codeRangeAfterFormat),
             acceptanceEntry.editor.document.fileName
         )
+        if (acceptanceEntry.references !== undefined) {
+            const referenceLog = ReferenceLogViewProvider.getReferenceLog(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references,
+                acceptanceEntry.editor
+            )
+            ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
+            ReferenceHoverProvider.instance.addCodeReferences(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references
+            )
+        }
     }
 
     // at the end of recommendation acceptance, clear recommendations.
diff --git a/src/codewhisperer/commands/onInlineAcceptance.ts b/src/codewhisperer/commands/onInlineAcceptance.ts
@@ -16,7 +16,52 @@ import { RecommendationHandler } from '../service/recommendationHandler'
 import { InlineCompletionService } from '../service/inlineCompletionService'
 import { sleep } from '../../shared/utilities/timeoutUtils'
 import { handleExtraBrackets } from '../util/closingBracketUtil'
+import { Commands } from '../../shared/vscode/commands2'
+import { isInlineCompletionEnabled } from '../util/commonUtil'
+import { ExtContext } from '../../shared/extensions'
+import { onAcceptance } from './onAcceptance'
+import * as codewhispererClient from '../client/codewhisperer'
+import {
+    CodewhispererCompletionType,
+    CodewhispererLanguage,
+    CodewhispererTriggerType,
+} from '../../shared/telemetry/telemetry.gen'
+import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
+import { ReferenceHoverProvider } from '../service/referenceHoverProvider'
 
+export const acceptSuggestion = Commands.declare(
+    'aws.codeWhisperer.accept',
+    (context: ExtContext) =>
+        async (
+            range: vscode.Range,
+            acceptIndex: number,
+            recommendation: string,
+            requestId: string,
+            sessionId: string,
+            triggerType: CodewhispererTriggerType,
+            completionType: CodewhispererCompletionType,
+            language: CodewhispererLanguage,
+            references: codewhispererClient.References
+        ) => {
+            const editor = vscode.window.activeTextEditor
+            const onAcceptanceFunc = isInlineCompletionEnabled() ? onInlineAcceptance : onAcceptance
+            await onAcceptanceFunc(
+                {
+                    editor,
+                    range,
+                    acceptIndex,
+                    recommendation,
+                    requestId,
+                    sessionId,
+                    triggerType,
+                    completionType,
+                    language,
+                    references,
+                },
+                context.extensionContext.globalState
+            )
+        }
+)
 /**
  * This function is called when user accepts a intelliSense suggestion or an inline suggestion
  */
@@ -91,6 +136,18 @@ export async function onInlineAcceptance(
             acceptanceEntry.editor.document.getText(codeRangeAfterFormat),
             acceptanceEntry.editor.document.fileName
         )
+        if (acceptanceEntry.references !== undefined) {
+            const referenceLog = ReferenceLogViewProvider.getReferenceLog(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references,
+                acceptanceEntry.editor
+            )
+            ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
+            ReferenceHoverProvider.instance.addCodeReferences(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references
+            )
+        }
     }
 
     // at the end of recommendation acceptance, clear recommendations.
diff --git a/src/codewhisperer/service/referenceHoverProvider.ts b/src/codewhisperer/service/referenceHoverProvider.ts
@@ -15,7 +15,11 @@ interface CodeReference {
 
 export class ReferenceHoverProvider implements vscode.HoverProvider {
     private _codeReferenceCache: CodeReference[] = []
+    static #instance: ReferenceHoverProvider
 
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
     public provideHover(
         document: vscode.TextDocument,
         position: vscode.Position,
diff --git a/src/codewhisperer/service/referenceLogViewProvider.ts b/src/codewhisperer/service/referenceLogViewProvider.ts
@@ -8,16 +8,20 @@ import { References } from '../client/codewhisperer'
 import { LicenseUtil } from '../util/licenseUtil'
 import * as CodeWhispererConstants from '../models/constants'
 import { CodeWhispererSettings } from '../util/codewhispererSettings'
+import globals from '../../shared/extensionGlobals'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import { TelemetryHelper } from '../util/telemetryHelper'
 
 export class ReferenceLogViewProvider implements vscode.WebviewViewProvider {
     public static readonly viewType = 'aws.codeWhisperer.referenceLog'
     private _view?: vscode.WebviewView
     private _referenceLogs: string[] = []
-    private _settings: CodeWhispererSettings
-    constructor(private readonly _extensionUri: vscode.Uri, settings: CodeWhispererSettings) {
-        this._settings = settings
+    private _extensionUri: vscode.Uri = globals.context.extensionUri
+    constructor() {}
+    static #instance: ReferenceLogViewProvider
+
+    public static get instance() {
+        return (this.#instance ??= new this())
     }
 
     public resolveWebviewView(
@@ -34,7 +38,7 @@ export class ReferenceLogViewProvider implements vscode.WebviewViewProvider {
         }
         this._view.webview.html = this.getHtml(
             webviewView.webview,
-            this._settings.isIncludeSuggestionsWithCodeReferencesEnabled()
+            CodeWhispererSettings.instance.isIncludeSuggestionsWithCodeReferencesEnabled()
         )
         this._view.webview.onDidReceiveMessage(data => {
             vscode.commands.executeCommand('aws.codeWhisperer.configure', 'codewhisperer')
@@ -43,7 +47,7 @@ export class ReferenceLogViewProvider implements vscode.WebviewViewProvider {
 
     public async update() {
         if (this._view) {
-            const showPrompt = this._settings.isIncludeSuggestionsWithCodeReferencesEnabled()
+            const showPrompt = CodeWhispererSettings.instance.isIncludeSuggestionsWithCodeReferencesEnabled()
             this._view.webview.html = this.getHtml(this._view.webview, showPrompt)
         }
     }
