From 87974cc914ab2a65dd821f42755f9ced2d806d50 Mon Sep 17 00:00:00 2001
From: pelikhan <jhalleux@microsoft.com>
Date: Fri, 27 Oct 2023 15:50:35 -0700
Subject: [PATCH] formatting and update jacdac

---
 cli/src/devtools.ts        | 4 ++--
 compiler/src/serverinfo.ts | 2 +-
 jacdac-ts                  | 2 +-
 runtime/jacdac-c           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/src/devtools.ts b/cli/src/devtools.ts
index 1ba0d04218..07cc9099c7 100644
--- a/cli/src/devtools.ts
+++ b/cli/src/devtools.ts
@@ -259,7 +259,7 @@ function startProxyServers(
     })
     server.listen(port, listenHost)
 
-    log(`   tcpsocket: tcp://${domain}:${tcpPort}`)
+    log(`   tcpsocket  : tcp://${domain}:${tcpPort}`)
     const tcpServer = net.createServer(socket => {
         const sender = "tcp" + ++clientId
         const client: DevToolsClient = socket as any
@@ -363,7 +363,7 @@ function startDbgServer(port: number, options: DevToolsOptions) {
 
     const listenHost = options.internet ? undefined : "127.0.0.1"
     const domain = listenHost || "localhost"
-    console.log(`   dbgserver: tcp://${domain}:${port}`)
+    console.log(`   dbgserver  : tcp://${domain}:${port}`)
     net.createServer(async socket => {
         console.log("dbgserver: connection")
         let session: DsDapSession
diff --git a/compiler/src/serverinfo.ts b/compiler/src/serverinfo.ts
index 2837b0f555..0775cd0e9c 100644
--- a/compiler/src/serverinfo.ts
+++ b/compiler/src/serverinfo.ts
@@ -48,7 +48,7 @@ export function serverInfo(host: Host) {
         return stmt
             .getFullText()
             .replace(/\s*\/\*\*\s+(\*\s*)*/, "")
-            .replace(/\n[^]*/, "")
+            .replace(/\r?\n[^]*/, "")
     }
 
     function customDriver(stmt: ts.ClassDeclaration) {
diff --git a/jacdac-ts b/jacdac-ts
index 16e1e8dbc2..7c03d7bbba 160000
--- a/jacdac-ts
+++ b/jacdac-ts
@@ -1 +1 @@
-Subproject commit 16e1e8dbc2522a84e16fffa4ad4dd8d0a2cba5d1
+Subproject commit 7c03d7bbba80baad837f8604f764b5a40d4ee6d8
diff --git a/runtime/jacdac-c b/runtime/jacdac-c
index f60d0b2bb9..36e87d701a 160000
--- a/runtime/jacdac-c
+++ b/runtime/jacdac-c
@@ -1 +1 @@
-Subproject commit f60d0b2bb982d5fc5e6ddf0d6c92296787fbf728
+Subproject commit 36e87d701ac15addccd6b134993f5a5be5bed410