fix: move inlineTracker back to core

Hweinstock · Hweinstock · commit 3bb3251c3342 · 2025-05-16T13:11:01.000-04:00
diff --git a/packages/amazonq/src/app/inline/completion.ts b/packages/amazonq/src/app/inline/completion.ts
@@ -35,9 +35,9 @@ import {
     vsCodeState,
     inlineCompletionsDebounceDelay,
     noInlineSuggestionsMsg,
+    LineTracker,
 } from 'aws-core-vscode/codewhisperer'
 import { InlineGeneratingMessage } from './inlineGeneratingMessage'
-import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 import { TelemetryHelper } from './telemetryHelper'
 import { getLogger } from 'aws-core-vscode/shared'
diff --git a/packages/amazonq/src/app/inline/inlineGeneratingMessage.ts b/packages/amazonq/src/app/inline/inlineGeneratingMessage.ts
@@ -5,8 +5,7 @@
 
 import { editorUtilities } from 'aws-core-vscode/shared'
 import * as vscode from 'vscode'
-import { LineSelection, LineTracker } from './stateTracker/lineTracker'
-import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { AuthUtil, LineSelection, LineTracker } from 'aws-core-vscode/codewhisperer'
 import { cancellableDebounce } from 'aws-core-vscode/utils'
 
 /**
@@ -31,12 +30,7 @@ export class InlineGeneratingMessage implements vscode.Disposable {
 
     constructor(private readonly lineTracker: LineTracker) {
         this._disposable = vscode.Disposable.from(
-            AuthUtil.instance.auth.onDidChangeConnectionState(async (e) => {
-                if (e.state !== 'authenticating') {
-                    this.hideGenerating()
-                }
-            }),
-            AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(async () => {
+            AuthUtil.instance.onDidChangeConnectionState(async () => {
                 this.hideGenerating()
             })
         )
@@ -72,7 +66,7 @@ export class InlineGeneratingMessage implements vscode.Disposable {
             return
         }
 
-        if (!AuthUtil.instance.isConnectionValid()) {
+        if (!AuthUtil.instance.isConnected()) {
             this.hideGenerating()
             return
         }
diff --git a/packages/amazonq/src/app/inline/stateTracker/lineTracker.ts b/packages/amazonq/src/app/inline/stateTracker/lineTracker.ts
diff --git a/packages/amazonq/src/app/inline/telemetryHelper.ts b/packages/amazonq/src/app/inline/telemetryHelper.ts
@@ -155,7 +155,7 @@ export class TelemetryHelper {
             codewhispererRequestId: this._firstResponseRequestId,
             codewhispererSessionId: this._sessionId,
             codewhispererTriggerType: this._triggerType,
-            credentialStartUrl: AuthUtil.instance.startUrl,
+            credentialStartUrl: AuthUtil.instance.connection?.startUrl,
             result: 'Succeeded',
         })
     }
diff --git a/packages/amazonq/src/app/inline/tutorials/inlineTutorialAnnotation.ts b/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 '../stateTracker/lineTracker'
+import { LinesChangeEvent, LineSelection, LineTracker } from 'aws-core-vscode/codewhisperer'
 import { telemetry } from 'aws-core-vscode/telemetry'
 import { cancellableDebounce } from 'aws-core-vscode/utils'
 import { SessionManager } from '../sessionManager'
@@ -273,12 +273,7 @@ export class InlineTutorialAnnotation implements vscode.Disposable {
             this.lineTracker.onDidChangeActiveLines(async (e) => {
                 await this.onActiveLinesChanged(e)
             }),
-            AuthUtil.instance.auth.onDidChangeConnectionState(async (e) => {
-                if (e.state !== 'authenticating') {
-                    await this.refresh(vscode.window.activeTextEditor, 'editor')
-                }
-            }),
-            AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(async () => {
+            AuthUtil.instance.onDidChangeConnectionState(async () => {
                 await this.refresh(vscode.window.activeTextEditor, 'editor')
             })
         )
@@ -418,7 +413,7 @@ export class InlineTutorialAnnotation implements vscode.Disposable {
             return
         }
 
-        if (!AuthUtil.instance.isConnectionValid()) {
+        if (!AuthUtil.instance.isConnected()) {
             this.clear()
             return
         }
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
@@ -36,7 +36,6 @@ import {
     AuthUtil,
     CodeWhispererSettings,
     getSelectedCustomization,
-    LineTracker,
     TelemetryHelper,
 } from 'aws-core-vscode/codewhisperer'
 import {
@@ -55,6 +54,7 @@ import {
     getClientId,
     extensionVersion,
 } from 'aws-core-vscode/shared'
+import { LineTracker } from 'aws-core-vscode/codewhisperer'
 import { processUtils } from 'aws-core-vscode/shared'
 import { activate as activateChat } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
@@ -185,8 +185,6 @@ export async function startLanguageServer(
     toDispose.push(disposable)
     await client.onReady()
 
-    await client.onReady()
-
     /**
      * We use the Flare Auth language server, and our Auth client depends on it.
      * Because of this we initialize our Auth client **immediately** after the language server is ready.
@@ -220,6 +218,8 @@ export async function startLanguageServer(
 
         // Try and restore a cached connection if exists
         await AuthUtil.instance.restore()
+        const conn = AuthUtil.instance.connection
+        getLogger().info('%O', conn)
     }
 }
 
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts
@@ -27,7 +27,7 @@ import {
     ReferenceLogViewProvider,
 } from 'aws-core-vscode/codewhisperer'
 import { InlineGeneratingMessage } from '../../../../../src/app/inline/inlineGeneratingMessage'
-import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
+import { LineTracker } from 'aws-core-vscode/codewhisperer'
 import { InlineTutorialAnnotation } from '../../../../../src/app/inline/tutorials/inlineTutorialAnnotation'
 
 describe('InlineCompletionManager', () => {
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts
@@ -10,7 +10,7 @@ import assert from 'assert'
 import { RecommendationService } from '../../../../../src/app/inline/recommendationService'
 import { SessionManager } from '../../../../../src/app/inline/sessionManager'
 import { createMockDocument } from 'aws-core-vscode/test'
-import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
+import { LineTracker } from 'aws-core-vscode/codewhisperer'
 import { InlineGeneratingMessage } from '../../../../../src/app/inline/inlineGeneratingMessage'
 
 describe('RecommendationService', () => {
diff --git a/packages/amazonq/test/unit/amazonq/lsp/encryption.test.ts b/packages/amazonq/test/unit/amazonq/lsp/encryption.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert'
 import { decryptResponse, encryptRequest } from '../../../../src/lsp/encryption'
-import { encryptionKey } from '../../../../src/lsp/auth'
+import { encryptionKey } from '../../../../src/lsp/client'
 
 describe('LSP encryption', function () {
     it('encrypt and decrypt invert eachother with same key', async function () {
diff --git a/packages/core/src/codewhisperer/index.ts b/packages/core/src/codewhisperer/index.ts
@@ -59,7 +59,7 @@ export { LicenseUtil } from './util/licenseUtil'
 export { SecurityIssueProvider } from './service/securityIssueProvider'
 export { listScanResults, mapToAggregatedList, pollScanJobStatus } from './service/securityScanHandler'
 export { TelemetryHelper } from './util/telemetryHelper'
-export { LineSelection, LineTracker } from './tracker/lineTracker'
+export { LineTracker, LineSelection, LinesChangeEvent } from './tracker/lineTracker'
 export { runtimeLanguageContext, RuntimeLanguageContext } from './util/runtimeLanguageContext'
 export * as startSecurityScan from './commands/startSecurityScan'
 export * from './util/showSsoPrompt'
diff --git a/packages/core/src/codewhisperer/tracker/lineTracker.ts b/packages/core/src/codewhisperer/tracker/lineTracker.ts
@@ -4,8 +4,7 @@
  */
 
 import * as vscode from 'vscode'
