pi-lens 3.3.0 → 3.6.0

package/clients/sg-runner.ts

@@ -168,11 +168,30 @@ export class SgRunner {
 
 			proc.on("close", (code: number | null) => {
 				if (code !== 0 && !stdout.trim()) {
+					// Enhanced error messages for common pattern issues
+					let errorMsg = stderr.trim() || `Exit code ${code}`;
+
+					if (stderr.includes("Multiple AST nodes are detected")) {
+						errorMsg =
+							`Invalid AST pattern: The pattern appears to contain multiple AST nodes or is malformed.\n` +
+							`Common causes:\n` +
+							`  1. Missing parentheses: use it($TEST) not it"test"\n` +
+							`  2. Raw text without structure: use console.log($MSG) not just "console.log"\n` +
+							`  3. Unclosed quotes or brackets\n\n` +
+							`Original error: ${errorMsg}`;
+					} else if (stderr.includes("Cannot parse query")) {
+						errorMsg =
+							`Pattern syntax error: The pattern could not be parsed as valid code.\n` +
+							`Tips:\n` +
+							`  - Patterns must be valid ${args.includes("--lang") ? args[args.indexOf("--lang") + 1] : "language"} syntax\n` +
+							`  - Use metavariables like $NAME, $ARGS for variable parts\n` +
+							`  - Example: 'function $NAME($$$PARAMS) { $$$BODY }'\n\n` +
+							`Original error: ${errorMsg}`;
+					}
+
 					resolve({
 						matches: [],
-						error: stderr.includes("No files found")
-							? undefined
-							: stderr.trim() || `Exit code ${code}`,
+						error: stderr.includes("No files found") ? undefined : errorMsg,
 					});
 					return;
 				}

package/clients/tree-sitter-client.js

@@ -43,6 +43,8 @@ export class TreeSitterClient {
         this.ParserClass = null;
         // biome-ignore lint/suspicious/noExplicitAny: Language loader from module
         this.LanguageLoader = null;
+        // biome-ignore lint/suspicious/noExplicitAny: Compiled query cache by language+pattern hash
+        this.queryCache = new Map();
         this.queryLoader = new TreeSitterQueryLoader();
         this.queriesLoaded = false;
         this.grammarsDir = this.findGrammarsDir();
@@ -347,8 +349,24 @@ export class TreeSitterClient {
         // If we can't convert, return empty to trigger fallback
         return { query: "", metavars: [] };
     }
-    /** Compile a pattern into a tree-sitter Query */
+    /** Generate cache key for compiled query */
+    getQueryCacheKey(pattern, languageId) {
+        // Simple hash for the query string
+        let hash = 0;
+        for (let i = 0; i < pattern.length; i++) {
+            const char = pattern.charCodeAt(i);
+            hash = ((hash << 5) - hash + char) | 0;
+        }
+        return `${languageId}:${hash.toString(36)}`;
+    }
+    /** Compile a pattern into a tree-sitter Query with caching */
     async compileQuery(pattern, languageId) {
+        const cacheKey = this.getQueryCacheKey(pattern, languageId);
+        // Check cache first
+        if (this.queryCache.has(cacheKey)) {
+            this.dbg(`Query cache hit: ${cacheKey}`);
+            return this.queryCache.get(cacheKey);
+        }
         const language = await this.loadLanguage(languageId);
         if (!language) {
             this.dbg(`Could not load language ${languageId}`);
@@ -362,7 +380,10 @@ export class TreeSitterClient {
             // biome-ignore lint/suspicious/noExplicitAny: Language type compatibility
             const query = new Query(language, queryStr);
             this.dbg(`Query compiled with ${query.patternCount} patterns`);
-            return { query, metavars, postFilter, postFilterParams };
+            const result = { query, metavars, postFilter, postFilterParams };
+            // Cache the compiled query
+            this.queryCache.set(cacheKey, result);
+            return result;
         }
         catch (err) {
             this.dbg(`Query compilation failed: ${err}`);

package/clients/tree-sitter-client.ts

@@ -93,6 +93,8 @@ export class TreeSitterClient {
 	private ParserClass: any = null;
 	// biome-ignore lint/suspicious/noExplicitAny: Language loader from module
 	private LanguageLoader: any = null;
+	// biome-ignore lint/suspicious/noExplicitAny: Compiled query cache by language+pattern hash
+	private queryCache = new Map<string, any>();
 	private queryLoader = new TreeSitterQueryLoader();
 	private queriesLoaded = false;
 	private verbose: boolean;
@@ -518,7 +520,18 @@ export class TreeSitterClient {
 		return { query: "", metavars: [] };
 	}
 
-	/** Compile a pattern into a tree-sitter Query */
+	/** Generate cache key for compiled query */
+	private getQueryCacheKey(pattern: string, languageId: string): string {
+		// Simple hash for the query string
+		let hash = 0;
+		for (let i = 0; i < pattern.length; i++) {
+			const char = pattern.charCodeAt(i);
+			hash = ((hash << 5) - hash + char) | 0;
+		}
+		return `${languageId}:${hash.toString(36)}`;
+	}
+
+	/** Compile a pattern into a tree-sitter Query with caching */
 	private async compileQuery(
 		pattern: string,
 		languageId: string,
@@ -528,6 +541,14 @@ export class TreeSitterClient {
 		postFilter?: string;
 		postFilterParams?: unknown;
 	} | null> {
+		const cacheKey = this.getQueryCacheKey(pattern, languageId);
+
+		// Check cache first
+		if (this.queryCache.has(cacheKey)) {
+			this.dbg(`Query cache hit: ${cacheKey}`);
+			return this.queryCache.get(cacheKey);
+		}
+
 		const language = await this.loadLanguage(languageId);
 		if (!language) {
 			this.dbg(`Could not load language ${languageId}`);
@@ -548,7 +569,11 @@ export class TreeSitterClient {
 			// biome-ignore lint/suspicious/noExplicitAny: Language type compatibility
 			const query = new Query(language as any, queryStr);
 			this.dbg(`Query compiled with ${query.patternCount} patterns`);
-			return { query, metavars, postFilter, postFilterParams };
+
+			const result = { query, metavars, postFilter, postFilterParams };
+			// Cache the compiled query
+			this.queryCache.set(cacheKey, result);
+			return result;
 		} catch (err) {
 			this.dbg(`Query compilation failed: ${err}`);
 			return null;