2 files changed, 2 insertions, 8 deletions

diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index 3589edcee..c4df24c79 100644
--- a/editors/code/src/commands/runnables.ts
+++ b/editors/code/src/commands/runnables.ts
@@ -17,6 +17,7 @@ interface Runnable {
     bin: string;
     args: string[];
     env: { [index: string]: string };
+    cwd?: string;
 }
 
 class RunnableQuickPick implements vscode.QuickPickItem {
@@ -49,7 +50,7 @@ function createTask(spec: Runnable): vscode.Task {
     };
 
     const execOption: vscode.ShellExecutionOptions = {
-        cwd: '.',
+        cwd: spec.cwd || '.',
         env: definition.env
     };
     const exec = new vscode.ShellExecution(
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index f319f148a..5e9a19340 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -17,13 +17,6 @@ export class Server {
         let folder: string = '.';
         if (workspace.workspaceFolders !== undefined) {
             folder = workspace.workspaceFolders[0].uri.fsPath.toString();
-
-            if (workspace.workspaceFolders.length > 1) {
-                // Tell the user that we do not support multi-root workspaces yet
-                window.showWarningMessage(
-                    'Multi-root workspaces are not currently supported'
-                );
-            }
         }
 
         const run: lc.Executable = {