fix: ul, ol tags

Author: kawre

lua/leetcode-ui/group/tag/init.lua

@@ -1,20 +1,32 @@
 local theme = require("leetcode.theme")
+local u = require("leetcode-ui.utils")
 
 local utils = require("leetcode.parser.utils")
 local Group = require("leetcode-ui.group")
-local Lines = require("leetcode-ui.lines")
+local Indent = require("nui.text")
 
 local ts = vim.treesitter
 
 local log = require("leetcode.logger")
 
 ---@class lc.ui.Tag : lc.ui.Group
 ---@field name string
----@field tags string[]
+---@field tags lc.ui.Tag[]
 ---@field node TSNode
 ---@field text string
 local Tag = Group:extend("LeetTag")
 
+function Tag:add_indent(item)
+    if item.class and item.class.name == "LeetLine" then
+        table.insert(item._texts, 1, Indent("\t", "leetcode_indent"))
+        return
+    end
+
+    for _, c in ipairs(item:contents()) do
+        self:add_indent(c)
+    end
+end
+
 function Tag:get_text(node) return ts.get_node_text(node, self.text) end
 
 ---@param node TSNode
@@ -64,7 +76,6 @@ function Tag:get_el_data(node)
         end
     end
 
-    -- local res = { tag = tag, attrs = attrs }
     return { tag = tag, attrs = attrs }
 end
 
@@ -76,7 +87,7 @@ function Tag:parse_helper() --
         if ntype == "text" then
             self:append(self:get_text(child))
         elseif ntype == "element" then
-            self:append(Tag:from(self, child))
+            self:append(self:from(child))
         elseif ntype == "entity" then
             local text = self:get_text(child)
 
@@ -108,10 +119,6 @@ end
 
 local function req_tag(str) return require("leetcode-ui.group.tag." .. str) end
 
--- ---@param node TSNode
--- function Tag:from(node)
--- end
-
 function Tag:contents()
     local items = Tag.super.contents(self)
 
@@ -122,60 +129,58 @@ function Tag:contents()
     return items
 end
 
----@param text string
----@param opts lc.ui.opts
----@param node TSNode
----@param tags string[]
----@param tag string
-function Tag:init(text, opts, node, tags, tag) --
-    Tag.super.init(self, {}, opts or {})
-
-    self.text = text
-    self.node = node
-    self.tags = tags
-    self.name = tag
-
-    log.info(tag)
-
-    self:parse_helper()
-end
-
----@type fun(text: string, opts: lc.ui.opts, node?: TSNode, tags: string[], tag?: string): lc.ui.Tag
-local LeetTag = Tag
-
----@param tag lc.ui.Tag
 ---@param node TSNode
