Merge branch 'Elpaggio-fix-search-context-provider' into preview

continuedev · Mar 17, 2024 · 8460abb · 8460abb
2 parents 864c34e + e044fff
commit 8460abb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/extensions/vscode/scripts/prepackage.js b/extensions/vscode/scripts/prepackage.js
@@ -317,7 +317,13 @@ if (args[2] === "--target") {
   });
 
   // Copy node_modules for pre-built binaries
-  const NODE_MODULES_TO_COPY = ["esbuild", "@esbuild", "@lancedb", "jsdom"];
+  const NODE_MODULES_TO_COPY = [
+    "esbuild",
+    "@esbuild",
+    "@lancedb",
+    "@vscode",
+    "jsdom",
+  ];
   fs.mkdirSync("out/node_modules", { recursive: true });
 
   await Promise.all(

diff --git a/extensions/vscode/src/ideProtocol.ts b/extensions/vscode/src/ideProtocol.ts
@@ -240,13 +240,15 @@ class VsCodeIde implements IDE {
     const p = child_process.spawn(
       path.join(
         getExtensionUri().fsPath,
+        "out",
         "node_modules",
         "@vscode",
         "ripgrep",
         "bin",
         "rg"
       ),
-      ["-i", "-C", "2", `"${query}"`, "."],
+      ["-i", "-C", "2", "--", `${query}`, "."], //no regex
+      //["-i", "-C", "2", "-e", `${query}`, "."], //use regex
       { cwd: dir }
     );
     let output = "";

diff --git a/gui/src/components/mainInput/MentionList.tsx b/gui/src/components/mainInput/MentionList.tsx
@@ -301,6 +301,7 @@ const MentionList = forwardRef((props: MentionListProps, ref) => {
               } else {
                 props.command({
                   ...querySubmenuItem,
+                  itemType: querySubmenuItem.type,
                   query: queryInputRef.current.value,
                   label: `${querySubmenuItem.label}: ${queryInputRef.current.value}`,
                   itemType: querySubmenuItem.type,