(feat codewhisperer): inline tutorial (#4539)

* * inline hint implementation
* active state indicator UI implementation
* line tracker implementation
* rebase of PR #4335

* cleanup and fix linter error

* revert accidental added changes

* update logs & send ui_click while tutorial dismissed

* localize state.id

* remove useless type declaration

* use undefined insteadof null

* add more line tracker test

* revert package json

* cleanup line tracker, remove unneeded async

* fix not signed in but still see inlinehint

* fix onDidChangeActiveEditor subscription doesn't pass editor LineTracker.ts

* revert duplicate code

* add back container doc string

* remove prefix _ container.ts

* add doc str

* cleanup

* try revert 1 changes breaking tests

* clean

* fix linter errors

* move statusBarCLicked exit criteria to statusBarMenu.ts

* fix linter errors

* fix end state will not be persisted in some case

* revert unneeded package.json change && call Container.instance insteadof injecting container into vscode declared command

* revert previous changes as circular dependency

* * remove function which is causing circular dependency
* revert deleted package.json

* fix circular dependency and bring back removed logic

* remove testing logic

* * fix linter
* fix unreliable tests
* fix not passing editor in lineTracker

Author: Will-ShaoHua

packages/core/package.json

@@ -3885,6 +3885,12 @@
                 "mac": "escape",
                 "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected || isCloud9 && suggestWidgetVisible && !editorReadonly"
             },
+            {
+                "command": "aws.codeWhisperer.dismissTutorial",
+                "key": "escape",
+                "mac": "escape",
+                "when": "aws.codewhisperer.tutorial.workInProgress && !inlineSuggestionVisible && !suggestWidgetVisible"
+            },
             {
                 "key": "right",
                 "command": "editor.action.inlineSuggest.showNext",

packages/core/src/codewhisperer/activation.ts

@@ -173,6 +173,16 @@ export async function activate(context: ExtContext): Promise<void> {
                 await vscode.commands.executeCommand('workbench.action.openSettings', `aws.codeWhisperer`)
             }
         }),
+        Commands.register('aws.codewhisperer.refreshAnnotation', async (forceProceed: boolean = false) => {
+            const editor = vscode.window.activeTextEditor
+            if (editor) {
+                if (forceProceed) {
+                    await container.lineAnnotationController.refresh(editor, 'codewhisperer', true)
+                } else {
+                    await container.lineAnnotationController.refresh(editor, 'codewhisperer')
+                }
+            }
+        }),
         // show introduction
         showIntroduction.register(),
         // direct CodeWhisperer connection setup with customization

packages/core/src/codewhisperer/commands/onInlineAcceptance.ts

@@ -29,6 +29,7 @@ import { ImportAdderProvider } from '../service/importAdderProvider'
 import { session } from '../util/codeWhispererSession'
 import path from 'path'
 import { RecommendationService } from '../service/recommendationService'
+import { Container } from '../service/serviceContainer'
 
 export const acceptSuggestion = Commands.declare(
     'aws.codeWhisperer.accept',
@@ -47,6 +48,7 @@ export const acceptSuggestion = Commands.declare(
         ) => {
             RecommendationService.instance.incrementAcceptedCount()
             const editor = vscode.window.activeTextEditor
+            await Container.instance.lineAnnotationController.refresh(editor, 'codewhisperer')
             const onAcceptanceFunc = isInlineCompletionEnabled() ? onInlineAcceptance : onAcceptance
             await onAcceptanceFunc(
                 {

packages/core/src/codewhisperer/models/constants.ts

@@ -143,6 +143,12 @@ export const persistedCustomizationsKey = 'CODEWHISPERER_PERSISTED_CUSTOMIZATION
 
 export const selectedCustomizationKey = 'CODEWHISPERER_SELECTED_CUSTOMIZATION'
 
+export const inlinehintKey = 'CODEWHISPERER_HINT_DISPLAYED'
+
+export const inlinehintWipKey = 'aws.codewhisperer.tutorial.workInProgress'
+
+export type AnnotationChangeSource = 'codewhisperer' | 'selection' | 'editor' | 'content'
+
 export const learnMoreUriGeneral = 'https://aws.amazon.com/codewhisperer/'
 
 export const learnMoreUri = 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codewhisperer.html'

packages/core/src/codewhisperer/service/recommendationHandler.ts

@@ -62,6 +62,8 @@ const nextCommand = Commands.declare('editor.action.inlineSuggest.showNext', ()
 
 const rejectCommand = Commands.declare('aws.codeWhisperer.rejectCodeSuggestion', () => async () => {
     RecommendationHandler.instance.reportUserDecisions(-1)
+
+    await Commands.tryExecute('aws.codewhisperer.refreshAnnotation')
 })
 
 const lock = new AsyncLock({ maxPending: 1 })

packages/core/src/codewhisperer/service/serviceContainer.ts

@@ -4,6 +4,7 @@
  */
 
 import { AuthUtil } from '../util/authUtil'
+import { LineAnnotationController } from '../views/lineAnnotationController'
 import { ActiveStateController } from '../views/activeStateController'
 import { LineTracker } from '../tracker/lineTracker'
 
@@ -28,10 +29,12 @@ export class Container {
     }
 
     readonly lineTracker: LineTracker
+    readonly lineAnnotationController: LineAnnotationController
     readonly activeStateController: ActiveStateController
 
     protected constructor(readonly auth: AuthUtil) {
         this.lineTracker = new LineTracker()
+        this.lineAnnotationController = new LineAnnotationController(this)
         this.activeStateController = new ActiveStateController(this)
     }
 

packages/core/src/codewhisperer/tracker/lineTracker.ts

@@ -49,7 +49,7 @@ export class LineTracker implements vscode.Disposable {
     constructor() {
         this._disposable = vscode.Disposable.from(
             vscode.window.onDidChangeActiveTextEditor(async e => {
-                await this.onActiveTextEditorChanged(undefined)
+                await this.onActiveTextEditorChanged(e)
             }),
             vscode.window.onDidChangeTextEditorSelection(async e => {
                 await this.onTextEditorSelectionChanged(e)

packages/core/src/codewhisperer/ui/statusBarMenu.ts

@@ -29,6 +29,7 @@ import { createExitButton } from '../../shared/ui/buttons'
 import { isWeb } from '../../common/webUtils'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { once } from '../../shared/utilities/functionUtils'
+import { getLogger } from '../../shared/logger'
 
 function getAmazonQCodeWhispererNodes() {
     const autoTriggerEnabled = CodeSuggestionsState.instance.isSuggestionsEnabled()
@@ -101,6 +102,13 @@ export function getQuickPickItems(): DataQuickPickItem<string>[] {
 export const listCodeWhispererCommandsId = 'aws.codewhisperer.listCommands'
 export const listCodeWhispererCommands = Commands.declare({ id: listCodeWhispererCommandsId }, () => () => {
     once(() => telemetry.ui_click.emit({ elementId: 'cw_statusBarMenu' }))()
+    Commands.tryExecute('aws.codewhisperer.refreshAnnotation', true)
+        .then()
+        .catch(e => {
+            getLogger().debug(
+                `codewhisperer: running into error while executing command { refreshAnnotation } on user clicking statusbar: ${e}`
+            )
+        })
     return createQuickPick(getQuickPickItems(), {
         title: 'Amazon Q (Preview) + CodeWhisperer',
         buttons: [createExitButton()],