From bebbfa1a29062a3e9304c80080316d8c4937e5bc Mon Sep 17 00:00:00 2001
From: vsrs <vit@conrlab.com>
Date: Fri, 3 Jul 2020 14:56:30 +0300
Subject: Fix workspaceRoot

---
 editors/code/src/run.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'editors')

diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts
index c09954614..de68f27ae 100644
--- a/editors/code/src/run.ts
+++ b/editors/code/src/run.ts
@@ -103,6 +103,8 @@ export function prepareEnv(runnable: ra.Runnable, runnableEnvCfg: RunnableEnvCfg
         env["UPDATE_EXPECT"] = "1";
     }
 
+    Object.assign(env, process.env as { [key: string]: string });
+
     if (runnableEnvCfg) {
         if (Array.isArray(runnableEnvCfg)) {
             for (const it of runnableEnvCfg) {
@@ -135,7 +137,7 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
         type: tasks.TASK_TYPE,
         command: args[0], // run, test, etc...
         args: args.slice(1),
-        cwd: runnable.args.workspaceRoot,
+        cwd: runnable.args.workspaceRoot || ".",
         env: prepareEnv(runnable, config.runnableEnv),
     };
 
-- 
cgit v1.2.3