-import { isTextEditor } from '../../shared/utilities/editorUtilities'
-import { setContext } from '../../shared/vscode/setContext'
+import { editorUtilities, setContext } from 'aws-core-vscode/shared'
 
 export interface LineSelection {
     anchor: number
@@ -95,7 +94,7 @@ export class LineTracker implements vscode.Disposable {
     // @VisibleForTesting
     async onTextEditorSelectionChanged(e: vscode.TextEditorSelectionChangeEvent) {
         // If this isn't for our cached editor and its not a real editor -- kick out
-        if (this._editor !== e.textEditor && !isTextEditor(e.textEditor)) {
+        if (this._editor !== e.textEditor && !editorUtilities.isTextEditor(e.textEditor)) {
             return
         }
 
@@ -117,7 +116,7 @@ export class LineTracker implements vscode.Disposable {
     // @VisibleForTesting
     onContentChanged(e: vscode.TextDocumentChangeEvent) {
         const editor = vscode.window.activeTextEditor
-        if (e.document === editor?.document && e.contentChanges.length > 0 && isTextEditor(editor)) {
+        if (e.document === editor?.document && e.contentChanges.length > 0 && editorUtilities.isTextEditor(editor)) {
             this._editor = editor
             this._selections = toLineSelections(this._editor?.selections)
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ export class TelemetryHelper {`
`155`	`155`	`codewhispererRequestId: this._firstResponseRequestId,`
`156`	`156`	`codewhispererSessionId: this._sessionId,`
`157`	`157`	`codewhispererTriggerType: this._triggerType,`
`158`		`- credentialStartUrl: AuthUtil.instance.startUrl,`
	`158`	`+ credentialStartUrl: AuthUtil.instance.connection?.startUrl,`
`159`	`159`	`result: 'Succeeded',`
`160`	`160`	`})`
`161`	`161`	`}`