renames

Author: jpinkney-aws

packages/amazonq/src/app/inline/completion.ts

@@ -35,7 +35,7 @@ import {
 } from 'aws-core-vscode/codewhisperer'
 import { InlineGeneratingMessage } from './inlineGeneratingMessage'
 import { LineTracker } from './stateTracker/lineTracker'
-import { LineAnnotationController } from './stateTracker/lineAnnotationTracker'
+import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 
 export class InlineCompletionManager implements Disposable {
     private disposable: Disposable
@@ -45,26 +45,26 @@ export class InlineCompletionManager implements Disposable {
     private recommendationService: RecommendationService
     private lineTracker: LineTracker
     private incomingGeneratingMessage: InlineGeneratingMessage
-    private lineAnnotationTracker: LineAnnotationController
+    private inlineTutorialAnnotation: InlineTutorialAnnotation
     private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
 
     constructor(
         languageClient: LanguageClient,
         sessionManager: SessionManager,
         lineTracker: LineTracker,
-        lineAnnotationTracker: LineAnnotationController
+        inlineTutorialAnnotation: InlineTutorialAnnotation
     ) {
         this.languageClient = languageClient
         this.sessionManager = sessionManager
         this.lineTracker = lineTracker
         this.incomingGeneratingMessage = new InlineGeneratingMessage(this.lineTracker)
         this.recommendationService = new RecommendationService(this.sessionManager, this.incomingGeneratingMessage)
-        this.lineAnnotationTracker = lineAnnotationTracker
+        this.inlineTutorialAnnotation = inlineTutorialAnnotation
         this.inlineCompletionProvider = new AmazonQInlineCompletionItemProvider(
             languageClient,
             this.recommendationService,
             this.sessionManager,
-            this.lineAnnotationTracker
+            this.inlineTutorialAnnotation
         )
         this.disposable = languages.registerInlineCompletionItemProvider(
             CodeWhispererConstants.platformLanguageIds,
@@ -167,7 +167,7 @@ export class InlineCompletionManager implements Disposable {
                     this.languageClient,
                     this.recommendationService,
                     this.sessionManager,
-                    this.lineAnnotationTracker,
+                    this.inlineTutorialAnnotation,
                     false
                 )
             )
@@ -193,7 +193,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         private readonly languageClient: LanguageClient,
         private readonly recommendationService: RecommendationService,
         private readonly sessionManager: SessionManager,
-        private readonly lineAnnotationController: LineAnnotationController,
+        private readonly inlineTutorialAnnotation: InlineTutorialAnnotation,
         private readonly isNewSession: boolean = true
     ) {}
 
@@ -211,7 +211,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             }
 
             // tell the tutorial that completions has been triggered
-            await this.lineAnnotationController.triggered(context.triggerKind)
+            await this.inlineTutorialAnnotation.triggered(context.triggerKind)
 
             // make service requests if it's a new session
             await this.recommendationService.getAllRecommendations(

packages/amazonq/src/app/inline/stateTracker/inlineLineAnnotationTracker.ts renamed to packages/amazonq/src/app/inline/tutorials/inlineChatTutorialAnnotation.ts

@@ -4,13 +4,13 @@
  */
 
 import * as vscode from 'vscode'
-import { LineAnnotationController } from './lineAnnotationTracker'
+import { InlineTutorialAnnotation } from './inlineTutorialAnnotation'
 import { globals } from 'aws-core-vscode/shared'
 
-export class InlineLineAnnotationController {
+export class InlineChatTutorialAnnotation {
     private enabled: boolean = true
 
-    constructor(private readonly lineAnnotationController: LineAnnotationController) {
+    constructor(private readonly inlineTutorialAnnotation: InlineTutorialAnnotation) {
         globals.context.subscriptions.push(
             vscode.window.onDidChangeTextEditorSelection(async ({ selections, textEditor }) => {
                 let showShow = false
@@ -34,12 +34,12 @@ export class InlineLineAnnotationController {
     private async setVisible(editor: vscode.TextEditor, visible: boolean) {
         let needsRefresh: boolean
         if (visible) {
-            needsRefresh = await this.lineAnnotationController.tryShowInlineHint()
+            needsRefresh = await this.inlineTutorialAnnotation.tryShowInlineHint()
         } else {
-            needsRefresh = await this.lineAnnotationController.tryHideInlineHint()
+            needsRefresh = await this.inlineTutorialAnnotation.tryHideInlineHint()
         }
         if (needsRefresh) {
-            await this.lineAnnotationController.refresh(editor, 'codewhisperer')
+            await this.inlineTutorialAnnotation.refresh(editor, 'codewhisperer')
         }
     }
 

packages/amazonq/src/app/inline/stateTracker/lineAnnotationTracker.ts renamed to packages/amazonq/src/app/inline/tutorials/inlineTutorialAnnotation.ts

@@ -13,7 +13,7 @@ import {
     TelemetryHelper,
 } from 'aws-core-vscode/codewhisperer'
 import { editorUtilities, getLogger, globals, setContext, vscodeUtilities } from 'aws-core-vscode/shared'
-import { LinesChangeEvent, LineSelection, LineTracker } from './lineTracker'
+import { LinesChangeEvent, LineSelection, LineTracker } from '../stateTracker/lineTracker'
 import { telemetry } from 'aws-core-vscode/telemetry'
 import { cancellableDebounce } from 'aws-core-vscode/utils'
 import { SessionManager } from '../sessionManager'
@@ -231,7 +231,7 @@ export class InlineChatState implements AnnotationState {
  * "new users who has seen tutorial" should have the context key "inlineKey" and "CODEWHISPERER_AUTO_TRIGGER_ENABLED"
  * the remaining grouop of users should belong to "new users who has not seen tutorial"
  */
-export class LineAnnotationController implements vscode.Disposable {
+export class InlineTutorialAnnotation implements vscode.Disposable {
     private readonly _disposable: vscode.Disposable
     private _editor: vscode.TextEditor | undefined
 

packages/amazonq/src/inlineChat/activation.ts

@@ -6,19 +6,14 @@ import * as vscode from 'vscode'
 import { InlineChatController } from './controller/inlineChatController'
 import { registerInlineCommands } from './command/registerInlineCommands'
 import { LanguageClient } from 'vscode-languageclient'
-import { InlineLineAnnotationController } from '../app/inline/stateTracker/inlineLineAnnotationTracker'
+import { InlineChatTutorialAnnotation } from '../app/inline/tutorials/inlineChatTutorialAnnotation'
 
 export function activate(
     context: vscode.ExtensionContext,
     client: LanguageClient,
     encryptionKey: Buffer,
-    inlineLineAnnotationController: InlineLineAnnotationController
+    inlineChatTutorialAnnotation: InlineChatTutorialAnnotation
 ) {
-    const inlineChatController = new InlineChatController(
-        context,
-        client,
-        encryptionKey,
-        inlineLineAnnotationController
-    )
+    const inlineChatController = new InlineChatController(context, client, encryptionKey, inlineChatTutorialAnnotation)
     registerInlineCommands(context, inlineChatController)
 }

packages/amazonq/src/inlineChat/controller/inlineChatController.ts

@@ -26,15 +26,15 @@ import {
     isSageMaker,
     Experiments,
 } from 'aws-core-vscode/shared'
-import { InlineLineAnnotationController } from '../../app/inline/stateTracker/inlineLineAnnotationTracker'
+import { InlineChatTutorialAnnotation } from '../../app/inline/tutorials/inlineChatTutorialAnnotation'
 
 export class InlineChatController {
     private task: InlineTask | undefined
     private readonly decorator = new InlineDecorator()
     private readonly inlineChatProvider: InlineChatProvider
     private readonly codeLenseProvider: CodelensProvider
     private readonly referenceLogController = new ReferenceLogController()
-    private readonly inlineLineAnnotationController: InlineLineAnnotationController
+    private readonly inlineChatTutorialAnnotation: InlineChatTutorialAnnotation
     private readonly computeDiffAndRenderOnEditor: (query: string) => Promise<void>
     private userQuery: string | undefined
     private listeners: vscode.Disposable[] = []
@@ -43,12 +43,12 @@ export class InlineChatController {
         context: vscode.ExtensionContext,
         client: LanguageClient,
         encryptionKey: Buffer,
-        inlineLineAnnotationController: InlineLineAnnotationController
+        inlineChatTutorialAnnotation: InlineChatTutorialAnnotation
     ) {
         this.inlineChatProvider = new InlineChatProvider(client, encryptionKey)
         this.inlineChatProvider.onErrorOccured(() => this.handleError())
         this.codeLenseProvider = new CodelensProvider(context)
-        this.inlineLineAnnotationController = inlineLineAnnotationController
+        this.inlineChatTutorialAnnotation = inlineChatTutorialAnnotation
         this.computeDiffAndRenderOnEditor = Experiments.instance.get('amazonqLSPInlineChat', false)
             ? this.computeDiffAndRenderOnEditorLSP.bind(this)
             : this.computeDiffAndRenderOnEditorLocal.bind(this)
@@ -149,7 +149,7 @@ export class InlineChatController {
         this.codeLenseProvider.updateLenses(task)
         if (task.state === TaskState.InProgress) {
             if (vscode.window.activeTextEditor) {
-                await this.inlineLineAnnotationController.hide(vscode.window.activeTextEditor)
+                await this.inlineChatTutorialAnnotation.hide(vscode.window.activeTextEditor)
             }
         }
         await this.refreshCodeLenses(task)
@@ -175,7 +175,7 @@ export class InlineChatController {
         this.listeners = []
 
         this.task = undefined
-        this.inlineLineAnnotationController.enable()
+        this.inlineChatTutorialAnnotation.enable()
         await setContext('amazonq.inline.codelensShortcutEnabled', undefined)
     }
 
@@ -216,7 +216,7 @@ export class InlineChatController {
                 this.userQuery = query
                 await textDocumentUtil.addEofNewline(editor)
                 this.task = await this.createTask(query, editor.document, editor.selection)
-                await this.inlineLineAnnotationController.disable(editor)
+                await this.inlineChatTutorialAnnotation.disable(editor)
                 await this.computeDiffAndRenderOnEditor(query).catch(async (err) => {
                     getLogger().error('computeDiffAndRenderOnEditor error: %s', (err as Error)?.message)
                     if (err instanceof Error) {

packages/amazonq/src/lsp/client.ts

@@ -48,8 +48,8 @@ import { activate as activateInlineChat } from '../inlineChat/activation'
 import { telemetry } from 'aws-core-vscode/telemetry'
 import { SessionManager } from '../app/inline/sessionManager'
 import { LineTracker } from '../app/inline/stateTracker/lineTracker'
-import { LineAnnotationController } from '../app/inline/stateTracker/lineAnnotationTracker'
-import { InlineLineAnnotationController } from '../app/inline/stateTracker/inlineLineAnnotationTracker'
+import { InlineTutorialAnnotation } from '../app/inline/tutorials/inlineTutorialAnnotation'
+import { InlineChatTutorialAnnotation } from '../app/inline/tutorials/inlineChatTutorialAnnotation'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
@@ -185,12 +185,12 @@ export async function startLanguageServer(
         const lineTracker = new LineTracker()
 
         // tutorial for inline suggestions
-        const lineAnnotationTracker = new LineAnnotationController(lineTracker, sessionManager)
+        const inlineTutorialAnnotation = new InlineTutorialAnnotation(lineTracker, sessionManager)
 
         // tutorial for inline chat
-        const line = new InlineLineAnnotationController(lineAnnotationTracker)
+        const inlineChatTutorialAnnotation = new InlineChatTutorialAnnotation(inlineTutorialAnnotation)
 
-        const inlineManager = new InlineCompletionManager(client, sessionManager, lineTracker, lineAnnotationTracker)
+        const inlineManager = new InlineCompletionManager(client, sessionManager, lineTracker, inlineTutorialAnnotation)
         inlineManager.registerInlineCompletion()
         toDispose.push(
             inlineManager,
@@ -205,9 +205,9 @@ export async function startLanguageServer(
                 const editor = vscode.window.activeTextEditor
                 if (editor) {
                     if (forceProceed) {
-                        await lineAnnotationTracker.refresh(editor, 'codewhisperer', true)
+                        await inlineTutorialAnnotation.refresh(editor, 'codewhisperer', true)
                     } else {
-                        await lineAnnotationTracker.refresh(editor, 'codewhisperer')
+                        await inlineTutorialAnnotation.refresh(editor, 'codewhisperer')
                     }
                 }
             }),
@@ -217,11 +217,11 @@ export async function startLanguageServer(
             Commands.register('aws.amazonq.dismissTutorial', async () => {
                 const editor = vscode.window.activeTextEditor
                 if (editor) {
-                    lineAnnotationTracker.clear()
+                    inlineTutorialAnnotation.clear()
                     try {
-                        telemetry.ui_click.emit({ elementId: `dismiss_${lineAnnotationTracker.currentState.id}` })
+                        telemetry.ui_click.emit({ elementId: `dismiss_${inlineTutorialAnnotation.currentState.id}` })
                     } catch (_) {}
-                    await lineAnnotationTracker.dismissTutorial()
+                    await inlineTutorialAnnotation.dismissTutorial()
                     getLogger().debug(`codewhisperer: user dismiss tutorial.`)
                 }
             })
@@ -231,7 +231,7 @@ export async function startLanguageServer(
             await activate(client, encryptionKey, resourcePaths.ui)
         }
 
-        activateInlineChat(extensionContext, client, encryptionKey, line)
+        activateInlineChat(extensionContext, client, encryptionKey, inlineChatTutorialAnnotation)
 
         const refreshInterval = auth.startTokenRefreshInterval(10 * oneSecond)
 

packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts

@@ -17,7 +17,7 @@ import {
 } from 'aws-core-vscode/codewhisperer'
 import { InlineGeneratingMessage } from '../../../../../src/app/inline/inlineGeneratingMessage'
 import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
-import { LineAnnotationController } from '../../../../../src/app/inline/stateTracker/lineAnnotationTracker'
+import { InlineTutorialAnnotation } from '../../../../../src/app/inline/tutorials/inlineTutorialAnnotation'
 
 describe('InlineCompletionManager', () => {
     let manager: InlineCompletionManager
@@ -77,8 +77,8 @@ describe('InlineCompletionManager', () => {
 
         const sessionManager = new SessionManager()
         const lineTracker = new LineTracker()
-        const lineAnnotationTracker = new LineAnnotationController(lineTracker, sessionManager)
-        manager = new InlineCompletionManager(languageClient, sessionManager, lineTracker, lineAnnotationTracker)
+        const inlineTutorialAnnotation = new InlineTutorialAnnotation(lineTracker, sessionManager)
+        manager = new InlineCompletionManager(languageClient, sessionManager, lineTracker, inlineTutorialAnnotation)
         getActiveSessionStub = sandbox.stub(manager['sessionManager'], 'getActiveSession')
         getActiveRecommendationStub = sandbox.stub(manager['sessionManager'], 'getActiveRecommendation')
         getReferenceStub = sandbox.stub(ReferenceLogViewProvider, 'getReferenceLog')
@@ -268,12 +268,12 @@ describe('InlineCompletionManager', () => {
             let getAllRecommendationsStub: sinon.SinonStub
             let recommendationService: RecommendationService
             let setInlineReferenceStub: sinon.SinonStub
-            let lineAnnotationTracker: LineAnnotationController
+            let inlineTutorialAnnotation: InlineTutorialAnnotation
 
             beforeEach(() => {
                 const lineTracker = new LineTracker()
                 const activeStateController = new InlineGeneratingMessage(lineTracker)
-                lineAnnotationTracker = new LineAnnotationController(lineTracker, mockSessionManager)
+                inlineTutorialAnnotation = new InlineTutorialAnnotation(lineTracker, mockSessionManager)
                 recommendationService = new RecommendationService(mockSessionManager, activeStateController)
                 setInlineReferenceStub = sandbox.stub(ReferenceInlineProvider.instance, 'setInlineReference')
 
@@ -297,7 +297,7 @@ describe('InlineCompletionManager', () => {
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        lineAnnotationTracker
+                        inlineTutorialAnnotation
                     )
                     const items = await provider.provideInlineCompletionItems(
                         mockDocument,
@@ -313,7 +313,7 @@ describe('InlineCompletionManager', () => {
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        lineAnnotationTracker,
+                        inlineTutorialAnnotation,
                         false
                     )
                     const items = await provider.provideInlineCompletionItems(
@@ -330,7 +330,7 @@ describe('InlineCompletionManager', () => {
                         languageClient,
                         recommendationService,
                         mockSessionManager,
-                        lineAnnotationTracker,
+                        inlineTutorialAnnotation,
                         false
                     )
                     await provider.provideInlineCompletionItems(mockDocument, mockPosition, mockContext, mockToken)