Ensure node-based debug adapter spawn same node as Theia

Signed-off-by: Eyal Barlev <eyal.barlev@sap.com>
eclipse-theia · Jun 17, 2019 · 5c7fbc8 · 5c7fbc8
1 parent 6b8e776
commit 5c7fbc8
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/packages/debug/src/node/debug-adapter-factory.ts b/packages/debug/src/node/debug-adapter-factory.ts
@@ -35,7 +35,8 @@ import {
     CommunicationProvider,
     DebugAdapterSession,
     DebugAdapterSessionFactory,
-    DebugAdapterFactory
+    DebugAdapterFactory,
+    DebugAdapterSpawnExecutable
 } from '../common/debug-model';
 import { DebugAdapterSessionImpl } from './debug-adapter-session';
 
@@ -66,6 +67,12 @@ export class LaunchBasedDebugAdapterFactory implements DebugAdapterFactory {
         const isForkOptions = (forkOptions: RawForkOptions | any): forkOptions is RawForkOptions =>
             !!forkOptions && !!forkOptions.modulePath;
 
+        if (!isForkOptions(executable)) {
+            if ((executable as DebugAdapterSpawnExecutable).command === 'node') {
+                (executable as DebugAdapterSpawnExecutable).command = process.execPath;
+            }
+        }
+
         const processOptions: RawProcessOptions | RawForkOptions = { ...executable };
         const options = { stdio: ['pipe', 'pipe', 2] };