Temporarily fix #5.

hackwaly · Jun 24, 2016 · 5879fa3 · 5879fa3
1 parent 9fbf207
commit 5879fa3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/debug/.vscode/launch.json b/src/debug/.vscode/launch.json
@@ -10,6 +10,9 @@
 			"stopOnEntry": false,
 			"args": [ "--server=4711" ],
 			"sourceMaps": true,
+            "env": {
+                "DEBUG_VSCODE_OCAML": "development"
+            },
 			"outDir": "${workspaceRoot}/../../out/src/debug"
 		}
 	]

diff --git a/src/debug/debug.ts b/src/debug/debug.ts
@@ -61,18 +61,22 @@ class OCamlDebugSession extends DebugSession {
     readUntilPrompt(callback?) {
         return new Promise((resolve) => {
             let buffer = '';
-            let onData = (chunk) => {
-                buffer += chunk.toString('utf-8').replace(/\r\n/g, '\n');
-                if (callback) callback(buffer);
+            let timer;
+            let onTimeout = () => {
                 if (buffer.slice(-6) === '(ocd) ') {
                     let output = buffer.slice(0, -6);
                     output = output.replace(/\n$/, '');
                     log(`ocd: ${JSON.stringify(output)}`);
                     resolve(output);
                     this._debuggerProc.stdout.removeListener('data', onData);
-                    return;
                 }
             };
+            let onData = (chunk) => {
+                buffer += chunk.toString('utf-8').replace(/\r\n/g, '\n');
+                if (callback) callback(buffer);
+                clearTimeout(timer);
+                setTimeout(onTimeout, 64);
+            };
             this._debuggerProc.stdout.on('data', onData);
         });
     }
@@ -163,7 +167,6 @@ class OCamlDebugSession extends DebugSession {
         ocdArgs.push(path.normalize(args.program));
 
         this._launchArgs = args;
-        console.log(ocdArgs);
         this._debuggerProc = child_process.spawn('ocamldebug', ocdArgs);
         this._breakpoints = new Map();