stack error

Author: tangzx

src/main/java/com/tang/intellij/lua/debugger/remote/commands/DebugCommand.java

@@ -27,13 +27,14 @@
  */
 public abstract class DebugCommand {
 
-    protected LuaRemoteDebugProcess debugProcess;
+    LuaRemoteDebugProcess debugProcess;
 
     public void setDebugProcess(LuaRemoteDebugProcess process) {
         debugProcess = process;
     }
 
     public abstract void write(MobServer writer) throws IOException;
-    public abstract boolean handle(String data);
+    public abstract int handle(String data);
     public abstract int getRequireRespLines();
+    public abstract boolean isFinished();
 }

src/main/java/com/tang/intellij/lua/debugger/remote/commands/DefaultCommand.java

@@ -29,7 +29,7 @@ public class DefaultCommand extends DebugCommand {
 
     private String commandline;
     int requireRespLines;
-    private int handleLines;
+    int handleLines;
 
     public DefaultCommand(String commandline) {
         this(commandline, 1);
@@ -46,9 +46,17 @@ public void write(MobServer writer) throws IOException {
     }
 
     @Override
-    public final boolean handle(String data) {
-        handle(handleLines, data);
-        return requireRespLines == ++handleLines;
+    public int handle(String data) {
+        int LB = data.indexOf('\n');
+        if (LB == -1) return LB;
+
+        handle(handleLines++, data);
+        return data.length();
+    }
+
+    @Override
+    public boolean isFinished() {
+        return requireRespLines <= handleLines;
     }
 
     @Override

src/main/java/com/tang/intellij/lua/debugger/remote/commands/GetStackCommand.java

@@ -40,22 +40,38 @@
 public class GetStackCommand extends DefaultCommand {
 
     private boolean hasError;
+    private int errorDataLen;
 
     public GetStackCommand() {
         super("STACK", 1);
     }
 
     @Override
-    protected void handle(int index, String data) {
+    public boolean isFinished() {
+        return !hasError && super.isFinished();
+    }
+
+    @Override
+    public int handle(String data) {
         if (hasError) {
-            new DefaultCommand("SUSPEND", 0).exec();
-            debugProcess.setStack(new LuaExecutionStack(new ArrayList<>()));
-            return;
+            hasError = false;
+            String error = data.substring(0, errorDataLen);
+            debugProcess.error(error);
+            debugProcess.runCommand(new DefaultCommand("RUN", 0));
+            return errorDataLen;
         }
+        return super.handle(data);
+    }
 
+    @Override
+    protected void handle(int index, String data) {
         if (data.startsWith("401")) {
             hasError = true;
-            requireRespLines++;
+            Pattern pattern = Pattern.compile("(\\d+)([^\\d]+)(\\d+)");
+            Matcher matcher = pattern.matcher(data);
+            if (matcher.find()) {
+                errorDataLen = Integer.parseInt(matcher.group(3));
+            }
             return;
         }
 

src/main/java/com/tang/intellij/lua/debugger/remote/mobdebug/MobServer.java

@@ -44,17 +44,7 @@ public class MobServer implements Runnable {
 
     class LuaDebugReader extends BaseOutputReader {
         LuaDebugReader(@NotNull InputStream inputStream, @Nullable Charset charset) {
-            super(inputStream, charset, new BaseOutputReader.Options() {
-                @Override
-                public boolean sendIncompleteLines() {
-                    return false;
-                }
-
-                @Override
-                public SleepingPolicy policy() {
-                    return SleepingPolicy.BLOCKING;
-                }
-            });
+            super(inputStream, charset);
             start(getClass().getName());
         }
 
@@ -78,6 +68,7 @@ protected Future<?> executeOnPooledThread(@NotNull Runnable runnable) {
     private LuaDebugReader debugReader;
     private DebugCommand currentCommandWaitForResp;
     private OutputStreamWriter streamWriter;
+    private StringBuffer stringBuffer = new StringBuffer(2048);
 
     public MobServer(LuaRemoteDebugProcess listener) {
         this.listener = listener;
@@ -92,8 +83,16 @@ public void start(int port) throws IOException {
 
     private void onResp(String data) {
         System.out.println(data);
-        if (currentCommandWaitForResp != null && currentCommandWaitForResp.handle(data)) {
-            currentCommandWaitForResp = null;
+        if (currentCommandWaitForResp != null) {
+            stringBuffer.append(data);
+            int eat = currentCommandWaitForResp.handle(stringBuffer.toString());
+            if (eat > 0) {
+                stringBuffer.delete(0, eat);
+                if (currentCommandWaitForResp.isFinished())
+                    currentCommandWaitForResp = null;
+            }
+        } else {
+            stringBuffer.setLength(0);
         }
 
         Pattern pattern = Pattern.compile("(\\d+) (\\w+)( (.+))?");