From 5a1ca3c73ed7f7ab42d1bc37fb98e5ee388c062b Mon Sep 17 00:00:00 2001 From: Emik Date: Sat, 28 Feb 2026 02:14:35 +0100 Subject: [PATCH] Remove all diagnostic suppressions --- .vscode/settings.json | 8 +++++--- src/back.lua | 7 ++----- src/charm.lua | 3 --- src/joker.lua | 7 ++----- src/lib/funky.lua | 4 +--- src/main.lua | 1 - src/tweaks.lua | 7 ------- 7 files changed, 10 insertions(+), 27 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0cfdd81..5e810dd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,8 @@ { + "Lua.diagnostics.disable": [ + "duplicate-set-field", + "lowercase-global", + ], "Lua.diagnostics.severity": { "ambiguity-1": "Error", "assign-type-mismatch": "Error", @@ -18,14 +22,12 @@ "duplicate-doc-field": "Error", "duplicate-doc-param": "Error", "duplicate-index": "Error", - "duplicate-set-field": "Error", "empty-block": "Error", "global-element": "Error", "global-in-nil-env": "Error", "incomplete-signature-doc": "Error", "inject-field": "Error", "invisible": "Error", - "lowercase-global": "Error", "missing-fields": "Error", "missing-global-doc": "Error", "missing-local-export-doc": "Error", @@ -62,5 +64,5 @@ "unused-label": "Error", "unused-local": "Error", "unused-vararg": "Error", - } + }, } \ No newline at end of file diff --git a/src/back.lua b/src/back.lua index e6fceec..0bb57ef 100644 --- a/src/back.lua +++ b/src/back.lua @@ -15,13 +15,11 @@ local back = (function() local calculate = tbl.calculate function tbl:apply(...) - ---@diagnostic disable-next-line: redundant-return-value - return apply and G.GAME.selected_sleeve ~= "sleeve_Roland_" .. key and save(apply(self, ...)) + local _ = apply and G.GAME.selected_sleeve ~= "sleeve_Roland_" .. key and save(apply(self, ...)) end function tbl:calculate(...) - ---@diagnostic disable-next-line: return-type-mismatch - return calculate and G.GAME.selected_sleeve ~= "sleeve_Roland_" .. key and calculate(self, ...) + return (calculate and G.GAME.selected_sleeve ~= "sleeve_Roland_" .. key) and calculate(self, ...) or nil end tbl.pos = {x = x, y = 0} @@ -164,7 +162,6 @@ back { local swapper = {Spectral = "Tarot", Tarot = "Spectral"} local orig_create_card = create_card ----@diagnostic disable-next-line: lowercase-global function create_card(_type, ...) if not G.GAME.modifiers.Roland_swapper_deck then return orig_create_card(_type, ...) diff --git a/src/charm.lua b/src/charm.lua index 9aa9890..60a5309 100644 --- a/src/charm.lua +++ b/src/charm.lua @@ -109,7 +109,6 @@ charm { local orig_showman = SMODS.showman ----@diagnostic disable-next-line: duplicate-set-field function SMODS.showman(...) return G.GAME.Bakery_charm == "BakeryCharm_Roland_flexible" or orig_showman(...) end @@ -131,7 +130,6 @@ charm { local orig_init = Card.init ----@diagnostic disable-next-line: duplicate-set-field function Card:init(X, Y, W, H, card, center, params, ...) if G.GAME.Bakery_charm ~= "BakeryCharm_Roland_fat" or center.set ~= "Booster" then return orig_init(self, X, Y, W, H, card, center, params, ...) @@ -172,7 +170,6 @@ charm { local orig_set_ability = Card.set_ability ----@diagnostic disable-next-line: duplicate-set-field function Card:set_ability(center, initial, delay_sprites, ...) local ret = orig_set_ability(self, center, initial, delay_sprites, ...) diff --git a/src/joker.lua b/src/joker.lua index ebfe2e8..31000c3 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -453,15 +453,12 @@ joker { SMODS.calculate_context {drawing_cards = true, draw = {G.deck.cards}} SMODS.calculate_context { - ---@diagnostic disable-next-line: assign-type-mismatch - first_hand_drawn = not current_round.any_hand_drawn and facing_blind, - ---@diagnostic disable-next-line: assign-type-mismatch - hand_drawn = facing_blind and {G.deck.cards[1]}, + first_hand_drawn = not current_round.any_hand_drawn and facing_blind or nil, + hand_drawn = facing_blind and {G.deck.cards[1]} --[[@as true]], other_drawn = not facing_blind and {G.deck.cards[1]}, } if type(facing_blind) == "table" then - ---@diagnostic disable-next-line: inject-field facing_blind.any_hand_drawn = facing_blind.any_hand_drawn or facing_blind end end, diff --git a/src/lib/funky.lua b/src/lib/funky.lua index 9220f4d..408ff25 100644 --- a/src/lib/funky.lua +++ b/src/lib/funky.lua @@ -160,9 +160,7 @@ function f:concat(...) local fs = {...} for i = 1, #fs do - if not is_f(fs[i]) then ---@diagnostic disable-next-line: assign-type-mismatch - fs[i] = f.from(fs[i]) - end + fs[i] = is_f(fs[i]) and fs[i] or f.from(fs[i]) end return f.new(function() diff --git a/src/main.lua b/src/main.lua index c22b76f..1edd3fe 100644 --- a/src/main.lua +++ b/src/main.lua @@ -44,7 +44,6 @@ SMODS.Atlas { path = "icon.png", } ----@diagnostic disable-next-line: duplicate-set-field function SMODS.current_mod.config_tab() return { n = G.UIT.ROOT, diff --git a/src/tweaks.lua b/src/tweaks.lua index 0d3c986..b700ca6 100644 --- a/src/tweaks.lua +++ b/src/tweaks.lua @@ -6,7 +6,6 @@ local orig_set_debuff = Card.set_debuff local orig_highlight = Card.highlight local orig_copy_card = copy_card ----@diagnostic disable-next-line: duplicate-set-field function CardArea:can_highlight(...) if self ~= G.consumeables or not SMODS.Mods.Roland.config.no_highlight_limit then return orig_can_highlight(self, ...) @@ -17,7 +16,6 @@ function CardArea:can_highlight(...) return true end ----@diagnostic disable-next-line: duplicate-set-field function Card:set_debuff(...) if self.config and self.config.center_key == "m_wild" and @@ -28,7 +26,6 @@ function Card:set_debuff(...) end end ----@diagnostic disable-next-line: duplicate-set-field function Card:highlight(is_highlighted, ...) self.highlighted = is_highlighted @@ -39,7 +36,6 @@ end local orig_use_consumeable = Card.use_consumeable ----@diagnostic disable-next-line: duplicate-set-field function Card:use_consumeable(area, copier, ...) local seal_spectrals = {["Deja Vu"] = true, Medium = true, Talisman = true, Trance = true} @@ -72,7 +68,6 @@ function Card:use_consumeable(area, copier, ...) } end ----@diagnostic disable-next-line: lowercase-global function copy_card(other, new_card, ...) local ret = orig_copy_card(other, new_card, ...) @@ -89,7 +84,6 @@ end q(function() local orig_can_highlight_area = Bakery_API.can_highlight_area - ---@diagnostic disable-next-line: duplicate-set-field function Bakery_API.can_highlight_area(area, ...) return (area == G.consumeables and SMODS.Mods.Roland.config.no_highlight_limit) or @@ -99,7 +93,6 @@ end) local orig_create_card_for_shop = create_card_for_shop ----@diagnostic disable-next-line: lowercase-global function create_card_for_shop(...) ---@type Card local ret = orig_create_card_for_shop(...)