From 5489883e0199632b8aa269ae268739c96c4b272e Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 4 Nov 2024 02:15:18 -0300 Subject: core: smol lua fixes --- lang/lua/astal/gtk3/app.lua | 50 +++++++++++++++++----------------------- lang/lua/astal/gtk3/astalify.lua | 4 +--- 2 files changed, 22 insertions(+), 32 deletions(-) (limited to 'lang/lua/astal/gtk3') diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua index 7895f69..e0ae65a 100644 --- a/lang/lua/astal/gtk3/app.lua +++ b/lang/lua/astal/gtk3/app.lua @@ -24,30 +24,28 @@ end local app = AstalLua() ----@class StartConfig ----@field icons? string ----@field instance_name? string ----@field gtk_theme? string ----@field icon_theme? string ----@field cursor_theme? string ----@field css? string ----@field hold? boolean ----@field request_handler? fun(msg: string, response: fun(res: any)) ----@field main? fun(...): unknown ----@field client? fun(message: fun(msg: string): string, ...): unknown +--- @alias StartConfig { +--- icons?: string, +--- instance_name?: string, +--- gtk_theme?: string, +--- icon_theme?: string, +--- cursor_theme?: string, +--- css?: string, +--- hold?: boolean, +--- request_handler?: fun(msg: string, response: fun(res: any)), +--- main?: fun(...), +--- client?: fun(message: fun(msg: string): string, ...), +---} ----@param config StartConfig | nil +---@param config? StartConfig function Astal.Application:start(config) - if config == nil then - config = {} - end + config = config or {} - if config.client == nil then - config.client = function() + config.client = config.client + or function() print('Astal instance "' .. app.instance_name .. '" is already running') os.exit(1) end - end if config.hold == nil then config.hold = true @@ -61,17 +59,11 @@ function Astal.Application:start(config) if config.icons then self:add_icons(config.icons) end - if config.instance_name then - self.instance_name = config.instance_name - end - if config.gtk_theme then - self.gtk_theme = config.gtk_theme - end - if config.icon_theme then - self.icon_theme = config.icon_theme - end - if config.cursor_theme then - self.cursor_theme = config.cursor_theme + + for _, key in ipairs({ "instance_name", "gtk_theme", "icon_theme", "cursor_theme" }) do + if config[key] then + self[key] = config[key] + end end app.on_activate = function() diff --git a/lang/lua/astal/gtk3/astalify.lua b/lang/lua/astal/gtk3/astalify.lua index 211a1d4..95faa2c 100644 --- a/lang/lua/astal/gtk3/astalify.lua +++ b/lang/lua/astal/gtk3/astalify.lua @@ -163,9 +163,7 @@ return function(ctor) end return function(tbl) - if tbl == nil then - tbl = {} - end + tbl = tbl or {} local bindings = {} local setup = tbl.setup -- cgit v1.2.3 From f02e58342c61b4ae312344be2805aa019d65541d Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 5 Nov 2024 15:53:23 -0300 Subject: core: typing for lua --- lang/lua/astal/gtk3/widget.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lang/lua/astal/gtk3') diff --git a/lang/lua/astal/gtk3/widget.lua b/lang/lua/astal/gtk3/widget.lua index beaad6c..1a4454e 100644 --- a/lang/lua/astal/gtk3/widget.lua +++ b/lang/lua/astal/gtk3/widget.lua @@ -3,7 +3,9 @@ local Astal = lgi.require("Astal", "3.0") local Gtk = lgi.require("Gtk", "3.0") local astalify = require("astal.gtk3.astalify") +---@overload fun(ctor: any): function local Widget = { + ---@overload fun(ctor: any): function astalify = astalify, Box = astalify(Astal.Box), Button = astalify(Astal.Button), -- cgit v1.2.3 From b1da91dcced3803c764d22d4da1a49c23d7e97ed Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 5 Nov 2024 16:13:49 -0300 Subject: oops --- lang/lua/astal/gtk3/widget.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'lang/lua/astal/gtk3') diff --git a/lang/lua/astal/gtk3/widget.lua b/lang/lua/astal/gtk3/widget.lua index 1a4454e..c8857e7 100644 --- a/lang/lua/astal/gtk3/widget.lua +++ b/lang/lua/astal/gtk3/widget.lua @@ -5,7 +5,6 @@ local astalify = require("astal.gtk3.astalify") ---@overload fun(ctor: any): function local Widget = { - ---@overload fun(ctor: any): function astalify = astalify, Box = astalify(Astal.Box), Button = astalify(Astal.Button), -- cgit v1.2.3 From 44710fb30105f5e76fc84845e9379787440f3c4c Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 8 Nov 2024 00:01:57 -0300 Subject: stoopid zed --- lang/lua/astal/gtk3/app.lua | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'lang/lua/astal/gtk3') diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua index e0ae65a..58564ce 100644 --- a/lang/lua/astal/gtk3/app.lua +++ b/lang/lua/astal/gtk3/app.lua @@ -24,18 +24,17 @@ end local app = AstalLua() ---- @alias StartConfig { ---- icons?: string, ---- instance_name?: string, ---- gtk_theme?: string, ---- icon_theme?: string, ---- cursor_theme?: string, ---- css?: string, ---- hold?: boolean, ---- request_handler?: fun(msg: string, response: fun(res: any)), ---- main?: fun(...), ---- client?: fun(message: fun(msg: string): string, ...), ----} +---@class StartConfig +---@field icons string? +---@field instance_name string? +---@field gtk_theme string? +---@field icon_theme string? +---@field cursor_theme string? +---@field css string? +---@field hold boolean? +---@field request_handler fun(msg: string, response: fun(res: any)): nil +---@field main fun(...): nil +---@field client fun(message: fun(msg: string): string, ...): nil ---@param config? StartConfig function Astal.Application:start(config) -- cgit v1.2.3