From a436a4cfd2c4c04bc020ba8472db979ca40856c5 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 29 Oct 2021 15:00:22 +0800 Subject: [PATCH] integrate selene linting --- lua/forestbones/init.lua | 4 ++++ lua/neobones/init.lua | 8 ++++++++ lua/nordbones/init.lua | 4 ++++ lua/rosebones/init.lua | 4 ++++ lua/tokyobones/init.lua | 4 ++++ lua/zenbones/specs/dark.lua | 6 ++++++ lua/zenbones/specs/init.lua | 2 +- lua/zenbones/specs/light.lua | 6 ++++++ nvim_selene.toml | 2 ++ selene.toml | 1 + 10 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 nvim_selene.toml create mode 100644 selene.toml diff --git a/lua/forestbones/init.lua b/lua/forestbones/init.lua index 497a29c..23990fe 100644 --- a/lua/forestbones/init.lua +++ b/lua/forestbones/init.lua @@ -6,9 +6,13 @@ local p = require("forestbones.palette")[bg] local specs = generator.generate(p, bg, generator.get_global_config("forestbones", bg)) return lush.extends({ specs }).with(function() + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) return { Statement { fg = p.leaf, gui = "bold" }, PreProc { fg = p.sky }, Type { fg = p.water }, } + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global end) diff --git a/lua/neobones/init.lua b/lua/neobones/init.lua index dc64684..9562850 100644 --- a/lua/neobones/init.lua +++ b/lua/neobones/init.lua @@ -8,19 +8,27 @@ local specs = generator.generate(p, bg, generator.get_global_config("neobones", if bg == "light" then return lush.extends({ specs }).with(function() + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) return { helpHyperTextJump { fg = hsluv "#195174" }, -- --link-color helpOption { helpHyperTextJump }, markdownUrl { helpHyperTextJump }, } + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global end) else return lush.extends({ specs }).with(function() + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) return { FloatBorder { specs.FloatBorder, fg = hsluv "#203f57" }, -- --border-color helpHyperTextJump { fg = hsluv "#8ec77e" }, -- --link-color helpOption { helpHyperTextJump }, markdownUrl { helpHyperTextJump }, } + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global end) end diff --git a/lua/nordbones/init.lua b/lua/nordbones/init.lua index 261889d..91e6ea6 100644 --- a/lua/nordbones/init.lua +++ b/lua/nordbones/init.lua @@ -5,6 +5,8 @@ local p = require "nordbones.palette" local specs = generator.generate(p.derived, "dark", generator.get_global_config("nordbones", "dark")) return lush.extends({ specs }).with(function() + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) return { Number { fg = p.base.nord7, gui = "italic" }, Identifer { fg = p.derived.fg }, @@ -12,4 +14,6 @@ return lush.extends({ specs }).with(function() Statement { fg = p.base.nord9 }, Type { fg = p.base.nord10 }, } + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global end) diff --git a/lua/rosebones/init.lua b/lua/rosebones/init.lua index fd00c7f..ea7370f 100644 --- a/lua/rosebones/init.lua +++ b/lua/rosebones/init.lua @@ -6,9 +6,13 @@ local p = require("rosebones.palette")[bg] local specs = generator.generate(p, bg, generator.get_global_config("rosebones", bg)) return lush.extends({ specs }).with(function() + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) return { Statement { fg = p.leaf }, Special { fg = p.water }, Type { fg = p.text }, } + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global end) diff --git a/lua/tokyobones/init.lua b/lua/tokyobones/init.lua index 122419b..5b5006c 100644 --- a/lua/tokyobones/init.lua +++ b/lua/tokyobones/init.lua @@ -6,6 +6,8 @@ local p = require("tokyobones.palette")[bg] local specs = generator.generate(p, bg, generator.get_global_config("tokyobones", bg)) return lush.extends({ specs }).with(function() + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) return { Statement { fg = p.blossom, gui = "bold" }, Number { fg = p.sky }, @@ -15,4 +17,6 @@ return lush.extends({ specs }).with(function() PreProc { fg = p.blossom }, Special { fg = p.water }, } + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global end) diff --git a/lua/zenbones/specs/dark.lua b/lua/zenbones/specs/dark.lua index 99139b7..fc34c50 100644 --- a/lua/zenbones/specs/dark.lua +++ b/lua/zenbones/specs/dark.lua @@ -21,6 +21,7 @@ local function generate(p, opt) end ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) -- stylua: ignore start local base = lush(function() return { @@ -375,6 +376,7 @@ local function generate(p, opt) } end) -- stylua: ignore end + -- selene: deny(undefined_variable) ---@diagnostic enable: undefined-global local specs = { @@ -385,11 +387,13 @@ local function generate(p, opt) table.insert( specs, ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) lush(function() return { NormalNC { base.Normal, bg = base.Normal.bg.li(2) }, -- normal text in non-current windows } end) + -- selene: deny(undefined_variable) ---@diagnostic enable: undefined-global ) end @@ -399,6 +403,7 @@ local function generate(p, opt) table.insert( specs, ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) lush(function() return { LspDiagnosticsDefaultError { base.DiagnosticError }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) @@ -427,6 +432,7 @@ local function generate(p, opt) LspDiagnosticsSignHint { base.DiagnosticSignHint }, -- Used for "Hint" signs in sign column } end) + -- selene: deny(undefined_variable) ---@diagnostic enable: undefined-global ) end diff --git a/lua/zenbones/specs/init.lua b/lua/zenbones/specs/init.lua index dea14e5..1b37d4d 100644 --- a/lua/zenbones/specs/init.lua +++ b/lua/zenbones/specs/init.lua @@ -2,7 +2,7 @@ local M = {} local function concat_config(prefix, suffixes) local config = {} - for i, suffix in ipairs(suffixes) do + for _i, suffix in ipairs(suffixes) do config[suffix] = vim.g[prefix .. "_" .. suffix] end return config diff --git a/lua/zenbones/specs/light.lua b/lua/zenbones/specs/light.lua index 6af27cf..3d29ffb 100644 --- a/lua/zenbones/specs/light.lua +++ b/lua/zenbones/specs/light.lua @@ -21,6 +21,7 @@ local function generate(p, opt) end ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) -- stylua: ignore start local base = lush(function() return { @@ -375,6 +376,7 @@ local function generate(p, opt) } end) -- stylua: ignore end + -- selene: deny(undefined_variable) ---@diagnostic enable: undefined-global local specs = { @@ -385,11 +387,13 @@ local function generate(p, opt) table.insert( specs, ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) lush(function() return { NormalNC { base.Normal, bg = base.Normal.bg.da(2) }, -- normal text in non-current windows } end) + -- selene: deny(undefined_variable) ---@diagnostic enable: undefined-global ) end @@ -399,6 +403,7 @@ local function generate(p, opt) table.insert( specs, ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) lush(function() return { LspDiagnosticsDefaultError { base.DiagnosticError }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) @@ -427,6 +432,7 @@ local function generate(p, opt) LspDiagnosticsSignHint { base.DiagnosticSignHint }, -- Used for "Hint" signs in sign column } end) + -- selene: deny(undefined_variable) ---@diagnostic enable: undefined-global ) end diff --git a/nvim_selene.toml b/nvim_selene.toml new file mode 100644 index 0000000..0fa5c4f --- /dev/null +++ b/nvim_selene.toml @@ -0,0 +1,2 @@ +[vim] +any = true diff --git a/selene.toml b/selene.toml new file mode 100644 index 0000000..1af70fb --- /dev/null +++ b/selene.toml @@ -0,0 +1 @@ +std="lua51+nvim_selene"