feat!: bump min nvim version to v0.6.0
This commit is contained in:
2
.github/workflows/doc.yml
vendored
2
.github/workflows/doc.yml
vendored
@@ -32,7 +32,7 @@ jobs:
|
|||||||
vimdoc: zenbones
|
vimdoc: zenbones
|
||||||
pandoc: doc/zenbones.md
|
pandoc: doc/zenbones.md
|
||||||
description: "A collection of contrast-based vim/neovim colorschemes"
|
description: "A collection of contrast-based vim/neovim colorschemes"
|
||||||
version: "Vim v8.1 / Neovim 0.5.0"
|
version: "Vim v8.1 / Neovim 0.6.0"
|
||||||
- name: Create PR
|
- name: Create PR
|
||||||
run: |
|
run: |
|
||||||
if ! [[ -z $(git status -s) ]]; then
|
if ! [[ -z $(git status -s) ]]; then
|
||||||
|
|||||||
@@ -416,46 +416,6 @@ local function generate(p, opt)
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- stylua: ignore start
|
|
||||||
if not vim.diagnostic then
|
|
||||||
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)
|
|
||||||
LspDiagnosticsDefaultWarning { base.DiagnosticWarn }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
|
|
||||||
LspDiagnosticsDefaultInformation { base.DiagnosticInfo }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
|
|
||||||
LspDiagnosticsDefaultHint { base.DiagnosticHint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
|
|
||||||
|
|
||||||
LspDiagnosticsVirtualTextError { base.DiagnosticVirtualTextError }, -- Used for "Error" diagnostic virtual text
|
|
||||||
LspDiagnosticsVirtualTextWarning { base.DiagnosticVirtualTextWarn }, -- Used for "Warning" diagnostic virtual text
|
|
||||||
LspDiagnosticsVirtualTextInformation { base.DiagnosticVirtualTextInfo }, -- Used for "Information" diagnostic virtual text
|
|
||||||
LspDiagnosticsVirtualTextHint { base.DiagnosticVirtualTextHint }, -- Used for "Hint" diagnostic virtual text
|
|
||||||
|
|
||||||
LspDiagnosticsUnderlineError { base.DiagnosticUnderlineError }, -- Used to underline "Error" diagnostics
|
|
||||||
LspDiagnosticsUnderlineWarning { base.DiagnosticUnderlineWarn }, -- Used to underline "Warning" diagnostics
|
|
||||||
LspDiagnosticsUnderlineInformation { base.DiagnosticUnderlineInfo }, -- Used to underline "Information" diagnostics
|
|
||||||
LspDiagnosticsUnderlineHint { base.DiagnosticUnderlineHint }, -- Used to underline "Hint" diagnostics
|
|
||||||
|
|
||||||
-- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float
|
|
||||||
-- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float
|
|
||||||
-- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float
|
|
||||||
-- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float
|
|
||||||
|
|
||||||
LspDiagnosticsSignError { base.DiagnosticSignError }, -- Used for "Error" signs in sign column
|
|
||||||
LspDiagnosticsSignWarning { base.DiagnosticSignWarn }, -- Used for "Warning" signs in sign column
|
|
||||||
LspDiagnosticsSignInformation { base.DiagnosticSignInfo }, -- Used for "Information" signs in sign column
|
|
||||||
LspDiagnosticsSignHint { base.DiagnosticSignHint }, -- Used for "Hint" signs in sign column
|
|
||||||
}
|
|
||||||
end)
|
|
||||||
-- selene: deny(undefined_variable)
|
|
||||||
---@diagnostic enable: undefined-global
|
|
||||||
)
|
|
||||||
end
|
|
||||||
-- stylua: ignore end
|
|
||||||
|
|
||||||
return lush.merge(specs)
|
return lush.merge(specs)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -416,46 +416,6 @@ local function generate(p, opt)
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- stylua: ignore start
|
|
||||||
if not vim.diagnostic then
|
|
||||||
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)
|
|
||||||
LspDiagnosticsDefaultWarning { base.DiagnosticWarn }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
|
|
||||||
LspDiagnosticsDefaultInformation { base.DiagnosticInfo }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
|
|
||||||
LspDiagnosticsDefaultHint { base.DiagnosticHint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
|
|
||||||
|
|
||||||
LspDiagnosticsVirtualTextError { base.DiagnosticVirtualTextError }, -- Used for "Error" diagnostic virtual text
|
|
||||||
LspDiagnosticsVirtualTextWarning { base.DiagnosticVirtualTextWarn }, -- Used for "Warning" diagnostic virtual text
|
|
||||||
LspDiagnosticsVirtualTextInformation { base.DiagnosticVirtualTextInfo }, -- Used for "Information" diagnostic virtual text
|
|
||||||
LspDiagnosticsVirtualTextHint { base.DiagnosticVirtualTextHint }, -- Used for "Hint" diagnostic virtual text
|
|
||||||
|
|
||||||
LspDiagnosticsUnderlineError { base.DiagnosticUnderlineError }, -- Used to underline "Error" diagnostics
|
|
||||||
LspDiagnosticsUnderlineWarning { base.DiagnosticUnderlineWarn }, -- Used to underline "Warning" diagnostics
|
|
||||||
LspDiagnosticsUnderlineInformation { base.DiagnosticUnderlineInfo }, -- Used to underline "Information" diagnostics
|
|
||||||
LspDiagnosticsUnderlineHint { base.DiagnosticUnderlineHint }, -- Used to underline "Hint" diagnostics
|
|
||||||
|
|
||||||
-- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float
|
|
||||||
-- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float
|
|
||||||
-- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float
|
|
||||||
-- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float
|
|
||||||
|
|
||||||
LspDiagnosticsSignError { base.DiagnosticSignError }, -- Used for "Error" signs in sign column
|
|
||||||
LspDiagnosticsSignWarning { base.DiagnosticSignWarn }, -- Used for "Warning" signs in sign column
|
|
||||||
LspDiagnosticsSignInformation { base.DiagnosticSignInfo }, -- Used for "Information" signs in sign column
|
|
||||||
LspDiagnosticsSignHint { base.DiagnosticSignHint }, -- Used for "Hint" signs in sign column
|
|
||||||
}
|
|
||||||
end)
|
|
||||||
-- selene: deny(undefined_variable)
|
|
||||||
---@diagnostic enable: undefined-global
|
|
||||||
)
|
|
||||||
end
|
|
||||||
-- stylua: ignore end
|
|
||||||
|
|
||||||
return lush.merge(specs)
|
return lush.merge(specs)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,10 @@ function M.apply_colorscheme()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function M.get_colorscheme_list()
|
function M.get_colorscheme_list()
|
||||||
local json_decode = vim.fn.has "nvim-0.6.0" == 1 and vim.json.decode or vim.fn.json_decode
|
|
||||||
local file = io.open(vim.api.nvim_get_runtime_file("zenbones.json", false)[1], "r")
|
local file = io.open(vim.api.nvim_get_runtime_file("zenbones.json", false)[1], "r")
|
||||||
local content = file:read "*a"
|
local content = file:read "*a"
|
||||||
file:close()
|
file:close()
|
||||||
return json_decode(content)
|
return vim.json.decode(content)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.get_colorscheme(name)
|
function M.get_colorscheme(name)
|
||||||
|
|||||||
Reference in New Issue
Block a user