Merge pull request #3897 from Kilo-Org/eamon/simplify

Simplify HelperVars

Author: EamonNerbonne

src/services/continuedev/core/autocomplete/util/HelperVars.ts

@@ -10,138 +10,82 @@ import { AutocompleteInput } from "./types"
  * A collection of variables that are often accessed throughout the autocomplete pipeline
  * It's noisy to re-calculate all the time or inject them into each function
  */
-export class HelperVars {
+export interface HelperVars {
 	lang: AutocompleteLanguageInfo
 	treePath: AstPath | undefined
-	workspaceUris: string[] = []
-
-	private _fileContents: string | undefined
-	private _fileLines: string[] | undefined
-	private _fullPrefix: string | undefined
-	private _fullSuffix: string | undefined
-	private _prunedPrefix: string | undefined
-	private _prunedSuffix: string | undefined
-
-	private constructor(
-		public readonly input: AutocompleteInput,
-		public readonly options: TabAutocompleteOptions,
-		public readonly modelName: string,
-		private readonly ide: IDE,
-	) {
-		this.lang = languageForFilepath(input.filepath)
-	}
-
-	private async init() {
-		// Don't do anything if already initialized
-		if (this._fileContents !== undefined) {
-			return
-		}
-		this.workspaceUris = await this.ide.getWorkspaceDirs()
-
-		this._fileContents = this.input.manuallyPassFileContents ?? (await this.ide.readFile(this.filepath))
-
-		this._fileLines = this._fileContents.split("\n")
-
-		// Construct full prefix/suffix (a few edge cases handled in here)
-		const { prefix: fullPrefix, suffix: fullSuffix } = await constructInitialPrefixSuffix(this.input, this.ide)
-		this._fullPrefix = fullPrefix
-		this._fullSuffix = fullSuffix
-
-		const { prunedPrefix, prunedSuffix } = this.prunePrefixSuffix()
-		this._prunedPrefix = prunedPrefix
-		this._prunedSuffix = prunedSuffix
-
-		try {
-			const ast = await getAst(this.filepath, fullPrefix + fullSuffix)
-			if (ast) {
-				this.treePath = await getTreePathAtCursor(ast, fullPrefix.length)
-			}
-		} catch (e) {
-			console.error("Failed to parse AST", e)
-		}
-	}
+	workspaceUris: string[]
+	fileContents: string
+	fileLines: string[]
+	fullPrefix: string
+	fullSuffix: string
+	prunedPrefix: string
+	prunedSuffix: string
+	input: AutocompleteInput
+	options: TabAutocompleteOptions
+	modelName: string
+	filepath: string
+	pos: any // Using any to match original getter return type inference, or import Position
+	prunedCaretWindow: string
+}
 
-	static async create(
+export const HelperVars = {
+	create: async (
 		input: AutocompleteInput,
 		options: TabAutocompleteOptions,
 		modelName: string,
 		ide: IDE,
-	): Promise<HelperVars> {
-		const instance = new HelperVars(input, options, modelName, ide)
-		await instance.init()
-		return instance
-	}
+	): Promise<HelperVars> => {
+		const lang = languageForFilepath(input.filepath)
+		const workspaceUris = await ide.getWorkspaceDirs()
+		const fileContents = input.manuallyPassFileContents ?? (await ide.readFile(input.filepath))
+		const fileLines = fileContents.split("\n")
+
+		// Construct full prefix/suffix (a few edge cases handled in here)
+		const { prefix: fullPrefix, suffix: fullSuffix } = await constructInitialPrefixSuffix(input, ide)
 
-	prunePrefixSuffix() {
 		// Construct basic prefix
-		const maxPrefixTokens = this.options.maxPromptTokens * this.options.prefixPercentage
-		const prunedPrefix = pruneLinesFromTop(this.fullPrefix, maxPrefixTokens, this.modelName)
+		const maxPrefixTokens = options.maxPromptTokens * options.prefixPercentage
+		const prunedPrefix = pruneLinesFromTop(fullPrefix, maxPrefixTokens, modelName)
 
 		// Construct suffix
 		const maxSuffixTokens = Math.min(
-			this.options.maxPromptTokens - countTokens(prunedPrefix, this.modelName),
-			this.options.maxSuffixPercentage * this.options.maxPromptTokens,
+			options.maxPromptTokens - countTokens(prunedPrefix, modelName),
+			options.maxSuffixPercentage * options.maxPromptTokens,
 		)
-		const prunedSuffix = pruneLinesFromBottom(this.fullSuffix, maxSuffixTokens, this.modelName)
+		const prunedSuffix = pruneLinesFromBottom(fullSuffix, maxSuffixTokens, modelName)
+
+		let treePath: AstPath | undefined
+		try {
+			const ast = await getAst(input.filepath, fullPrefix + fullSuffix)
+			if (ast) {
+				treePath = await getTreePathAtCursor(ast, fullPrefix.length)
+			}
+		} catch (e) {
+			console.error("Failed to parse AST", e)
+		}
 
 		return {
+			lang,
+			treePath,
+			workspaceUris,
+			fileContents,
+			fileLines,
+			fullPrefix,
+			fullSuffix,
 			prunedPrefix,
 			prunedSuffix,
+			input,
+			options,
+			modelName,
+			get filepath() {
+				return input.filepath
+			},
+			get pos() {
+				return input.pos
+			},
+			get prunedCaretWindow() {
+				return prunedPrefix + prunedSuffix
+			},
 		}
-	}
-
-	// Fast access
-	get filepath() {
-		return this.input.filepath
-	}
-	get pos() {
-		return this.input.pos
-	}
-
-	get prunedCaretWindow() {
-		return this.prunedPrefix + this.prunedSuffix
-	}
-
-	// Getters for lazy access
-	get fileContents(): string {
-		if (this._fileContents === undefined) {
-			throw new Error("HelperVars must be initialized before accessing fileContents")
-		}
-		return this._fileContents
-	}
-
-	get fileLines(): string[] {
-		if (this._fileLines === undefined) {
-			throw new Error("HelperVars must be initialized before accessing fileLines")
-		}
-		return this._fileLines
-	}
-
-	get fullPrefix(): string {
-		if (this._fullPrefix === undefined) {
-			throw new Error("HelperVars must be initialized before accessing fullPrefix")
-		}
-		return this._fullPrefix
-	}
-
-	get fullSuffix(): string {
-		if (this._fullSuffix === undefined) {
-			throw new Error("HelperVars must be initialized before accessing fullSuffix")
-		}
-		return this._fullSuffix
-	}
-
-	get prunedPrefix(): string {
-		if (this._prunedPrefix === undefined) {
-			throw new Error("HelperVars must be initialized before accessing prunedPrefix")
-		}
-		return this._prunedPrefix
-	}
-
-	get prunedSuffix(): string {
-		if (this._prunedSuffix === undefined) {
-			throw new Error("HelperVars must be initialized before accessing prunedSuffix")
-		}
-		return this._prunedSuffix
-	}
+	},
 }