Merge pull request #3487 from Kilo-Org/eamon/MoreConsistent

Continue: Don't needlessly use the singleton pattern; and DO support disposal (at least better than previously)

Author: EamonNerbonne

src/services/autocomplete/AutocompleteProvider.ts

@@ -16,7 +16,7 @@ import { ContinueCompletionProvider } from "../continuedev/core/vscode-test-harn
 import OpenRouter from "../continuedev/core/llm/llms/OpenRouter"
 
 export class AutocompleteProvider {
-	private static instance: AutocompleteProvider | null = null
+	private completionProviderDisposable: vscode.Disposable | null = null
 	private model: AutocompleteModel
 	private providerSettingsManager: ProviderSettingsManager
 	private settings: GhostServiceSettings | null = null
@@ -29,7 +29,7 @@ export class AutocompleteProvider {
 	// VSCode Providers
 	public inlineCompletionProvider: any
 
-	private constructor(
+	constructor(
 		private context: vscode.ExtensionContext,
 		private cline: ClineProvider,
 	) {
@@ -40,21 +40,7 @@ export class AutocompleteProvider {
 		void this.load()
 	}
 
-	// Singleton Management
-	public static initialize(context: vscode.ExtensionContext, cline: ClineProvider): AutocompleteProvider {
-		if (AutocompleteProvider.instance) {
-			throw new Error("AutocompleteProvider is already initialized. Use getInstance() instead.")
-		}
-		AutocompleteProvider.instance = new AutocompleteProvider(context, cline)
-		return AutocompleteProvider.instance
-	}
-
-	public static getInstance(): AutocompleteProvider {
-		if (!AutocompleteProvider.instance) {
-			throw new Error("AutocompleteProvider is not initialized. Call initialize() first.")
-		}
-		return AutocompleteProvider.instance
-	}
+	// Instance is created and managed by the registration function
 
 	// Settings Management
 	private loadSettings() {
@@ -77,15 +63,21 @@ export class AutocompleteProvider {
 
 	private async loadCodeCompletion() {
 		try {
+			// Dispose any existing registration up front to keep logic centralized
+			this.dispose()
+
+			// Decide whether the provider should be registered at all based on settings
+			if (!this.settings?.enableAutoTrigger) {
+				return
+			}
+
 			// The model.reload() has already loaded the profile, so we can get the ILLM
 			const llm = this.model.getILLM()
-
 			if (!llm) {
 				console.warn("[AutocompleteProvider] No valid autocomplete provider found")
 				return
 			}
 
-			// Register the Continue completion provider with the selected LLM
 			const minimalConfigProvider = new MinimalConfigProvider({
 				selectedModelByRole: {
 					autocomplete: llm,
@@ -94,9 +86,13 @@ export class AutocompleteProvider {
 			const ide = new VsCodeIde(this.context)
 			const usingFullFileDiff = false
 			const continueProvider = new ContinueCompletionProvider(minimalConfigProvider, ide, usingFullFileDiff)
-			this.context.subscriptions.push(
-				vscode.languages.registerInlineCompletionItemProvider([{ pattern: "**" }], continueProvider),
+
+			// Register provider and hold onto disposable to prevent duplicates
+			this.completionProviderDisposable = vscode.languages.registerInlineCompletionItemProvider(
+				[{ pattern: "**" }],
+				continueProvider,
 			)
+			this.context.subscriptions.push(this.completionProviderDisposable)
 
 			console.log("[AutocompleteProvider] Successfully registered autocomplete")
 		} catch (error) {
@@ -150,9 +146,12 @@ export class AutocompleteProvider {
 	}
 
 	/**
-	 * Dispose of all resources used by the GhostProvider
+	 * Dispose of all resources used by the AutocompleteProvider
 	 */
 	public dispose(): void {
-		AutocompleteProvider.instance = null // Reset singleton
+		if (this.completionProviderDisposable) {
+			this.completionProviderDisposable.dispose()
+			this.completionProviderDisposable = null
+		}
 	}
 }

src/services/autocomplete/index.ts

@@ -4,7 +4,7 @@ import { AutocompleteProvider } from "./AutocompleteProvider"
 import { ClineProvider } from "../../core/webview/ClineProvider"
 
 export const registerAutocompleteProvider = (context: vscode.ExtensionContext, cline: ClineProvider) => {
-	const ghost = AutocompleteProvider.initialize(context, cline)
+	const ghost = new AutocompleteProvider(context, cline)
 	context.subscriptions.push(ghost)
 
 	context.subscriptions.push(