Merge remote-tracking branch 'upstream/master'

DonJayamanne · DonJayamanne · commit ae22dd4efa8b · 2017-12-12T14:29:54.000-08:00
* upstream/master: Pass execution arguments to linter when run as a stand alone executable (#406)
diff --git a/src/client/linters/baseLinter.ts b/src/client/linters/baseLinter.ts
@@ -126,7 +126,7 @@ export abstract class BaseLinter {
         } else {
             const env = await this.serviceContainer.get<IEnvironmentVariablesProvider>(IEnvironmentVariablesProvider).getEnvironmentVariables(true, document.uri);
             const executionService = this.serviceContainer.get<IProcessService>(IProcessService);
-            executionPromise = executionService.exec(executionInfo.execPath!, args, { cwd, env, token: cancellation, mergeStdOutErr: true });
+            executionPromise = executionService.exec(executionInfo.execPath!, executionInfo.args, { cwd, env, token: cancellation, mergeStdOutErr: true });
         }
         try {
             const result = await executionPromise;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ export abstract class BaseLinter {`
`126`	`126`	`} else {`
`127`	`127`	`const env = await this.serviceContainer.get<IEnvironmentVariablesProvider>(IEnvironmentVariablesProvider).getEnvironmentVariables(true, document.uri);`
`128`	`128`	`const executionService = this.serviceContainer.get<IProcessService>(IProcessService);`
`129`		`- executionPromise = executionService.exec(executionInfo.execPath!, args, { cwd, env, token: cancellation, mergeStdOutErr: true });`
	`129`	`+ executionPromise = executionService.exec(executionInfo.execPath!, executionInfo.args, { cwd, env, token: cancellation, mergeStdOutErr: true });`
`130`	`130`	`}`
`131`	`131`	`try {`
`132`	`132`	`const result = await executionPromise;`