tiagovla/tokyodark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: adopt stylua formatting as default

Browse Source
This commit is contained in:
tiagovla
2021-10-23 02:00:04 -03:00
parent 19d9c22881
commit 72e34d9352
5 changed files with 165 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lua/tokyodark/config.lua
View File

@@ -1,6 +1,8 @@
local function get(setting, default)
local key = "tokyodark_" .. setting
if vim.g[key] == nil then return default end
if vim.g[key] == nil then
return default
end
return vim.g[key]
end
@@ -8,7 +10,7 @@ local config = {
bg = get("transparent_background", false),
italic = get("enable_italic", true),
italic_comment = get("enable_italic_comment", true),
gamma = get("color_gamma", "1.0")
gamma = get("color_gamma", "1.0"),
}
return config

45
lua/tokyodark/highlights.lua
View File

@@ -1,6 +1,6 @@
local p = require('tokyodark.palette')
local cfg = require('tokyodark.config')
local u = require('tokyodark.utils')
local p = require("tokyodark.palette")
local cfg = require("tokyodark.config")
local u = require("tokyodark.utils")
local M = {}
local hl = { langs = {}, plugins = {} }
@@ -28,7 +28,7 @@ hl.predef = {
GreenItalic = { fg = p.green, italic = cfg.italic },
OrangeItalic = { fg = p.orange, italic = cfg.italic },
RedItalic = { fg = p.red, italic = cfg.italic },
YellowItalic = {fg = p.yellow, italic = cfg.italic}
YellowItalic = { fg = p.yellow, italic = cfg.italic },
}
hl.common = {
@@ -88,7 +88,7 @@ hl.common = {
Debug = { fg = p.yellow },
debugPC = { fg = p.bg0, bg = p.green },
debugBreakpoint = { fg = p.bg0, bg = p.red },
ToolbarButton = {fg = p.bg0, bg = p.bg_blue}
ToolbarButton = { fg = p.bg0, bg = p.bg_blue },
}
hl.syntax = {
@@ -124,7 +124,7 @@ hl.syntax = {
Delimiter = hl.predef.Fg,
Comment = { fg = p.bg4, italic = cfg.italic_comment },
SpecialComment = { fg = p.bg4, italic = cfg.italic_comment },
Todo = {fg = p.blue, italic = cfg.italic_comment}
Todo = { fg = p.blue, italic = cfg.italic_comment },
}
hl.plugins.lsp = {
@@ -140,20 +140,20 @@ hl.plugins.lsp = {
LspDiagnosticsUnderlineError = { underline = true, sp = u.color_gamma(p.red, 0.5) },
LspDiagnosticsUnderlineHint = { underline = true, sp = u.color_gamma(p.purple, 0.5) },
LspDiagnosticsUnderlineInformation = { underline = true, sp = u.color_gamma(p.blue, 0.5) },
LspDiagnosticsUnderlineWarning = {underline = true, sp = u.color_gamma(p.yellow, 0.5)}
LspDiagnosticsUnderlineWarning = { underline = true, sp = u.color_gamma(p.yellow, 0.5) },
}
hl.plugins.whichkey = {
WhichKey = hl.predef.Red,
WhichKeyDesc = hl.predef.Blue,
WhichKeyGroup = hl.predef.Orange,
WhichKeySeperator = hl.predef.Green
WhichKeySeperator = hl.predef.Green,
}
hl.plugins.gitgutter = {
GitGutterAdd = { fg = p.diff_green },
GitGutterChange = { fg = p.diff_blue },
GitGutterDelete = {fg = p.diff_red}
GitGutterDelete = { fg = p.diff_red },
}
hl.plugins.diffview = {
@@ -180,13 +180,13 @@ hl.plugins.diffview = {
DiffviewStatusUnmerged = hl.predef.Blue,
DiffviewStatusUnknown = hl.predef.Red,
DiffviewStatusDeleted = hl.predef.Red,
DiffviewStatusBroken = hl.predef.Red
DiffviewStatusBroken = hl.predef.Red,
}
hl.plugins.treesitter = {
commentTSDanger = hl.predef.RedItalic,
commentTSNote = hl.predef.BlueItalic,
commentTSWarning = hl.predef.YellowItalic
commentTSWarning = hl.predef.YellowItalic,
}
hl.plugins.gitsigns = {
@@ -198,7 +198,7 @@ hl.plugins.gitsigns = {
GitSignsChangeNr = hl.predef.Blue,
GitSignsDelete = hl.predef.Red,
GitSignsDeleteLn = hl.predef.Red,
GitSignsDeleteNr = hl.predef.Red
GitSignsDeleteNr = hl.predef.Red,
}
hl.langs.markdown = {
@@ -228,7 +228,7 @@ hl.langs.markdown = {
markdownRule = hl.predef.Purple,
markdownUrl = { fg = p.blue, underline = true },
markdownUrlDelimiter = hl.predef.Grey,
markdownUrlTitleDelimiter = hl.predef.Green
markdownUrlTitleDelimiter = hl.predef.Green,
}
hl.langs.scala = {
@@ -237,7 +237,7 @@ hl.langs.scala = {
scalaInterpolation = hl.predef.Purple,
scalaTypeOperator = hl.predef.Red,
scalaOperator = hl.predef.Red,
scalaKeywordModifier = hl.predef.Red
scalaKeywordModifier = hl.predef.Red,
}
function M.clear_namespace()
@@ -249,15 +249,23 @@ local function load_sync()
load_highlights(hl.predef)
load_highlights(hl.common)
load_highlights(hl.syntax)
for _, group in pairs(hl.langs) do load_highlights(group) end
for _, group in pairs(hl.plugins) do load_highlights(group) end
for _, group in pairs(hl.langs) do
load_highlights(group)
end
for _, group in pairs(hl.plugins) do
load_highlights(group)
end
set_hl_ns(ns)
end
local load_async
load_async = vim.loop.new_async(vim.schedule_wrap(function()
for _, group in pairs(hl.langs) do load_highlights(group) end
for _, group in pairs(hl.plugins) do load_highlights(group) end
for _, group in pairs(hl.langs) do
load_highlights(group)
end
for _, group in pairs(hl.plugins) do
load_highlights(group)
end
set_hl_ns(ns)
load_async:close()
end))
@@ -268,4 +276,3 @@ function M.setup()
end
return M

10
lua/tokyodark/init.lua
View File

@@ -1,18 +1,20 @@
local highlights = require('tokyodark.highlights')
local terminal = require('tokyodark.terminal')
local highlights = require("tokyodark.highlights")
local terminal = require("tokyodark.terminal")
local M = {}
function M.colorscheme()
vim.cmd("hi clear")
if vim.fn.exists("syntax_on") then vim.cmd("syntax reset") end
if vim.fn.exists("syntax_on") then
vim.cmd("syntax reset")
end
vim.o.background = "dark"
vim.o.termguicolors = true
vim.g.colors_name = "tokyodark"
highlights.setup()
terminal.setup()
vim.cmd [[au ColorSchemePre * lua require("tokyodark.highlights").clear_namespace()]]
vim.cmd([[au ColorSchemePre * lua require("tokyodark.highlights").clear_namespace()]])
end
return M

60
lua/tokyodark/palette.lua
View File

@@ -1,37 +1,39 @@
local color_gamma = require('tokyodark.utils').color_gamma
local gamma = require('tokyodark.config').gamma
local color_gamma = require("tokyodark.utils").color_gamma
local gamma = require("tokyodark.config").gamma
local colors = {
black = '#06080A',
bg0 = '#11121D',
bg1 = '#1A1B2A',
bg2 = '#212234',
bg3 = '#392B41',
bg4 = '#4A5057',
bg5 = '#282c34',
bg_red = '#FE6D85',
bg_green = '#98C379',
bg_blue = '#9FBBF3',
diff_red = '#773440',
diff_green = '#587738',
diff_blue = '#354A77',
diff_add = '#1E2326',
diff_change = '#262b3d',
diff_delete = '#281B27',
fg = '#A0A8CD',
red = '#EE6D85',
orange = '#F6955B',
yellow = '#D7A65F',
green = '#95C561',
blue = '#7199EE',
cyan = '#38A89D',
purple = '#A485DD',
grey = '#4A5057',
none = 'NONE'
black = "#06080A",
bg0 = "#11121D",
bg1 = "#1A1B2A",
bg2 = "#212234",
bg3 = "#392B41",
bg4 = "#4A5057",
bg5 = "#282c34",
bg_red = "#FE6D85",
bg_green = "#98C379",
bg_blue = "#9FBBF3",
diff_red = "#773440",
diff_green = "#587738",
diff_blue = "#354A77",
diff_add = "#1E2326",
diff_change = "#262b3d",
diff_delete = "#281B27",
fg = "#A0A8CD",
red = "#EE6D85",
orange = "#F6955B",
yellow = "#D7A65F",
green = "#95C561",
blue = "#7199EE",
cyan = "#38A89D",
purple = "#A485DD",
grey = "#4A5057",
none = "NONE",
}
local function gamma_correction(colors)
local colors_corrected = {}
for k, v in pairs(colors) do colors_corrected[k] = color_gamma(v, gamma) end
for k, v in pairs(colors) do
colors_corrected[k] = color_gamma(v, gamma)
end
return colors_corrected
end

11
lua/tokyodark/utils.lua
View File

@@ -1,13 +1,15 @@
local U = {}
function U.tprint(tbl, indent)
if not indent then indent = 0 end
if not indent then
indent = 0
end
for k, v in pairs(tbl) do
local formatting = string.rep(" ", indent) .. k .. ": "
if type(v) == "table" then
print(formatting)
U.tprint(v, indent + 1)
elseif type(v) == 'boolean' then
elseif type(v) == "boolean" then
print(formatting .. tostring(v))
else
print(formatting .. v)
@@ -17,8 +19,7 @@ end
function U.hex2rgb(hex)
hex = hex:gsub("#", "")
return tonumber("0x" .. hex:sub(1, 2)), tonumber("0x" .. hex:sub(3, 4)),
tonumber("0x" .. hex:sub(5, 6))
return tonumber("0x" .. hex:sub(1, 2)), tonumber("0x" .. hex:sub(3, 4)), tonumber("0x" .. hex:sub(5, 6))
end
function U.gamma_corrector(value, gamma)
@@ -27,7 +28,7 @@ function U.gamma_corrector(value, gamma)
end
function U.color_gamma(hex, gamma)
if hex:find('#') == nil then
if hex:find("#") == nil then
return hex
end
local r, g, b = U.hex2rgb(hex)