Split debugger views into separate views, add angelscript language settings

Author: Nimaoth

.nev/settings.json

@@ -125,7 +125,7 @@
         "+type": {
             "lldb-dap": {
                 "connection": "stdio",
-                "path": "/bin/lldb-dap-18",
+                "path": "lldb-dap",
                 "args": []
             },
             "lldb-dap-tcp-launch": {

config/settings.json

@@ -42,6 +42,7 @@
         "\\..rs$": "rust",
         "\\..scala$": "scala",
         "\\..(ts|tsx)$": "typescript",
+        "\\..as$": "angelscript",
         "\\..(nim|nims|nimble)$": "nim",
         "\\..zig$": "zig",
         "\\..odin$": "odin",
@@ -88,6 +89,15 @@
             "command": ["clangd", "--offset-encoding=utf-8"],
         },
 
+        "angel-lsp": {
+            "languages": ["angelscript"],
+            "command": ["node", "hazelight://language-server/out/server.js", "--stdio"],
+            "settings": {
+                "UnrealAngelscript": {
+                }
+            }
+        },
+
         "zls": {
             "languages": ["zig"],
             "command": ["zls"],
@@ -361,6 +371,25 @@
                 ]
             }
         },
+        "angelscript": {
+            "+text": {
+                "treesitter.repository": "dehorsley/tree-sitter-angelscript",
+                "tab-width": 4,
+                "indent": "spaces",
+                "indent-after": [
+                    ":",
+                    "=",
+                    "(",
+                    "{",
+                    "["
+                ],
+                "line-comment": "//",
+                "block-comment": [
+                    "/*",
+                    "*/"
+                ]
+            }
+        },
         "rust": {
             "+text": {
                 "treesitter.repository": "tree-sitter/tree-sitter-rust",
@@ -859,81 +888,13 @@
 
     "ui.scroll-speed": 100,
 
-    "ui.layout.default": "vim",
-    "ui.layout.vertical-temp": {
-        "kind": "vertical",
-        "temporary": true,
-        "max-children": 2
-    },
-    "ui.layout.horizontal-temp": {
-        "kind": "horizontal",
-        "temporary": true,
-        "max-children": 2
-    },
-    "ui.layout.tab-center-alternating": {
-        "slots.default": ".center.*+?",
-        "slots.scratch-terminal": ".bottom.+",
-        "slots.build-run-terminal": ".left",
-        "slots.debugger": ".left",
-        "slots.new-tab": "+.center",
-        "kind": "tab",
-        "childTemplate": {
-            "kind": "center",
-            "center": {
-                "kind": "alternating",
-                "max-children": 2,
-            },
-            "bottom": {
-                "kind": "tab"
-            }
-        },
-    },
-    "ui.layout.splits-in-tabs": {
-        "slots.default": ".+",
-        "slots.scratch-terminal": ".+",
-        "slots.build-run-terminal": ".+",
-        "slots.debugger": ".+",
-        "slots.new-tab": "+",
-        "kind": "tab",
-        "childTemplate": {
-            "kind": "alternating",
-        },
-    },
-    "ui.layout.tabbed-splits": {
-        "slots.default": ".+",
-        "slots.scratch-terminal": "1.+",
-        "slots.build-run-terminal": "1.+",
-        "slots.debugger": "1.+",
-        "slots.new-tab": "*.+",
-        "kind": "alternating",
-        "childTemplate": {
-            "kind": "tab",
-        },
-    },
-    "ui.layout.nev-old": {
-        "slots.default": "*+?",
-        "slots.scratch-terminal": "*+<>?",
-        "slots.build-run-terminal": "*+<>?",
-        "slots.debugger": "*+<>?",
-        "slots.new-tab": "#default",
-        "kind": "alternating",
-        "max-children": 2,
-    },
-    "ui.layout.raw-splits": {
-        "slots.default": "**.*",
-        "slots.scratch-terminal": "**.*<>",
-        "slots.build-run-terminal": "**.*<>",
-        "slots.debugger": "**.*<>",
-        "slots.new-tab": "#default",
-        "kind": "horizontal",
-        "max-children": 1,
-    },
+    "ui.layout.default": "nev",
     "ui.layout.vim": {
         "slots.default": "**.*",
+        "slots.new-tab": "+",
         "slots.scratch-terminal": "**.*<>",
         "slots.build-run-terminal": "**.*<>",
         "slots.debugger": "**.*<>",
-        "slots.new-tab": "+",
         "kind": "tab",
     },
     "ui.layout.vscode": {
@@ -943,22 +904,43 @@
         "slots.debugger": "left.+",
         "slots.new-tab": "**.+",
         "kind": "center",
-        "center": {
+        "centerTemplate": {
             "kind": "alternating",
             "childTemplate": {
                 "kind": "tab"
             }
         },
-        "bottom": {
+        "bottomTemplate": {
             "kind": "tab",
         },
-        "left": {
+        "leftTemplate": {
             "kind": "tab",
         },
-        "right": {
+        "rightTemplate": {
             "kind": "tab",
         },
     },
+    "ui.layout.nev": {
+        "slots.default": "*.center.**.*",
+        "slots.new-tab": "+.center.*",
+        "slots.scratch-terminal": "*.center.**.*<>",
+        "slots.build-run-terminal": "*.center.**.*<>",
+        "slots.debugger": "*.left.+",
+        "slots.debugger-threads": "*.right.+",
+        "slots.debugger-stacktrace": "*.right.+",
+        "slots.debugger-toolbar": "*.right.+",
+        "slots.debugger-variables": "*.left",
+        "slots.debugger-output": "*.bottom",
+        "kind": "tab",
+        "childTemplate": {
+            "kind": "center",
+            "rightTemplate": {
+                "kind": "vertical",
+                "split-ratios": [0.1, 0.25],
+                "temporary": false,
+            }
+        }
+    },
 
     "extra-settings": ["app://config/settings-vim.json"],
 

src/layout.nim

@@ -62,6 +62,13 @@ var gPushSelectorPopupImpl*: PushSelectorPopupImpl
 proc getView*(self: LayoutService, id: Id): Option[View]
 proc preRender*(self: LayoutService)
 
+proc getViews*(self: LayoutService, T: typedesc): seq[T] =
+  var res = newSeq[T]()
+  for v in self.allViews:
+    if v of T:
+      res.add v.T
+  return res
+
 proc addViewFactory*(self: LayoutService, name: string, create: CreateView, override: bool = false) =
   if not override and name in self.viewFactories:
     log lvlError, &"Trying to define duplicate view factory '{name}'"
@@ -78,6 +85,21 @@ proc getExistingView(self: LayoutService, config: JsonNode): View {.raises: [Val
   log lvlError, &"Missing or invalid id for {config}"
   return nil
 
+proc getOrCreateView(self: LayoutService, config: JsonNode): View =
+  let kind = config["kind"].getStr
+  for v in self.allViews:
+    if v.kind == kind:
+      return v
+
+  if kind in self.viewFactories:
+    try:
+      result = self.viewFactories[kind](config)
+      self.allViews.add result
+      return result
+    except ValueError as e:
+      log lvlError, &"Failed to create view using view factory {kind}: {e.msg}"
+  return nil
+
 method createViews(self: Layout, config: JsonNode, layouts: LayoutService) {.base, raises: [ValueError].} =
   if config.kind == JNull:
     return
@@ -86,7 +108,10 @@ method createViews(self: Layout, config: JsonNode, layouts: LayoutService) {.bas
   proc resolve(id: Id): View =
     return layouts.getView(id).get(nil)
 
-  # debugf"{self.desc}.createViews: {config}"
+  proc createView(config: JsonNode): View =
+    return layouts.getOrCreateView(config)
+
+  # debugf"{self.desc}.createViews {self}\n{config.pretty}"
   if config.hasKey("children"):
     let children = config["children"]
     checkJson children.kind == JArray, "'children' must be an array"
@@ -99,8 +124,11 @@ method createViews(self: Layout, config: JsonNode, layouts: LayoutService) {.bas
       if i < self.children.len:
         if self.children[i] != nil and self.children[i] of Layout:
           self.children[i].Layout.createViews(c, layouts)
+        elif self.children[i] != nil:
+          # reuse existing child
+          discard
         elif self.childTemplate != nil:
-          let newChild = self.childTemplate.copy()
+          let newChild = self.childTemplate.copy().Layout
           self.children.add(newChild)
           self.activeIndex = self.activeIndex.clamp(0, self.children.high)
           newChild.createViews(c, layouts)
@@ -110,11 +138,11 @@ method createViews(self: Layout, config: JsonNode, layouts: LayoutService) {.bas
             self.children[i] = layouts.getExistingView(c)
             self.activeIndex = self.activeIndex.clamp(0, self.children.high)
       elif c.hasKey("kind"):
-        let subLayout = createLayout(c, resolve)
+        let subLayout = createLayout(c, resolve, createView)
         self.children.add(subLayout)
         self.activeIndex = self.activeIndex.clamp(0, self.children.high)
       elif self.childTemplate != nil:
-        let newChild = self.childTemplate.copy()
+        let newChild = self.childTemplate.copy().Layout
         self.children.add(newChild)
         self.activeIndex = self.activeIndex.clamp(0, self.children.high)
         newChild.createViews(c, layouts)
@@ -148,7 +176,10 @@ method createViews(self: CenterLayout, config: JsonNode, layouts: LayoutService)
   proc resolve(id: Id): View =
     return layouts.getView(id).get(nil)
 
-  # debugf"CenterLayout.createViews: {config}"
+  proc createView(config: JsonNode): View =
+    return layouts.getOrCreateView(config)
+
+  # debugf"{self.desc}.createViews {self}\n{config.pretty}"
   if config.hasKey("children"):
     let children = config["children"]
     checkJson children.kind == JArray, "'children' must be an array"
@@ -160,11 +191,11 @@ method createViews(self: CenterLayout, config: JsonNode, layouts: LayoutService)
         if self.children[i] != nil and self.children[i] of Layout:
           self.children[i].Layout.createViews(c, layouts)
         elif c.hasKey("kind"):
-          let subLayout = createLayout(c, resolve)
+          let subLayout = createLayout(c, resolve, createView)
           self.children[i] = subLayout
           self.activeIndex = i
         elif self.childTemplates[i] != nil:
-          let newChild = self.childTemplates[i].copy()
+          let newChild = self.childTemplates[i].copy().Layout
           self.children[i] = newChild
           self.activeIndex = i
           newChild.createViews(c, layouts)
@@ -193,19 +224,25 @@ proc updateLayoutTree(self: LayoutService) =
 
     var layoutReferences = newSeq[(string, string)]()
 
+    proc createView(config: JsonNode): View =
+      return self.getOrCreateView(config)
+
     for key, value in config.fields.pairs:
       if value.kind == JString:
         layoutReferences.add (key, value.getStr)
       else:
-        let view = createLayout(value.toJson)
-        if view != nil and view of Layout:
-          self.layouts[key] = view.Layout
-        else:
-          self.layouts[key] = AlternatingLayout(children: @[view])
+        let view = createLayout(value.toJson, createView = createView)
+        if view != nil:
+          let l = view.saveLayout(initHashSet[Id]())
+          if view of Layout:
+            self.layouts[key] = view.Layout
+          else:
+            self.layouts[key] = AlternatingLayout(children: @[view])
 
     for (key, target) in layoutReferences:
       if target in self.layouts:
-        let l = self.layouts[target].copy()
+        let l = self.layouts[target].copy().Layout
+
         assert l != nil
         self.layouts[key] = l
       else:
@@ -217,7 +254,7 @@ proc updateLayoutTree(self: LayoutService) =
     if self.layout == nil:
       self.layout = AlternatingLayout(children: @[])
   except Exception as e:
-    log lvlError, &"Failed to create layout from config: {e.msg}"
+    log lvlError, &"[update-layout-tree] Failed to create layout from config: {e.msg}"
 
 func serviceName*(_: typedesc[LayoutService]): string = "LayoutService"
 
@@ -629,6 +666,14 @@ proc getVisibleViews*(self: LayoutService): seq[View] =
     res.add(v)
   return res
 
+proc isViewVisible*(self: LayoutService, view: View): bool =
+  var res = false
+  self.layout.forEachVisibleView proc(v: View): bool =
+    if v == view:
+      res = true
+      return true
+  return res
+
 proc getNumVisibleViews*(self: LayoutService): int {.expose("layout").} =
   ## Returns the amount of visible views
   var res = 0
@@ -1104,7 +1149,7 @@ proc wrapLayout(self: LayoutService, layout: JsonNode, slot: string = "**") {.ex
   let newLayout = if layout.kind == JString:
     let name = layout.getStr
     if name in self.layouts:
-      self.layouts[name].copy()
+      self.layouts[name].copy().Layout
     else:
       log lvlError, &"Unknown layout '{name}'"
       return
@@ -1117,7 +1162,7 @@ proc wrapLayout(self: LayoutService, layout: JsonNode, slot: string = "**") {.ex
         log lvlError, &"Not a layout: {layout}"
         return
     except ValueError as e:
-      log lvlError, &"Failed to create layout from config: {e.msg}"
+      log lvlError, &"[wrap-layout] Failed to create layout from config: {e.msg}"
       return
 
   try:
@@ -1171,6 +1216,11 @@ proc chooseLayout(self: LayoutService) {.expose("layout").} =
 proc logLayout*(self: LayoutService) {.expose("layout").} =
   log lvlInfo, self.layout.saveLayout(initHashSet[Id]()).pretty
 
+proc logViews*(self: LayoutService) {.expose("layout").} =
+  for v in self.allViews:
+    if v != nil:
+      debugf"{v}"
+
 proc open*(self: LayoutService, path: string, slot: string = "") {.expose("layout").} =
   ## Opens the specified file. Relative paths are relative to the main workspace.
   ## `path` - File path to open.