[clangd] Forward all environment variables along with CLANGD_TRACE to clangd.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@326452 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 2 deletions

diff --git a/clangd/clients/clangd-vscode/src/extension.ts b/clangd/clients/clangd-vscode/src/extension.ts
index 355c855d..50e0522c 100644
--- a/clangd/clients/clangd-vscode/src/extension.ts
+++ b/clangd/clients/clangd-vscode/src/extension.ts
@@ -23,8 +23,10 @@ export function activate(context: vscode.ExtensionContext) {
         args: getConfig<string[]>('arguments')
     };
     const traceFile = getConfig<string>('trace');
-    if (traceFile != null)
-        clangd.options = {env: {CLANGD_TRACE: traceFile}};
+    if (traceFile != '') {
+      const trace = {CLANGD_TRACE : traceFile};
+      clangd.options = {env : {...process.env, ...trace}};
+    }
     const serverOptions: vscodelc.ServerOptions = clangd;
 
     const filePattern: string = '**/*.{' +