From e3d36f681eafc4ecafb9b066470a0b6bd39b17d4 Mon Sep 17 00:00:00 2001 From: David Cai Date: Tue, 10 Jul 2018 10:15:46 -0700 Subject: [PATCH] Debugger accepts array of sourcefiles rather than string --- src/debugger/adapter/DebugAdapter.js | 3 +-- src/debugger/common/types.js | 2 +- src/debugger/mock-ui/UISession.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/debugger/adapter/DebugAdapter.js b/src/debugger/adapter/DebugAdapter.js index 8dcafd5498..7936ac621e 100644 --- a/src/debugger/adapter/DebugAdapter.js +++ b/src/debugger/adapter/DebugAdapter.js @@ -114,10 +114,9 @@ class PrepackDebugSession extends DebugSession { let adapterChannel = new AdapterChannel(inFilePath, outFilePath); this._adapterChannel = adapterChannel; this._registerMessageCallbacks(); - let separatedSourceFiles = args.sourceFile.trim().split(/\s+/g); // Split on all whitespace let launchArgs: PrepackLaunchArguments = { kind: "launch", - sourceFiles: separatedSourceFiles, + sourceFiles: args.sourceFiles, prepackRuntime: args.prepackRuntime, prepackArguments: args.prepackArguments, debugInFilePath: inFilePath, diff --git a/src/debugger/common/types.js b/src/debugger/common/types.js index ccaf3955eb..3df8732142 100644 --- a/src/debugger/common/types.js +++ b/src/debugger/common/types.js @@ -162,7 +162,7 @@ export type EvaluateResult = { export type LaunchRequestArguments = { ...DebugProtocol.LaunchRequestArguments, noDebug?: boolean, - sourceFile: string, + sourceFiles: Array, prepackRuntime: string, prepackArguments: Array, }; diff --git a/src/debugger/mock-ui/UISession.js b/src/debugger/mock-ui/UISession.js index 907bc554cd..a9385913c1 100644 --- a/src/debugger/mock-ui/UISession.js +++ b/src/debugger/mock-ui/UISession.js @@ -157,7 +157,7 @@ export class UISession { _processInitializeResponse(response: DebugProtocol.InitializeResponse) { let launchArgs: LaunchRequestArguments = { prepackRuntime: this._prepackRuntime, - sourceFile: this._sourceFiles.join(" "), + sourceFiles: this._sourceFiles, prepackArguments: this._prepackArguments, }; this._sendLaunchRequest(launchArgs);