implement maxResults param for getFileResults ide message

Author: RomneyDa

core/index.d.ts

@@ -783,7 +783,7 @@ export interface IDE {
 
   getSearchResults(query: string): Promise<string>;
 
-  getFileResults(pattern: string): Promise<string[]>;
+  getFileResults(pattern: string, maxResults?: number): Promise<string[]>;
 
   subprocess(command: string, cwd?: string): Promise<[string, string]>;
 

core/protocol/ide.ts

@@ -30,7 +30,7 @@ export type ToIdeFromWebviewOrCoreProtocol = {
   openUrl: [string, void];
   runCommand: [{ command: string; options?: TerminalOptions }, void];
   getSearchResults: [{ query: string }, string];
-  getFileResults: [{ pattern: string }, string[]];
+  getFileResults: [{ pattern: string; maxResults?: number }, string[]];
   subprocess: [{ command: string; cwd?: string }, [string, string]];
   saveFile: [{ filepath: string }, void];
   fileExists: [{ filepath: string }, boolean];

core/protocol/messenger/reverseMessageIde.ts

@@ -163,7 +163,7 @@ export class ReverseMessageIde {
     });
 
     this.on("getFileResults", (data) => {
-      return this.ide.getFileResults(data.pattern);
+      return this.ide.getFileResults(data.pattern, data.maxResults);
     });
 
     this.on("getProblems", (data) => {

core/util/filesystem.ts

@@ -238,7 +238,10 @@ class FileSystemIde implements IDE {
     return "";
   }
 
-  async getFileResults(pattern: string): Promise<string[]> {
+  async getFileResults(
+    pattern: string,
+    maxResults?: number,
+  ): Promise<string[]> {
     return [];
   }
 

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/continue/IdeProtocolClient.kt

@@ -365,7 +365,7 @@ class IdeProtocolClient(
                             dataElement.toString(),
                             GetFileResultsParams::class.java
                         )
-                        val results = ide.getFileResults(params.pattern)
+                        val results = ide.getFileResults(params.pattern, params.maxResults)
                         respond(results)
                     }
 

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/continue/IntelliJIde.kt

@@ -315,20 +315,26 @@ class IntelliJIDE(
         return getOpenFiles()
     }
 
-    override suspend fun getFileResults(pattern: String): List<String> {
+    override suspend fun getFileResults(pattern: String, maxResults: Int?): List<String> {
         val ideInfo = this.getIdeInfo()
         if (ideInfo.remoteName == "local") {
             try {
-                val command = GeneralCommandLine(
+                var commandArgs = mutableListOf<String>(
                     ripgrep,
                     "--files",
                     "--iglob",
                     pattern,
                     "--ignore-file",
                     ".continueignore",
                     "--ignore-file",
-                    ".gitignore",
+                    ".gitignore"
                 )
+                if (maxResults != null) {
+                    commandArgs.add("--max-count")
+                    commandArgs.add(maxResults.toString())
+                }
+
+                val command = GeneralCommandLine(commandArgs)
 
                 command.setWorkDirectory(project.basePath)
                 val results = ExecUtil.execAndGetOutput(command).stdout

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/protocol/ide.kt

@@ -23,7 +23,7 @@ typealias getTagsParams = String
 
 data class GetSearchResultsParams(val query: String)
 
-data class GetFileResultsParams(val pattern: String)
+data class GetFileResultsParams(val pattern: String, val maxResults: Int?)
 
 data class SaveFileParams(val filepath: String)
 

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/types.kt

@@ -159,7 +159,7 @@ interface IDE {
 
     suspend fun getSearchResults(query: String): String
 
-    suspend fun getFileResults(pattern: String): List<String>
+    suspend fun getFileResults(pattern: String, maxResults: Int?): List<String>
 
     // Note: This should be a `Pair<String, String>` but we use `List<Any>` because the keys of `Pair`
     // will serialize to `first and `second` rather than `0` and `1` like in JavaScript

extensions/vscode/src/VsCodeIde.ts

@@ -433,8 +433,10 @@ class VsCodeIde implements IDE {
     });
   }
 
-  async getFileResults(pattern: string): Promise<string[]> {
-    const MAX_FILE_RESULTS = 200;
+  async getFileResults(
+    pattern: string,
+    maxResults?: number,
+  ): Promise<string[]> {
     if (vscode.env.remoteName) {
       // TODO better tests for this remote search implementation
       // throw new Error("Ripgrep not supported, this workspace is remote");
@@ -501,7 +503,7 @@ class VsCodeIde implements IDE {
       const results = await vscode.workspace.findFiles(
         pattern,
         ignoreGlobs.size ? `{${ignoreGlobsArray.join(",")}}` : null,
-        MAX_FILE_RESULTS,
+        maxResults,
       );
       return results.map((result) => vscode.workspace.asRelativePath(result));
     } else {
@@ -515,12 +517,20 @@ class VsCodeIde implements IDE {
           ".continueignore",
           "--ignore-file",
           ".gitignore",
+          ...(maxResults ? ["--max-count", String(maxResults)] : []),
         ]);
 
         results.push(dirResults);
       }
 
-      return results.join("\n").split("\n").slice(0, MAX_FILE_RESULTS);
+      const allResults = results.join("\n").split("\n");
+      if (maxResults) {
+        // In the case of multiple workspaces, maxResults will be applied to each workspace
+        // And then the combined results will also be truncated
+        return allResults.slice(0, maxResults);
+      } else {
+        return allResults;
+      }
     }
   }
 

extensions/vscode/src/extension/VsCodeMessenger.ts

@@ -324,7 +324,7 @@ export class VsCodeMessenger {
       return ide.getSearchResults(msg.data.query);
     });
     this.onWebviewOrCore("getFileResults", async (msg) => {
-      return ide.getFileResults(msg.data.pattern);
+      return ide.getFileResults(msg.data.pattern, msg.data.maxResults);
     });
     this.onWebviewOrCore("subprocess", async (msg) => {
       return ide.subprocess(msg.data.command, msg.data.cwd);