From a06a2a7ea2ab5aa9b9ac11c4fa2c39506d2af329 Mon Sep 17 00:00:00 2001 From: Daniel Hill <9439488+blazkowolf@users.noreply.github.com> Date: Mon, 13 Mar 2023 22:09:44 -0400 Subject: [PATCH] style: reformat code using StyLua --- .stylua.toml | 3 ++ lua/gruber-darker/config.lua | 16 +++++----- lua/gruber-darker/hl.lua | 28 ++++++++--------- lua/gruber-darker/init.lua | 59 ++++++++++++++++++------------------ 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/.stylua.toml b/.stylua.toml index e1f0601..a710549 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -1,3 +1,6 @@ +# StyLua configuration values found here: +# https://github.com/JohnnyMorganz/StyLua#configuration + column_width = 120 line_endings = "Unix" indent_type = "Tabs" diff --git a/lua/gruber-darker/config.lua b/lua/gruber-darker/config.lua index 4d44a3b..07f4943 100644 --- a/lua/gruber-darker/config.lua +++ b/lua/gruber-darker/config.lua @@ -9,25 +9,25 @@ ---@type ConfigMgr local M = { - resolved_opts = { - bold = true, - italic = true, - underline = true, - comment_italics = true, - }, + resolved_opts = { + bold = true, + italic = true, + underline = true, + comment_italics = true, + }, } ---Get GruberDarker user preferences ---@return Options ---@nodiscard function M.get_resolved_opts() - return M.resolved_opts + return M.resolved_opts end ---Set GruberDarker colorscheme options ---@param opts Options function M.set(opts) - M.resolved_opts = vim.tbl_deep_extend("force", M.resolved_opts, opts) + M.resolved_opts = vim.tbl_deep_extend("force", M.resolved_opts, opts) end return M diff --git a/lua/gruber-darker/hl.lua b/lua/gruber-darker/hl.lua index ea29f1f..d78ae9e 100644 --- a/lua/gruber-darker/hl.lua +++ b/lua/gruber-darker/hl.lua @@ -18,7 +18,7 @@ M.groups = { DiffDelete = { fg = c.default["red+1"], bg = c.default.none }, -- diff mode: Deleted line |diff.txt| DiffText = { fg = c.default.yellow, bg = c.default.none }, -- diff mode: Changed text within a changed line |diff.txt| EndOfBuffer = { fg = c.default.fg, bg = c.default.bg }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - TermCursor = { bg = c.default.yellow }, -- cursor in a focused terminal + TermCursor = { bg = c.default.yellow }, -- cursor in a focused terminal -- TermCursorNC= { }, -- cursor in an unfocused terminal ErrorMsg = { fg = c.default.white, bg = c.default.red }, -- error messages on the command line VertSplit = { fg = c.default["fg+2"], bg = c.default["bg+1"] }, -- the column separating vertically split windows @@ -76,31 +76,31 @@ M.groups = { Constant = { fg = c.default.quartz }, -- (preferred) any constant String = { fg = c.default.green }, -- a string constant: "this is a string" Character = { fg = c.default.green }, -- a character constant: 'c', '\n' - Number = { fg = c.default.fg }, -- a number constant: 234, 0xff - Boolean = { fg = c.default.yellow, bold = config.bold }, -- a boolean constant: TRUE, false - Float = { fg = c.default.yellow, bold = config.bold }, -- a floating point constant: 2.3e10 + Number = { fg = c.default.fg }, -- a number constant: 234, 0xff + Boolean = { fg = c.default.yellow, bold = config.bold }, -- a boolean constant: TRUE, false + Float = { fg = c.default.yellow, bold = config.bold }, -- a floating point constant: 2.3e10 Identifier = { fg = c.default["fg+1"] }, -- (preferred) any variable name Function = { fg = c.default.niagara }, -- function name (also: methods for classes) Statement = { fg = c.default.yellow }, -- (preferred) any statement - Conditional = { fg = c.default.yellow, bold = config.bold }, -- if, then, else, endif, switch, etc. - Repeat = { fg = c.default.yellow, bold = config.bold }, -- for, do, while, etc. - Label = { fg = c.default.yellow, bold = config.bold }, -- case, default, etc. + Conditional = { fg = c.default.yellow, bold = config.bold }, -- if, then, else, endif, switch, etc. + Repeat = { fg = c.default.yellow, bold = config.bold }, -- for, do, while, etc. + Label = { fg = c.default.yellow, bold = config.bold }, -- case, default, etc. Operator = { fg = c.default.yellow }, -- "sizeof", "+", "*", etc. Keyword = { fg = c.default.yellow, bold = config.bold }, -- any other keyword Exception = { fg = c.default.yellow, bold = config.bold }, -- try, catch, throw PreProc = { fg = c.default.quartz }, -- (preferred) generic Preprocessor - Include = { fg = c.default.quartz }, -- preprocessor #include - Define = { fg = c.default.quartz }, -- preprocessor #define - Macro = { fg = c.default.quartz }, -- same as Define - PreCondit = { fg = c.default.quartz }, -- preprocessor #if, #else, #endif, etc. + Include = { fg = c.default.quartz }, -- preprocessor #include + Define = { fg = c.default.quartz }, -- preprocessor #define + Macro = { fg = c.default.quartz }, -- same as Define + PreCondit = { fg = c.default.quartz }, -- preprocessor #if, #else, #endif, etc. Type = { fg = c.default.quartz }, -- (preferred) int, long, char, etc. - StorageClass = { fg = c.default.yellow, bold = config.bold }, -- static, register, volatile, etc. - Structure = { fg = c.default.yellow, bold = config.bold }, -- struct, union, enum, etc. - Typedef = { fg = c.default.yellow, bold = config.bold }, -- A typedef + StorageClass = { fg = c.default.yellow, bold = config.bold }, -- static, register, volatile, etc. + Structure = { fg = c.default.yellow, bold = config.bold }, -- struct, union, enum, etc. + Typedef = { fg = c.default.yellow, bold = config.bold }, -- A typedef Special = { fg = c.default.yellow }, -- (preferred) any special symbol -- SpecialChar = { }, -- special character in a constant diff --git a/lua/gruber-darker/init.lua b/lua/gruber-darker/init.lua index 3d5cbee..879fa51 100644 --- a/lua/gruber-darker/init.lua +++ b/lua/gruber-darker/init.lua @@ -6,51 +6,50 @@ local M = {} ---theme changes to something else ---@package function M.on_colorscheme() - vim.cmd([[autocmd! GruberDarker]]) - vim.cmd([[augroup! GruberDarker]]) + vim.cmd([[autocmd! GruberDarker]]) + vim.cmd([[augroup! GruberDarker]]) end ---Clear current highlights and set Neovim global `colors_name` function M.load() - if vim.g.colors_name then - vim.cmd.hi("clear") - end + if vim.g.colors_name then + vim.cmd.hi("clear") + end - vim.opt.termguicolors = true - vim.g.colors_name = "GruberDarker" + vim.opt.termguicolors = true + vim.g.colors_name = "GruberDarker" - -- set highlights here... - local highlights = require("gruber-darker.hl") - for group, hl in pairs(highlights.groups) do - vim.api.nvim_set_hl(0, group, hl) - end + -- set highlights here... + local highlights = require("gruber-darker.hl") + for group, hl in pairs(highlights.groups) do + vim.api.nvim_set_hl(0, group, hl) + end - local gruber_darker_group = vim.api.nvim_create_augroup("GruberDarker", { clear = true }) - vim.api.nvim_create_autocmd("ColorSchemePre", { - group = gruber_darker_group, - pattern = "*", - callback = function() - require("gruber-darker").on_colorscheme() - end, - }) + local gruber_darker_group = vim.api.nvim_create_augroup("GruberDarker", { clear = true }) + vim.api.nvim_create_autocmd("ColorSchemePre", { + group = gruber_darker_group, + pattern = "*", + callback = function() + require("gruber-darker").on_colorscheme() + end, + }) - -- vim.api.nvim_create_autocmd("FileType", { - -- group = gruber_darker_group, - -- pattern = "qf,help", - -- callback = function() - -- vim.cmd.setlocal("winhighlight=Normal:NormalSB,SignColumn:SignColumnSB") - -- end, - -- }) + -- vim.api.nvim_create_autocmd("FileType", { + -- group = gruber_darker_group, + -- pattern = "qf,help", + -- callback = function() + -- vim.cmd.setlocal("winhighlight=Normal:NormalSB,SignColumn:SignColumnSB") + -- end, + -- }) end ---Change colorscheme to GruberDarker -function M.colorscheme() -end +function M.colorscheme() end ---GruberDarker configuration bootstrapper ---@param opts Options function M.setup(opts) - config.set(opts or {}) + config.set(opts or {}) end return M