fix(formatting): stylua

dev
Pocco81 2 years ago
parent 60c3dc2424
commit 1ec2590301

@ -6,8 +6,8 @@ config.options = {
term_colors = false, term_colors = false,
compile = { compile = {
enable = false, enable = false,
path = vim.fn.stdpath "cache" .. "/catppuccin", path = vim.fn.stdpath("cache") .. "/catppuccin",
suffix = "_compiled" suffix = "_compiled",
}, },
dim_inactive = { dim_inactive = {
enable = false, enable = false,

@ -1,7 +1,6 @@
local M = {} local M = {}
function M.get() function M.get()
local hi = { local hi = {
IndentBlanklineChar = { fg = cp.surface0 }, IndentBlanklineChar = { fg = cp.surface0 },
IndentBlanklineContextChar = { fg = cp.text }, IndentBlanklineContextChar = { fg = cp.text },

@ -11,17 +11,16 @@ local function get_prepared()
end end
function M.get() function M.get()
if not get_prepared() then if not get_prepared() then
local catppuccin = require("catppuccin") local catppuccin = require("catppuccin")
if catppuccin.after_loading ~= nil then if catppuccin.after_loading ~= nil then
catppuccin.after_loading = function() catppuccin.after_loading = function()
catppuccin.after_loading() catppuccin.after_loading()
require'leap'.init_highlight(true) require("leap").init_highlight(true)
end end
else else
catppuccin.after_loading = function() catppuccin.after_loading = function()
require'leap'.init_highlight(true) require("leap").init_highlight(true)
end end
end end
set_prepared(true) set_prepared(true)

@ -11,7 +11,6 @@ local function get_prepared()
end end
function M.get() function M.get()
if not get_prepared() then if not get_prepared() then
set_prepared(vim.api.nvim_create_autocmd("User", { set_prepared(vim.api.nvim_create_autocmd("User", {
pattern = "CatppuccinLoaded", pattern = "CatppuccinLoaded",
@ -19,7 +18,7 @@ function M.get()
if pcall(require, "lightspeed") then if pcall(require, "lightspeed") then
require("lightspeed").init_highlight() require("lightspeed").init_highlight()
end end
end end,
})) }))
end end

@ -2,7 +2,6 @@ local M = {}
local ucolors = require("catppuccin.utils.colors") local ucolors = require("catppuccin.utils.colors")
function M.get() function M.get()
local options = require("catppuccin.config").options local options = require("catppuccin.config").options
local virtual_text = options.integrations.native_lsp.virtual_text local virtual_text = options.integrations.native_lsp.virtual_text
local underlines = options.integrations.native_lsp.underlines local underlines = options.integrations.native_lsp.underlines
@ -22,10 +21,26 @@ function M.get()
LspReferenceWrite = { bg = cp.surface1 }, -- used for highlighting "write" references LspReferenceWrite = { bg = cp.surface1 }, -- used for highlighting "write" references
-- hightlight diagnostics in numberline -- hightlight diagnostics in numberline
DiagnosticVirtualTextError = { bg = ucolors.darken(error, darkening_percentage, cp.base), fg = error, style = virtual_text.errors }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default DiagnosticVirtualTextError = {
DiagnosticVirtualTextWarn = { bg = ucolors.darken(warning, darkening_percentage, cp.base), fg = warning, style = virtual_text.warnings }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default bg = ucolors.darken(error, darkening_percentage, cp.base),
DiagnosticVirtualTextInfo = { bg = ucolors.darken(info, darkening_percentage, cp.base), fg = info, style = virtual_text.information }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default fg = error,
DiagnosticVirtualTextHint = { bg = ucolors.darken(hint, darkening_percentage, cp.base), fg = hint, style = virtual_text.hints }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default style = virtual_text.errors,
}, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default
DiagnosticVirtualTextWarn = {
bg = ucolors.darken(warning, darkening_percentage, cp.base),
fg = warning,
style = virtual_text.warnings,
}, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default
DiagnosticVirtualTextInfo = {
bg = ucolors.darken(info, darkening_percentage, cp.base),
fg = info,
style = virtual_text.information,
}, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default
DiagnosticVirtualTextHint = {
bg = ucolors.darken(hint, darkening_percentage, cp.base),
fg = hint,
style = virtual_text.hints,
}, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default
DiagnosticError = { bg = cp.none, fg = error, style = virtual_text.errors }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default DiagnosticError = { bg = cp.none, fg = error, style = virtual_text.errors }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default
DiagnosticWarn = { bg = cp.none, fg = warning, style = virtual_text.warnings }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default DiagnosticWarn = { bg = cp.none, fg = warning, style = virtual_text.warnings }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default

@ -9,7 +9,6 @@ function M.get()
root_dir_color = cp.blue root_dir_color = cp.blue
end end
return { return {
NvimTreeFolderName = { fg = cp.blue }, NvimTreeFolderName = { fg = cp.blue },
NvimTreeFolderIcon = { fg = cp.blue }, NvimTreeFolderIcon = { fg = cp.blue },

@ -53,7 +53,7 @@ function M.get()
TSNote = { fg = cp.base, bg = cp.blue }, TSNote = { fg = cp.base, bg = cp.blue },
TSWarning = { fg = cp.base, bg = cp.yellow }, TSWarning = { fg = cp.base, bg = cp.yellow },
TSDanger = { fg = cp.base, bg = cp.red }, TSDanger = { fg = cp.base, bg = cp.red },
TSConstMacro = { fg = cp.mauve }; -- For constants that are defined by macros: NULL in cp. TSConstMacro = { fg = cp.mauve }, -- For constants that are defined by macros: NULL in cp.
-- TSError = { fg = cp.red }, -- For syntax/parser errors. -- TSError = { fg = cp.red }, -- For syntax/parser errors.
-- rustTSField = { fg = cp.surface1 }, -- For fields. -- rustTSField = { fg = cp.surface1 }, -- For fields.
TSLabel = { fg = cp.sapphire }, -- For labels: label: in C and :label: in Lua. TSLabel = { fg = cp.sapphire }, -- For labels: label: in C and :label: in Lua.

@ -11,14 +11,14 @@ command("Catppuccin", function(inp)
return return
end end
vim.g.catppuccin_flavour = inp.args vim.g.catppuccin_flavour = inp.args
vim.cmd "colorscheme catppuccin" vim.cmd("colorscheme catppuccin")
end, { end, {
nargs = 1, nargs = 1,
complete = function(line) complete = function(line)
return vim.tbl_filter(function(val) return vim.tbl_filter(function(val)
return vim.startswith(val, line) return vim.startswith(val, line)
end, flavours) end, flavours)
end end,
}) })
command("CatppuccinCompile", function() command("CatppuccinCompile", function()
@ -42,7 +42,9 @@ function M.load()
if config.compile.enable == true then if config.compile.enable == true then
local compiled_path = config.compile.path local compiled_path = config.compile.path
.. (vim.loop.os_uname().sysname == "Windows" and "\\" or "/") .. (vim.loop.os_uname().sysname == "Windows" and "\\" or "/")
.. vim.g.catppuccin_flavour .. config.compile.suffix .. ".lua" .. vim.g.catppuccin_flavour
.. config.compile.suffix
.. ".lua"
local f = io.open(compiled_path, "r") local f = io.open(compiled_path, "r")
if f ~= nil then if f ~= nil then
io.close(f) io.close(f)

@ -15,7 +15,8 @@ end
function util.compile() function util.compile()
local theme = require("catppuccin.lib.mapper").apply() local theme = require("catppuccin.lib.mapper").apply()
local lines = { [[ local lines = {
[[
-- This file is autogenerated by CATPPUCCIN. -- This file is autogenerated by CATPPUCCIN.
-- Do not make changes directly to this file. -- Do not make changes directly to this file.
@ -23,16 +24,17 @@ vim.cmd("hi clear")
if vim.fn.exists("syntax_on") then if vim.fn.exists("syntax_on") then
vim.cmd("syntax reset") vim.cmd("syntax reset")
end end
vim.g.colors_name = "catppuccin"]] } vim.g.colors_name = "catppuccin"]],
}
local config = require("catppuccin.config").options local config = require("catppuccin.config").options
local custom_highlights = config.custom_highlights local custom_highlights = config.custom_highlights
for property, value in pairs(theme.properties) do for property, value in pairs(theme.properties) do
if type(value) == "string" then if type(value) == "string" then
table.insert(lines, fmt('vim.o.%s = "%s"', property, value)) table.insert(lines, fmt('vim.o.%s = "%s"', property, value))
elseif type(value) == "bool" then elseif type(value) == "bool" then
table.insert(lines, fmt('vim.o.%s = %s', property, value)) table.insert(lines, fmt("vim.o.%s = %s", property, value))
elseif type(value) == "table" then elseif type(value) == "table" then
table.insert(lines, fmt('vim.o.%s = %s', property, inspect(value))) table.insert(lines, fmt("vim.o.%s = %s", property, inspect(value)))
end end
end end
local tbl = vim.tbl_deep_extend("keep", theme.integrations, theme.base) local tbl = vim.tbl_deep_extend("keep", theme.integrations, theme.base)
@ -61,19 +63,49 @@ vim.g.colors_name = "catppuccin"]] }
end end
if config.term_colors then if config.term_colors then
local colors = { "overlay0", "red", "green", "yellow", "blue", "pink", "sky", "text", "overlay1", "red", "green", "yellow", "blue", "pink", "sky", "text"} local colors = {
"overlay0",
"red",
"green",
"yellow",
"blue",
"pink",
"sky",
"text",
"overlay1",
"red",
"green",
"yellow",
"blue",
"pink",
"sky",
"text",
}
for i = 0, 15 do for i = 0, 15 do
table.insert(lines, fmt('vim.g.terminal_color_%d = "%s"', i, theme.terminal[colors[i + 1]])) table.insert(lines, fmt('vim.g.terminal_color_%d = "%s"', i, theme.terminal[colors[i + 1]]))
end end
end end
os.execute(string.format("mkdir %s %s", vim.loop.os_uname().sysname == 'Windows' and "" or "-p", config.compile.path)) os.execute(
local file = io.open(config.compile.path .. (vim.loop.os_uname().sysname == 'Windows' and "\\" or "/") .. vim.g.catppuccin_flavour .. config.compile.suffix .. ".lua", "w") string.format("mkdir %s %s", vim.loop.os_uname().sysname == "Windows" and "" or "-p", config.compile.path)
)
local file = io.open(
config.compile.path
.. (vim.loop.os_uname().sysname == "Windows" and "\\" or "/")
.. vim.g.catppuccin_flavour
.. config.compile.suffix
.. ".lua",
"w"
)
file:write(table.concat(lines, "\n")) file:write(table.concat(lines, "\n"))
file:close() file:close()
end end
function util.clean() function util.clean()
local config = require("catppuccin.config").options local config = require("catppuccin.config").options
local compiled_path = config.compile.path .. (vim.loop.os_uname().sysname == 'Windows' and "\\" or "/") .. vim.g.catppuccin_flavour .. config.compile.suffix .. ".lua" local compiled_path = config.compile.path
.. (vim.loop.os_uname().sysname == "Windows" and "\\" or "/")
.. vim.g.catppuccin_flavour
.. config.compile.suffix
.. ".lua"
os.remove(compiled_path) os.remove(compiled_path)
end end

Loading…
Cancel
Save