support parsing substring with ' ' space

src/compdb.ts

@@ -16,25 +16,21 @@ interface BaseCompileCommand {
   output?: string;
 }
 
-interface StringCompileCommand extends BaseCompileCommand {
+export interface ArgsCompileCommand extends BaseCompileCommand {
   command: string;
+  arguments?: string[];
 }
 
-interface ArgsCompileCommand extends BaseCompileCommand {
-  arguments: string[];
-}
-
-export type CompileCommand = StringCompileCommand|ArgsCompileCommand;
-
 export class CompilationDatabase {
   private readonly _infoByFilePath: Map<string, ArgsCompileCommand>;
-  constructor(infos: CompileCommand[]) {
+  constructor(infos: ArgsCompileCommand[]) {
     this._infoByFilePath = infos.reduce(
         (acc, cur) => acc.set(util.platformNormalizePath(cur.file), {
           directory: cur.directory,
           file: cur.file,
           output: cur.output,
-          arguments: 'arguments' in cur ? cur.arguments : [...shlex.split(cur.command)],
+          command: cur.command,
+          arguments: cur.arguments ? cur.arguments : [...shlex.split(cur.command)],
         }),
         new Map<string, ArgsCompileCommand>(),
     );
@@ -48,7 +44,7 @@ export class CompilationDatabase {
     }
     const data = await fs.readFile(dbpath);
     try {
-      const content = JSON.parse(data.toString()) as CompileCommand[];
+      const content = JSON.parse(data.toString()) as ArgsCompileCommand[];
       return new CompilationDatabase(content);
     } catch (e) {
       log.warning(localize('error.parsing.compilation.database', 'Error parsing compilation database "{0}": {1}', dbpath, util.errorToString(e)));

src/drivers/driver.ts

@@ -9,7 +9,7 @@ import * as api from '@cmt/api';
 import {CMakeExecutable} from '@cmt/cmake/cmake-executable';
 import * as codepages from '@cmt/code-pages';
 import {ConfigureTrigger} from "@cmt/cmake-tools";
-import {CompileCommand} from '@cmt/compdb';
+import {ArgsCompileCommand} from '@cmt/compdb';
 import {ConfigurationReader} from '@cmt/config';
 import {CMakeBuildConsumer, CompileOutputConsumer} from '@cmt/diagnostics/build';
 import {CMakeOutputConsumer} from '@cmt/diagnostics/cmake';
@@ -22,7 +22,6 @@ import paths from '@cmt/paths';
 import {fs} from '@cmt/pr';
 import * as proc from '@cmt/proc';
 import rollbar from '@cmt/rollbar';
-import * as shlex from '@cmt/shlex';
 import * as telemetry from '@cmt/telemetry';
 import * as util from '@cmt/util';
 import {ConfigureArguments, VariantOption} from '@cmt/variant';
@@ -267,34 +266,29 @@ export abstract class CMakeDriver implements vscode.Disposable {
    * Launch the given compilation command in an embedded terminal.
    * @param cmd The compilation command from a compilation database to run
    */
-  runCompileCommand(cmd: CompileCommand): vscode.Terminal {
-    if ('command' in cmd) {
-      const args = [...shlex.split(cmd.command)];
-      return this.runCompileCommand({directory: cmd.directory, file: cmd.file, arguments: args});
-    } else {
-      const env = this.getEffectiveSubprocessEnvironment();
-      const key = `${cmd.directory}${JSON.stringify(env)}`;
-      let existing = this._compileTerms.get(key);
-      if (existing && this.config.clearOutputBeforeBuild) {
-        this._compileTerms.delete(key);
-        existing.dispose();
-        existing = undefined;
-      }
-      if (!existing) {
-        const shellPath = process.platform === 'win32' ? 'cmd.exe' : undefined;
-        const term = vscode.window.createTerminal({
-          name: localize('file.compilation', 'File Compilation'),
-          cwd: cmd.directory,
-          env,
-          shellPath,
-        });
-        this._compileTerms.set(key, term);
-        existing = term;
-      }
-      existing.show();
-      existing.sendText(cmd.arguments.map(s => shlex.quote(s)).join(' ') + '\r\n');
-      return existing;
+  runCompileCommand(cmd: ArgsCompileCommand): vscode.Terminal {
+    const env = this.getEffectiveSubprocessEnvironment();
+    const key = `${cmd.directory}${JSON.stringify(env)}`;
+    let existing = this._compileTerms.get(key);
+    if (existing && this.config.clearOutputBeforeBuild) {
+      this._compileTerms.delete(key);
+      existing.dispose();
+      existing = undefined;
+    }
+    if (!existing) {
+      const shellPath = process.platform === 'win32' ? 'cmd.exe' : undefined;
+      const term = vscode.window.createTerminal({
+        name: localize('file.compilation', 'File Compilation'),
+        cwd: cmd.directory,
+        env,
+        shellPath,
+      });
+      this._compileTerms.set(key, term);
+      existing = term;
     }
+    existing.show();
+    existing.sendText(cmd.command + '\r\n');
+    return existing;
   }
 
   /**

src/shlex.ts

@@ -1,5 +1,5 @@
 export interface ShlexOptions {
-  mode: 'windows'|'posix';
+  mode: 'windows' | 'posix';
 }
 
 export function* split(str: string, opt?: ShlexOptions): Iterable<string> {
@@ -11,9 +11,10 @@ export function* split(str: string, opt?: ShlexOptions): Iterable<string> {
   if (opt.mode == 'posix') {
     escapeChars += '\\';
   }
-  let quoteChar: string|undefined;
-  let escapeChar: string|undefined;
-  let token: string|undefined;
+  let quoteChar: string | undefined;
+  let escapeChar: string | undefined;
+  let token: string | undefined;
+  let subquote: boolean = false;
   for (let i = 0; i < str.length; ++i) {
     const char = str.charAt(i);
     if (escapeChar) {
@@ -41,26 +42,38 @@ export function* split(str: string, opt?: ShlexOptions): Iterable<string> {
 
     if (quoteChar) {
       if (char === quoteChar) {
+        // Reached the end of a sub-quoted token.
+        if (subquote) {
+          subquote = false;
+          token = (token || '') + char;
+        }
         // Reached the end of a quoted token.
         quoteChar = undefined;
         continue;
       }
-
       // Another quoted char
       token = (token || '') + char;
       continue;
     }
 
     if (quoteChars.includes(char)) {
+      // Beginning of a sub-quoted token
+      if (i > 0 && (opt.mode === 'posix' ? (str.substring(i - 1, i + 1) === "\\\'" || str.substring(i - 1, i + 1) === "\\\"") : str.substring(i - 1, i + 1) === "\\\"")) {
+        subquote = true;
+        quoteChar = char;
+        // Accumulate
+        token = (token || '') + char;
+        continue;
+      }
       // Beginning a new quoted token
       quoteChar = char;
       token = '';
       continue;
     }
 
-    if (/[\t \n\r\f]/.test(char)) {
+    if (!quoteChar && /[\t \n\r\f]/.test(char)) {
       if (token !== undefined) {
-        yield token;
+        yield token.includes(' ') ? `"${token}"` : token;
       }
       token = undefined;
       continue;
@@ -71,7 +84,7 @@ export function* split(str: string, opt?: ShlexOptions): Iterable<string> {
   }
 
   if (token !== undefined) {
-    yield token;
+    yield token.includes(' ') ? `"${token}"` : token;
   }
 }