Merge pull request #2839 from Kilo-Org/mark/move-helper-methods

move autocompletion helper methods to specific strategies

Author: markijbema

src/services/ghost/strategies/BasePromptStrategy.ts

@@ -135,36 +135,6 @@ EXAMPLE:
 		return result
 	}
 
-	/**
-	 * Gets surrounding code context (lines before and after cursor)
-	 */
-	protected getSurroundingCode(
-		document: TextDocument,
-		range: Range,
-		linesBefore: number = 10,
-		linesAfter: number = 10,
-	): { before: string; after: string; currentLine: string } {
-		const currentLineNum = range.start.line
-		const startLine = Math.max(0, currentLineNum - linesBefore)
-		const endLine = Math.min(document.lineCount - 1, currentLineNum + linesAfter)
-
-		let before = ""
-		let after = ""
-		const currentLine = document.lineAt(currentLineNum).text
-
-		// Get lines before cursor
-		for (let i = startLine; i < currentLineNum; i++) {
-			before += document.lineAt(i).text + "\n"
-		}
-
-		// Get lines after cursor
-		for (let i = currentLineNum + 1; i <= endLine; i++) {
-			after += document.lineAt(i).text + "\n"
-		}
-
-		return { before, after, currentLine }
-	}
-
 	/**
 	 * Formats the document with cursor marker for the prompt
 	 */
@@ -176,64 +146,4 @@ EXAMPLE:
 ${codeWithCursor}
 \`\`\``
 	}
-
-	/**
-	 * Gets the file path from the document
-	 */
-	protected getFilePath(document: TextDocument): string {
-		return document.uri.toString()
-	}
-
-	/**
-	 * Formats selected text for inclusion in prompts
-	 */
-	protected formatSelectedText(document: TextDocument, range: Range): string {
-		if (range.isEmpty) return ""
-
-		const selectedText = document.getText(range)
-		const startLine = range.start.line + 1
-		const endLine = range.end.line + 1
-
-		return `## Selected Code (Lines ${startLine}-${endLine})
-\`\`\`${document.languageId}
-${selectedText}
-\`\`\``
-	}
-
-	/**
-	 * Formats recent operations for inclusion in prompts
-	 */
-	protected formatRecentOperations(operations: any[]): string {
-		if (!operations || operations.length === 0) return ""
-
-		let result = "## Recent Actions\n"
-		operations.slice(0, 5).forEach((op, index) => {
-			result += `${index + 1}. ${op.description}\n`
-			if (op.content) {
-				result += `   \`\`\`\n   ${op.content}\n   \`\`\`\n`
-			}
-		})
-
-		return result
-	}
-
-	/**
-	 * Helper to check if a line appears to be incomplete
-	 */
-	protected isIncompleteStatement(line: string): boolean {
-		const trimmed = line.trim()
-
-		// Check for common incomplete patterns
-		const incompletePatterns = [
-			/^(if|else if|while|for|switch|try|catch)\s*\(.*\)\s*$/, // Control structures without body
-			/^(function|class|interface|type|enum)\s+\w+.*[^{]$/, // Declarations without body
-			/[,\+\-\*\/\=\|\&]\s*$/, // Operators at end
-			/^(const|let|var)\s+\w+\s*=\s*$/, // Variable declaration without value
-			/\.\s*$/, // Property access incomplete
-			/\(\s*$/, // Opening parenthesis
-			/^\s*\.\w*$/, // Method chaining incomplete
-		]
-
-		return incompletePatterns.some((pattern) => pattern.test(trimmed))
-	}
 }

src/services/ghost/strategies/NewLineCompletionStrategy.ts

@@ -270,4 +270,71 @@ Important:
 		}
 		return false
 	}
+
+	/**
+	 * Formats recent operations for inclusion in prompts
+	 */
+	private formatRecentOperations(operations: any[]): string {
+		if (!operations || operations.length === 0) return ""
+
+		let result = "## Recent Actions\n"
+		operations.slice(0, 5).forEach((op, index) => {
+			result += `${index + 1}. ${op.description}\n`
+			if (op.content) {
+				result += `   \`\`\`\n   ${op.content}\n   \`\`\`\n`
+			}
+		})
+
+		return result
+	}
+
+	/**
+	 * Helper to check if a line appears to be incomplete
+	 */
+	private isIncompleteStatement(line: string): boolean {
+		const trimmed = line.trim()
+
+		// Check for common incomplete patterns
+		const incompletePatterns = [
+			/^(if|else if|while|for|switch|try|catch)\s*\(.*\)\s*$/, // Control structures without body
+			/^(function|class|interface|type|enum)\s+\w+.*[^{]$/, // Declarations without body
+			/[,\+\-\*\/\=\|\&]\s*$/, // Operators at end
+			/^(const|let|var)\s+\w+\s*=\s*$/, // Variable declaration without value
+			/\.\s*$/, // Property access incomplete
+			/\(\s*$/, // Opening parenthesis
+			/^\s*\.\w*$/, // Method chaining incomplete
+		]
+
+		return incompletePatterns.some((pattern) => pattern.test(trimmed))
+	}
+
+	/**
+	 * Gets surrounding code context (lines before and after cursor)
+	 */
+	private getSurroundingCode(
+		document: TextDocument,
+		range: Range,
+		linesBefore: number = 10,
+		linesAfter: number = 10,
+	): { before: string; after: string; currentLine: string } {
+		const currentLineNum = range.start.line
+		const startLine = Math.max(0, currentLineNum - linesBefore)
+		const endLine = Math.min(document.lineCount - 1, currentLineNum + linesAfter)
+
+		let before = ""
+		let after = ""
+		const currentLine = document.lineAt(currentLineNum).text
+
+		// Get lines before cursor
+		for (let i = startLine; i < currentLineNum; i++) {
+			before += document.lineAt(i).text + "\n"
+		}
+
+		// Get lines after cursor
+		for (let i = currentLineNum + 1; i <= endLine; i++) {
+			after += document.lineAt(i).text + "\n"
+		}
+
+		return { before, after, currentLine }
+	}
 }

src/services/ghost/strategies/UserRequestStrategy.ts

@@ -1,3 +1,4 @@
+import type { Range, TextDocument } from "vscode"
 import { GhostSuggestionContext } from "../types"
 import { UseCaseType } from "../types/PromptStrategy"
 import { BasePromptStrategy } from "./BasePromptStrategy"
@@ -154,4 +155,27 @@ Common Request Patterns:
 		// Use the standard prompt building
 		return super.getUserPrompt(context)
 	}
+
+	/**
+	 * Gets the file path from the document
+	 */
+	private getFilePath(document: TextDocument): string {
+		return document.uri.toString()
+	}
+
+	/**
+	 * Formats selected text for inclusion in prompts
+	 */
+	private formatSelectedText(document: TextDocument, range: Range): string {
+		if (range.isEmpty) return ""
+
+		const selectedText = document.getText(range)
+		const startLine = range.start.line + 1
+		const endLine = range.end.line + 1
+
+		return `## Selected Code (Lines ${startLine}-${endLine})
+\`\`\`${document.languageId}
+${selectedText}
+\`\`\``
+	}
 }