diff --git a/data/core/common.lua b/data/core/common.lua index ab21b758..df7d435a 100644 --- a/data/core/common.lua +++ b/data/core/common.lua @@ -47,22 +47,22 @@ end function common.color(str) - local r, g, b, a = str:match("#(%x%x)(%x%x)(%x%x)") + local r, g, b, a = str:match("^#(%x%x)(%x%x)(%x%x)(%x?%x?)$") if r then r = tonumber(r, 16) g = tonumber(g, 16) b = tonumber(b, 16) - a = 1 + a = tonumber(a, 16) or 0xff elseif str:match("rgba?%s*%([%d%s%.,]+%)") then local f = str:gmatch("[%d.]+") r = (f() or 0) g = (f() or 0) b = (f() or 0) - a = f() or 1 + a = (f() or 1) * 0xff else error(string.format("bad color string '%s'", str)) end - return r, g, b, a * 0xff + return r, g, b, a end @@ -349,7 +349,7 @@ function common.relative_path(ref_dir, dir) if drive and ref_drive and drive ~= ref_drive then -- Windows, different drives, system.absolute_path fails for C:\..\D:\ return dir - end + end local ref_ls = split_on_slash(ref_dir) local dir_ls = split_on_slash(dir) local i = 1 diff --git a/data/core/style.lua b/data/core/style.lua index 3b0d9e35..79ef47e1 100644 --- a/data/core/style.lua +++ b/data/core/style.lua @@ -27,36 +27,42 @@ style.icon_font = renderer.font.load(DATADIR .. "/fonts/icons.ttf", 16 * SCALE, style.icon_big_font = style.icon_font:copy(23 * SCALE) style.code_font = renderer.font.load(DATADIR .. "/fonts/JetBrainsMono-Regular.ttf", 15 * SCALE) -style.background = { common.color "#2e2e32" } -style.background2 = { common.color "#252529" } -style.background3 = { common.color "#252529" } +style.background = { common.color "#2e2e32" } -- Docview +style.background2 = { common.color "#252529" } -- Treeview +style.background3 = { common.color "#252529" } -- Command view style.text = { common.color "#97979c" } style.caret = { common.color "#93DDFA" } style.accent = { common.color "#e1e1e6" } +-- style.dim - text color for nonactive tabs, tabs divider, prefix in log and +-- search result, hotkeys for context menu and command view style.dim = { common.color "#525257" } -style.divider = { common.color "#202024" } +style.divider = { common.color "#202024" } -- Line between nodes style.selection = { common.color "#48484f" } style.line_number = { common.color "#525259" } -style.line_number2 = { common.color "#83838f" } +style.line_number2 = { common.color "#83838f" } -- With cursor style.line_highlight = { common.color "#343438" } style.scrollbar = { common.color "#414146" } -style.scrollbar2 = { common.color "#4b4b52" } +style.scrollbar2 = { common.color "#4b4b52" } -- Hovered style.nagbar = { common.color "#FF0000" } style.nagbar_text = { common.color "#FFFFFF" } style.nagbar_dim = { common.color "rgba(0, 0, 0, 0.45)" } style.drag_overlay = { common.color "rgba(255,255,255,0.1)" } style.drag_overlay_tab = { common.color "#93DDFA" } +style.good = { common.color "#72b886" } +style.warn = { common.color "#FFA94D" } +style.error = { common.color "#FF3333" } +style.modified = { common.color "#1c7c9c" } style.syntax = {} style.syntax["normal"] = { common.color "#e1e1e6" } style.syntax["symbol"] = { common.color "#e1e1e6" } style.syntax["comment"] = { common.color "#676b6f" } -style.syntax["keyword"] = { common.color "#E58AC9" } -style.syntax["keyword2"] = { common.color "#F77483" } +style.syntax["keyword"] = { common.color "#E58AC9" } -- local function end if case +style.syntax["keyword2"] = { common.color "#F77483" } -- self int float style.syntax["number"] = { common.color "#FFA94D" } -style.syntax["literal"] = { common.color "#FFA94D" } +style.syntax["literal"] = { common.color "#FFA94D" } -- true false nil style.syntax["string"] = { common.color "#f7c95c" } -style.syntax["operator"] = { common.color "#93DDFA" } +style.syntax["operator"] = { common.color "#93DDFA" } -- = + - / < > style.syntax["function"] = { common.color "#93DDFA" } -- This can be used to override fonts per syntax group. diff --git a/docs/api/process.lua b/docs/api/process.lua index abba67ae..4d146bc4 100644 --- a/docs/api/process.lua +++ b/docs/api/process.lua @@ -57,23 +57,26 @@ process.WAIT_INFINITE = -1 ---@type integer process.WAIT_DEADLINE = -2 ----Used for the process.options stdin, stdout and stderr fields. +---Default behavior for redirecting streams. +---This flag is deprecated and for backwards compatibility with reproc only. +---The behavior of this flag may change in future versions of Lite XL. ---@type integer process.REDIRECT_DEFAULT = 0 ----Used for the process.options stdin, stdout and stderr fields. +---Allow Process API to read this stream via process:read functions. ---@type integer process.REDIRECT_PIPE = 1 ----Used for the process.options stdin, stdout and stderr fields. +---Redirect this stream to the parent. ---@type integer process.REDIRECT_PARENT = 2 ----Used for the process.options stdin, stdout and stderr fields. +---Discard this stream (piping it to /dev/null) ---@type integer process.REDIRECT_DISCARD = 3 ----Used for the process.options stdin, stdout and stderr fields. +---Redirect this stream to stdout. +---This flag can only be used on process.options.stderr. ---@type integer process.REDIRECT_STDOUT = 4 diff --git a/subprojects/reproc.wrap b/subprojects/reproc.wrap deleted file mode 100644 index 9ff98b7e..00000000 --- a/subprojects/reproc.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory = reproc -url = https://github.com/franko/reproc -revision = v14.2.3-meson-1