udap: Responding to continue, next, stepIn, and stepOut

Signed-off-by: mstreeter10 <[email protected]>
uniconproject · Jan 6, 2024 · b985fb2 · b985fb2
1 parent 0eb3f4d
commit b985fb2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/uni/ulsp/udap/communicator.icn b/uni/ulsp/udap/communicator.icn
@@ -33,14 +33,15 @@ class Communicator(udb, udbSock, progSock, filePath)
         return pathfind("udb")
     end
 
-    method run()
+    method progress(cmd)
         local udbRes, udbResTable, udbResList, progRes, progResTable
 
+        if /cmd then cmd := "run"
         udbRes := ""
         udbResList := list()
         progRes := ""
 
-        write(udbSock, "run")
+        write(udbSock, cmd)
 
         #in json
         udbRes := udb_output()
@@ -55,8 +56,8 @@ class Communicator(udb, udbSock, progSock, filePath)
             every udbResTable := jtou(udbRes) do {
                 put(udbResList, udbResTable)
                 if member(udbResTable, "type") then {
-                    if udbResTable["type"] == "stderr" | udbResTable["type"] == "exited" | udbResTable["type"] == "breakpoint" then {
-                        suspend progResTable
+                    if udbResTable["type"] == "stderr" | udbResTable["type"] == "exited" | udbResTable["type"] == "breakpoint" | udbResTable["type"] == "step" then {
+                        if progRes ~== "" then suspend progResTable
                         return udbResTable
                     }
                 }

diff --git a/uni/ulsp/udap/server.icn b/uni/ulsp/udap/server.icn
@@ -24,8 +24,12 @@ class Server(port, sock, communicator)
                "initialize": { initialize(request_seq, request_command) }
                "launch" : { launch(request_seq, request_command, request_arguments) }
                "setBreakpoints" : { set_breakpoints(request_seq, request_command, request_arguments) }
-               "configurationDone" : { acknowledge(request_seq, request_command); run_prog() }
+               "configurationDone" : { acknowledge(request_seq, request_command); progress("run") }
                "threads" : { threads(request_seq, request_command) }
+               "continue" : { acknowledge(request_seq, request_command); progress("cont") }
+               "next" : { acknowledge(request_seq, request_command); progress("next") }
+               "stepIn" : { acknowledge(request_seq, request_command); progress("step") }
+               "stepOut" : { acknowledge(request_seq, request_command); progress("return") }
                "stackTrace" : { stackTrace(request_seq, request_command, request_arguments) }
                "scopes" : { scopes(request_seq, request_command, request_arguments) }
                "variables" : { variables(request_seq, request_command, request_arguments) }
@@ -197,13 +201,13 @@ class Server(port, sock, communicator)
    end
 
 ########################################################
-#                        run                           #
+#                        progress                      #
 ########################################################
 
-   method run_prog()
+   method progress(cmd)
       local outputTable, res
 
-      every outputTable := communicator.run() do {
+      every outputTable := communicator.progress(cmd) do {
          if member(outputTable, "consoleMsg") then outputTable["consoleMsg"] := replace(outputTable["consoleMsg"], "\"", "\\\"")
          if outputTable["type"] == "exited" then {
             res := build_event("terminated")
@@ -218,6 +222,7 @@ class Server(port, sock, communicator)
                res := build_event("stopped", table(
                   "reason", "exception", 
                   "description", outputTable["consoleMsg"],
+                  "text", outputTable["consoleMsg"],
                   "threadId", 1))
                writes(sock, res)
             }
@@ -229,6 +234,12 @@ class Server(port, sock, communicator)
                   "threadId", 1))
                writes(sock, res)
             }
+            else if outputTable["type"] == "step" then {
+               res := build_event("stopped", table(
+                  "reason", "step",
+                  "threadId", 1))
+               writes(sock, res)
+            }
          }
       }
    end