fix: unify differnet codepath

Author: HerringtonDarkholme

src/extension/common.ts

@@ -42,20 +42,29 @@ export function resolveBinary() {
   return config
 }
 
-export async function testBinaryExist(command: string) {
+// see https://github.com/ast-grep/ast-grep-vscode/pull/448 for more information
+// TL;DR: windows needs shell: true for non-exe command and quotation for command with space
+export function normalizeCommandForWindows(command: string) {
   // windows user may input space in command
   const normalizedCommand =
     /\s/.test(command) && !command.endsWith('.exe') ? `"${command}"` : command
+  return {
+    normalizedCommand,
+    shell:
+      process.platform === 'win32' && !command.toLowerCase().endsWith('.exe'),
+  }
+}
+
+export async function testBinaryExist(command: string) {
   const uris = workspace.workspaceFolders?.map(i => i.uri?.fsPath) ?? []
+  const { normalizedCommand, shell } = normalizeCommandForWindows(command)
   return new Promise(r => {
     execFile(
       normalizedCommand,
       ['-h'],
       {
+        shell,
         // for windows
-        shell:
-          process.platform === 'win32' &&
-          !command.toLowerCase().endsWith('.exe'),
         cwd: uris[0],
       },
       err => {

src/extension/search.ts

@@ -2,7 +2,12 @@ import path from 'node:path'
 import { type ExtensionContext, commands, workspace, window } from 'vscode'
 import { type ChildProcessWithoutNullStreams, spawn } from 'node:child_process'
 
-import { parentPort, resolveBinary, streamedPromise } from './common'
+import {
+  parentPort,
+  resolveBinary,
+  streamedPromise,
+  normalizeCommandForWindows,
+} from './common'
 import type { SgSearch, DisplayResult, SearchQuery } from '../types'
 
 /**
@@ -114,9 +119,7 @@ export function buildCommand(query: SearchQuery) {
     return
   }
   const command = resolveBinary()
-  // windows user may input space in command
-  const normalizedCommand =
-    /\s/.test(command) && !command.endsWith('.exe') ? `"${command}"` : command
+  const { normalizedCommand, shell } = normalizeCommandForWindows(command)
   const uris = workspace.workspaceFolders?.map(i => i.uri?.fsPath) ?? []
   const args = ['run', '--pattern', pattern, '--json=stream']
   if (query.selector) {
@@ -141,9 +144,7 @@ export function buildCommand(query: SearchQuery) {
   console.debug('running', query, normalizedCommand, args)
   // TODO: multi-workspaces support
   return spawn(normalizedCommand, args, {
-    // for windows
-    shell:
-      process.platform === 'win32' && !command.toLowerCase().endsWith('.exe'),
+    shell,
     cwd: uris[0],
   })
 }