Add multiple source handling to extension (#34)

IoT.js-VSCode-DCO-1.0-Signed-off-by: Tibor Dusnoki tdusnoki@inf.u-szeged.hu

Author: tdusnoki

README.md

@@ -180,6 +180,8 @@ absolute path to executable (e.g.:/path/to/iotjs/build/x86_64-linux/debug/bin/io
 After the engine is running you can start the debug session inside the extension host by pressing the `F5` key or click on the green triangle in the debug panel.
 If the client (VSCode extension) is connected then you have to see that file which is running inside the engine or if you started the engine in waiting mode you will get a prompt window where you can select that file what you want to running and then you can see where the execution is stopped. Now you can use the VSCode debug action bar to control the debug session.
 
+***Important note:*** When sending multiple sources to debug server, be aware that IoT.js compiles them in the order they are received, so the files containing `require` should be sent first and the files used by them after.
+
 ***Note:*** If you using the development version of this extension, you have to run the following commands for the first time in the extension directory:
 ```bash
 # Install the node modules

src/IotjsDebugger.ts

@@ -532,7 +532,10 @@ class IotjsDebugSession extends DebugSession {
         this._protocolhandler.sendClientSource(args.program.name, args.program.source)
           .then(() => {
             this.log('Source has been sent to the engine.', LOG_LEVEL.SESSION);
-            this._sourceSendingOptions.state = SOURCE_SENDING_STATES.LAST_SENT;
+            this._sourceSendingOptions.state = SOURCE_SENDING_STATES.WAITING;
+            if (args.program.isLast) {
+              this._sourceSendingOptions.state = SOURCE_SENDING_STATES.LAST_SENT;
+            }
             this.sendResponse(response);
           })
           .catch(error => {
@@ -630,8 +633,10 @@ class IotjsDebugSession extends DebugSession {
     this.log('onWaitForSource', LOG_LEVEL.SESSION);
 
     if (this._sourceSendingOptions.state === SOURCE_SENDING_STATES.NOP) {
+      await this.sendEvent(new Event('readSources'));
       this._sourceSendingOptions.state = SOURCE_SENDING_STATES.WAITING;
-      this.sendEvent(new Event('waitForSource'));
+    } else if (this._sourceSendingOptions.state === SOURCE_SENDING_STATES.WAITING) {
+      this.sendEvent(new Event('sendNextSource'));
     } else if (this._sourceSendingOptions.state === SOURCE_SENDING_STATES.LAST_SENT) {
       if (!this._sourceSendingOptions.contextReset) {
         this._sourceSendingOptions.state = SOURCE_SENDING_STATES.NOP;

src/extension.ts

@@ -31,6 +31,8 @@ let lastModified = {
   mtime: undefined
 };
 
+let sources: string[];
+let pathArray = [];
 const defaultModules = [{
   link: 'process',
   mod: 'process',
@@ -129,36 +131,52 @@ const getListOfFiles = (): string[] => {
   return wsFiles;
 };
 
-const getProgramName = (): Thenable<string> => {
+const getProgramName = (): Thenable<string[]> => {
   return vscode.window.showQuickPick(getListOfFiles(), {
     placeHolder: 'Select a file you want to debug',
-    ignoreFocusOut: true
+    canPickMany: true,
+    ignoreFocusOut: true,
+    onDidSelectItem: item => {
+      if (pathArray.indexOf(item.toString()) === -1) {
+        pathArray.push(item.toString());
+      } else {
+        pathArray.splice(pathArray.indexOf(item.toString()), 1);
+      }
+    }
   });
 };
 
-const getProgramSource = (path: string): string => {
-  return fs.readFileSync(path, {
-    encoding: 'utf8',
-    flag: 'r'
+const getProgramSource = (path: string[]): string[] => {
+  return path.map((p) => {
+    return fs.readFileSync(p, {
+      encoding: 'utf8',
+      flag: 'r'
+    });
   });
+
 };
 
 const processCustomEvent = async (e: vscode.DebugSessionCustomEvent): Promise<any> => {
   switch (e.event) {
-    case 'waitForSource': {
+    case 'readSources': {
       if (vscode.debug.activeDebugSession) {
-        const pathName = await getProgramName().then(path => path);
-        const source = getProgramSource(pathName);
-
-        vscode.debug.activeDebugSession.customRequest('sendSource', {
-          program: {
-            name: pathName.split(path.delimiter).pop(),
-            source
-          }
-        });
+        await getProgramName().then(path => path);
+        sources = getProgramSource(pathArray);
+        e.event = 'sendNextSource';
+        processCustomEvent(e);
       }
       return true;
     }
+    case 'sendNextSource': {
+      vscode.debug.activeDebugSession.customRequest('sendSource', {
+        program: {
+          name: pathArray.pop(),
+          source: sources.pop(),
+          isLast: sources.length === 0
+        }
+      });
+      return true;
+    }
     default:
       return undefined;
   }