fix(amazonq): fix the status bar duplication

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

@@ -14,26 +14,24 @@ import { TelemetryHelper } from '../util/telemetryHelper'
 import { AuthUtil } from '../util/authUtil'
 import { shared } from '../../shared/utilities/functionUtils'
 import { ClassifierTrigger } from './classifierTrigger'
-import { getSelectedCustomization } from '../util/customizationUtil'
-import { codicon, getIcon } from '../../shared/icons'
 import { session } from '../util/codeWhispererSession'
 import { noSuggestions } from '../models/constants'
-import { listCodeWhispererCommandsId } from '../ui/statusBarMenu'
+import { CodeWhispererStatusBarManager } from './statusBar'
 
 export class InlineCompletionService {
     private maxPage = 100
-    private statusBar: CodeWhispererStatusBar
+    private statusBar: CodeWhispererStatusBarManager
     private _showRecommendationTimer?: NodeJS.Timer
 
-    constructor(statusBar: CodeWhispererStatusBar = CodeWhispererStatusBar.instance) {
+    constructor(statusBar: CodeWhispererStatusBarManager = CodeWhispererStatusBarManager.instance) {
         this.statusBar = statusBar
 
         RecommendationHandler.instance.onDidReceiveRecommendation((e) => {
             this.startShowRecommendationTimer()
         })
 
         CodeSuggestionsState.instance.onDidChangeState(() => {
-            return this.refreshStatusBar()
+            return this.statusBar.refreshStatusBar()
         })
     }
 
@@ -109,7 +107,7 @@ export class InlineCompletionService {
             }
         }
 
-        await this.setState('loading')
+        await this.statusBar.setLoading()
 
         RecommendationHandler.instance.checkAndResetCancellationTokens()
         RecommendationHandler.instance.documentUri = editor.document.uri
@@ -162,103 +160,4 @@ export class InlineCompletionService {
             recommendationCount: session.recommendations.length,
         }
     }
-
-    /** Updates the status bar to represent the latest CW state */
-    refreshStatusBar() {
-        if (AuthUtil.instance.isConnectionValid()) {
-            if (AuthUtil.instance.requireProfileSelection()) {
-                return this.setState('needsProfile')
-            }
-            return this.setState('ok')
-        } else if (AuthUtil.instance.isConnectionExpired()) {
-            return this.setState('expired')
-        } else {
-            return this.setState('notConnected')
-        }
-    }
-
-    private async setState(state: keyof typeof states) {
-        switch (state) {
-            case 'loading': {
-                await this.statusBar.setState('loading')
-                break
-            }
-            case 'ok': {
-                await this.statusBar.setState('ok', CodeSuggestionsState.instance.isSuggestionsEnabled())
-                break
-            }
-            case 'expired': {
-                await this.statusBar.setState('expired')
-                break
-            }
-            case 'notConnected': {
-                await this.statusBar.setState('notConnected')
-                break
-            }
-            case 'needsProfile': {
-                await this.statusBar.setState('needsProfile')
-                break
-            }
-        }
-    }
-}
-
-/** The states that the completion service can be in */
-const states = {
-    loading: 'loading',
-    ok: 'ok',
-    expired: 'expired',
-    notConnected: 'notConnected',
-    needsProfile: 'needsProfile',
-} as const
-
-export class CodeWhispererStatusBar {
-    protected statusBar: vscode.StatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1)
-
-    static #instance: CodeWhispererStatusBar
-    static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    protected constructor() {}
-
-    async setState(state: keyof Omit<typeof states, 'ok'>): Promise<void>
-    async setState(status: keyof Pick<typeof states, 'ok'>, isSuggestionsEnabled: boolean): Promise<void>
-    async setState(status: keyof typeof states, isSuggestionsEnabled?: boolean): Promise<void> {
-        const statusBar = this.statusBar
-        statusBar.command = listCodeWhispererCommandsId
-        statusBar.backgroundColor = undefined
-
-        const title = 'Amazon Q'
-        switch (status) {
-            case 'loading': {
-                const selectedCustomization = getSelectedCustomization()
-                statusBar.text = codicon` ${getIcon('vscode-loading~spin')} ${title}${
-                    selectedCustomization.arn === '' ? '' : ` | ${selectedCustomization.name}`
-                }`
-                break
-            }
-            case 'ok': {
-                const selectedCustomization = getSelectedCustomization()
-                const icon = isSuggestionsEnabled ? getIcon('vscode-debug-start') : getIcon('vscode-debug-pause')
-                statusBar.text = codicon`${icon} ${title}${
-                    selectedCustomization.arn === '' ? '' : ` | ${selectedCustomization.name}`
-                }`
-                break
-            }
-
-            case 'expired': {
-                statusBar.text = codicon` ${getIcon('vscode-debug-disconnect')} ${title}`
-                statusBar.backgroundColor = new vscode.ThemeColor('statusBarItem.warningBackground')
-                break
-            }
-            case 'needsProfile':
-            case 'notConnected':
-                statusBar.text = codicon` ${getIcon('vscode-chrome-close')} ${title}`
-                statusBar.backgroundColor = new vscode.ThemeColor('statusBarItem.errorBackground')
-                break
-        }
-
-        statusBar.show()
-    }
 }