-function Tag.static:from(tag, node)
-    local t = {
+function Tag:from(node)
+    local tbl = {
         pre = req_tag("pre"),
-        ul = req_tag("ul"),
-        ol = req_tag("ol"),
+        ul = req_tag("list.ul"),
+        ol = req_tag("list.ol"),
+        li = req_tag("li"),
         img = req_tag("img"),
         a = req_tag("a"),
     }
 
-    local el = tag:get_el_data(node)
-    local tags = tag.tags
+    local tags = self.tags
+    local el = self:get_el_data(node)
 
-    -- log.info(tag.name)
+    table.insert(tags, self)
+    local parsed = (tbl[el.tag] or Tag)(self.text, {}, node, tags)
+    table.remove(tags)
+
+    return parsed
+end
+
+---@param text string
+---@param opts lc.ui.opts
+---@param node TSNode
+---@param tags lc.ui.Tag[]
+function Tag:init(text, opts, node, tags) --
+    self.text = text
+    self.node = node
+    self.tags = tags
 
-    table.insert(tags, el.tag)
+    self.data = self:get_el_data(node)
+    self.name = self.data.tag
 
-    local opts = { hl = theme.get_dynamic(tags) }
-    local parsed = (t[tags[#tags]] or LeetTag)(tag.text, opts, node, tags, el.tag)
+    opts = vim.tbl_extend("force", {
+        hl = utils.hl(self),
+    }, opts or {})
 
-    table.remove(tags)
+    Tag.super.init(self, {}, opts)
 
-    return parsed
+    self:parse_helper()
 end
 
+---@type fun(text: string, opts: lc.ui.opts, node: TSNode, tags: lc.ui.Tag[]): lc.ui.Tag
+local LeetTag = Tag
+
 ---@param text string
 function Tag.static:parse(text) --
     local ok, parser = pcall(ts.get_string_parser, text, "html")
     assert(ok, parser)
     local root = parser:parse()[1]:root()
 
-    return LeetTag(text, { spacing = 3, hl = "leetcode_normal" }, root, {}, nil)
+    return LeetTag(text, { spacing = 3, hl = "leetcode_normal" }, root, {})
 end
 
 return LeetTag

lua/leetcode-ui/group/tag/li.lua

@@ -0,0 +1,48 @@
+local Tag = require("leetcode-ui.group.tag")
+local Lines = require("leetcode-ui.lines")
+local Text = require("nui.text")
+local List = require("leetcode-ui.group.tag.list")
+
+local u = require("leetcode-ui.utils")
+local log = require("leetcode.logger")
+
+---@class lc.ui.Tag.li : lc.ui.Tag
+---@field indent string
+local Li = Tag:extend("LeetTagUl")
+
+function Li:contents()
+    local items = Li.super.contents(self)
+
+    table.insert(items, 1, Text(self.pre, "leetcode_list"))
+
+    return items
+end
+
+function Li:init(text, opts, node, tags)
+    Li.super.init(self, text, opts, node, tags)
+
+    self.pre = ""
+
+    local r = #self.tags
+    while r >= 1 and not u.is_instance(self.tags[r], List) do
+        r = r - 1
+    end
+
+    local parent = self.tags[r]
+
+    if parent then
+        if parent.name == "ol" then log.debug(parent) end
+
+        if parent.order then
+            self.pre = parent.order .. ". "
+            parent.order = parent.order + 1
+        else
+            self.pre = "* "
+        end
+    end
+end
+
+---@type fun(): lc.ui.Tag.pre
+local LeetTagUl = Li
+
+return LeetTagUl

lua/leetcode-ui/group/tag/list/init.lua

@@ -0,0 +1,20 @@
+local Tag = require("leetcode-ui.group.tag")
+
+---@class lc.ui.Tag.List : lc.ui.Tag
+---@field indent integer
+local List = Tag:extend("LeetTagList")
+
+function List:contents()
+    local items = List.super.contents(self)
+
+    for _, item in ipairs(items) do
+        self:add_indent(item)
+    end
+
+    return items
+end
+
+---@type fun(): lc.ui.Tag.List
+local LeetTagList = List
+
+return LeetTagList

lua/leetcode-ui/group/tag/list/ol.lua

@@ -0,0 +1,19 @@
+local List = require("leetcode-ui.group.tag.list")
+
+local log = require("leetcode.logger")
+
+---@class lc.ui.Tag.ol : lc.ui.Tag.List
+---@field order integer
+local Ol = List:extend("LeetTagOl")
+
+function Ol:init(text, opts, node, tags)
+    self.order = 1
+    log.info("ol")
+
+    Ol.super.init(self, text, opts, node, tags)
+end
+
+---@type fun(): lc.ui.Tag.ol
+local LeetTagOl = Ol
+
+return LeetTagOl

lua/leetcode-ui/group/tag/list/ul.lua

@@ -0,0 +1,17 @@
+local List = require("leetcode-ui.group.tag.list")
+
+local log = require("leetcode.logger")
+
+---@class lc.ui.Tag.ul : lc.ui.Tag.List
+local Ul = List:extend("LeetTagUl")
+
+function Ul:init(text, opts, node, tags)
+    log.info("ul")
+
+    Ul.super.init(self, text, opts, node, tags)
+end
+
+---@type fun(): lc.ui.Tag.ul
+local LeetTagUl = Ul
+
+return LeetTagUl

lua/leetcode-ui/group/tag/ol.lua

@@ -10,11 +10,14 @@ local logger = {}
 
 local function normalize(msg) return type(msg) == "string" and t(msg) or vim.inspect(msg) end
 
----@private
----@param msg any
----@param lvl? integer
----@return any
-logger.log = vim.schedule_wrap(function(msg, lvl)
+-- ---@private
+-- ---@param msg any
+-- ---@param lvl? integer
+-- ---@return any
+-- logger.log = vim.schedule_wrap(function(msg, lvl)
+-- end)
+
+function logger.log(msg, lvl)
     if not config.user.logging then return end
 
     local title = config.name
@@ -24,7 +27,7 @@ logger.log = vim.schedule_wrap(function(msg, lvl)
     if lvl == lvls.DEBUG then msg = debug.traceback(msg .. "\n") end
 
     vim.notify(msg, lvl, { title = title })
-end)
+end
 
 ---@param msg any
 logger.info = function(msg) logger.log(msg) end

lua/leetcode-ui/group/tag/ul.lua

@@ -53,8 +53,18 @@ function utils.entity(entity)
     end
 end
 
----@param tags string[]
+---@param tag lc.ui.Tag
 ---@return string
-function utils.hl(tags) return theme.get_dynamic(vim.deepcopy(tags)) end
+function utils.hl(tag) --
+    local tag_names = {}
+
+    for _, v in ipairs(tag.tags) do
+        if v.name then table.insert(tag_names, v.name) end
+    end
+
+    if tag.name then table.insert(tag_names, tag.name) end
+
+    return theme.get_dynamic(tag_names)
+end
 
 return utils