Merge pull request #241 from forcedotcom/release-1.7.0

RELEASE @W-18394670@ Conducting v1.7.0 release

Author: jfeingold35

SHA256.md

@@ -15,7 +15,7 @@ make sure that their SHA values match the values in the list below.
 shasum -a 256 <location_of_the_downloaded_file>
 
 3. Confirm that the SHA in your output matches the value in this list of SHAs.
-   fc2d37a4f1c59206be01f30ff9384ec202632b7bb8d95b4776c4d75469377ff4  ./extensions/sfdx-code-analyzer-vscode-1.6.0.vsix
+   be09cbce3b4897ea3bad5a1bdffbf15835a6382d6e771ac595bec6230485f6c6  ./extensions/sfdx-code-analyzer-vscode-1.6.1.vsix
 4. Change the filename extension for the file that you downloaded from .zip to
    .vsix.
 

package-lock.json

@@ -13,7 +13,7 @@
         "color": "#ECECEC",
         "theme": "light"
     },
-    "version": "1.6.1",
+    "version": "1.7.0",
     "publisher": "salesforce",
     "license": "BSD-3-Clause",
     "engines": {

package.json

@@ -58,6 +58,8 @@ export interface CliCommandExecutor {
     exec(command: string, args: string[], options?: ExecOptions): Promise<CommandOutput>
 }
 
+const IS_WINDOWS: boolean = process.platform.startsWith('win');
+
 export class CliCommandExecutorImpl implements CliCommandExecutor {
     private readonly logger: Logger;
 
@@ -104,12 +106,11 @@ export class CliCommandExecutorImpl implements CliCommandExecutor {
 
             let childProcess: cp.ChildProcessWithoutNullStreams;
             try {
-                childProcess = cp.spawn(command, args, {
-                    shell: process.platform.startsWith('win'), // Use shell on Windows machines
-                });
+                childProcess = IS_WINDOWS ? cp.spawn(command, wrapArgsWithSpacesWithQuotes(args), {shell: true}) :
+                    cp.spawn(command, args);
             } catch (err) {
                 this.logger.logAtLevel(vscode.LogLevel.Error, `Failed to execute the following command:\n` +
-                    indent(`${command} ${args.map(arg => arg.includes(' ') ? `"${arg}"` : arg).join(' ')}`) + `\n\n` +
+                    indent(`${command} ${wrapArgsWithSpacesWithQuotes(args).join(' ')}`) + `\n\n` +
                     'Error Thrown:\n' + indent(getErrorMessageWithStack(err)));
                 output.stderr = getErrorMessageWithStack(err);
                 output.exitCode = 127;
@@ -123,7 +124,7 @@ export class CliCommandExecutorImpl implements CliCommandExecutor {
             let combinedOut: string = '';
 
             this.logger.logAtLevel(logLevel, `Executing with background process (${childProcess.pid}):\n` +
-                indent(`${command} ${args.map(arg => arg.includes(' ') ? `"${arg}"` : arg).join(' ')}`));
+                indent(`${command} ${wrapArgsWithSpacesWithQuotes(args).join(' ')}`));
 
             childProcess.stdout.on('data', data => {
                 output.stdout += data;
@@ -134,8 +135,10 @@ export class CliCommandExecutorImpl implements CliCommandExecutor {
                 combinedOut += data;
             });
             childProcess.on('error', (err: Error) => {
+                const errMsg: string = getErrorMessageWithStack(err);
                 output.exitCode = 127; // 127 signifies that the command could not be executed
-                output.stderr += getErrorMessageWithStack(err);
+                output.stderr += errMsg;
+                combinedOut += errMsg;
                 resolve(output);
                 this.logger.logAtLevel(logLevel,
                     `Error from background process (${childProcess.pid}):\n${indent(combinedOut)}`);
@@ -149,3 +152,7 @@ export class CliCommandExecutorImpl implements CliCommandExecutor {
         });
     }
 }
+
+function wrapArgsWithSpacesWithQuotes(args: string[]): string[] {
+    return args.map(arg => arg.includes(' ') ? `"${arg}"` : arg);
+}

src/lib/cli-commands.ts

@@ -70,7 +70,7 @@ suite('Extension Test Suite', () => {
         });
 
         suite('sfca.runOnActiveFile', () => {
-            const fileUri: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder-a', 'MyClassA1.cls'));
+            const fileUri: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder a', 'MyClassA1.cls'));
 
             setup(async function() {
                 // Open a file in the editor.
@@ -119,7 +119,7 @@ suite('Extension Test Suite', () => {
         suite('sfca.runOnSelected', () => {
             suite('One file selected', () => {
                 // Get the URI for a single file.
-                const targetUri: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder-a', 'MyClassA1.cls'));
+                const targetUri: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder a', 'MyClassA1.cls'));
 
                 teardown(() => {
                     Sinon.restore();
@@ -169,8 +169,8 @@ suite('Extension Test Suite', () => {
 
             suite('Multiple files selected', () => {
                 // Get the URIs for two separate files.
-                const targetUri1: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder-a', 'MyClassA1.cls'));
-                const targetUri2: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder-a', 'MyClassA2.cls'));
+                const targetUri1: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder a', 'MyClassA1.cls'));
+                const targetUri2: vscode.Uri = vscode.Uri.file(path.join(codeFixturesPath, 'folder a', 'MyClassA2.cls'));
 
                 teardown(() => {
                     Sinon.restore();