gabehf/base46
1
0
Fork 0
mirror of https://github.com/gabehf/base46.git synced 2026-03-09 07:28:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #122 from lucario387/update-treesitter

Browse source 
Update to new treesitter syntax
This commit is contained in:
Sidhanth Rathod 2022-10-17 06:31:44 +05:30 • committed by GitHub
commit 48efde4212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 179 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

2
after/queries/lua/highlights.scm
View file

@ -1,2 +1,2 @@
(field
name: (identifier) @TSFieldKey)
name: (identifier) @field.key)

2
lua/base46/init.lua
View file

@ -44,7 +44,7 @@ M.load_all_highlights = function()
local clear_hl = require("base46").clear_highlights
clear_hl "BufferLine"
clear_hl "TS"
clear_hl "@"
reload "base46.integrations"
reload "base46.chadlights"

114
lua/base46/integrations/treesitter.lua
View file

@ -1,162 +1,166 @@
local theme = require("base46").get_theme_tb "base_16"
return {
TSAnnotation = {
-- `@annotation` is not one of the default capture group, should we keep it
["@annotation"] = {
fg = theme.base0F,
},
TSAttribute = {
['@attribute'] = {
fg = theme.base0A,
},
TSTagAttribute = {
link = "TSProperty",
},
TSCharacter = {
["@character"] = {
fg = theme.base08,
},
TSConstructor = {
["@constructor"] = {
fg = theme.base0C,
},
TSConstBuiltin = {
["@constant.builtin"] = {
fg = theme.base09,
},
TSConstMacro = {
["@constant.macro"] = {
fg = theme.base08,
},
TSError = {
["@error"] = {
fg = theme.base08,
},
TSException = {
["@exception"] = {
fg = theme.base08,
},
TSFloat = {
["@float"] = {
fg = theme.base09,
},
TSKeyword = {
["@keyword"] = {
fg = theme.base0E,
},
TSKeywordFunction = {
["@keyword.function"] = {
fg = theme.base0E,
},
TSKeywordReturn = {
["@keyword.return"] = {
fg = theme.base0E,
},
TSFunction = {
["@function"] = {
fg = theme.base0D,
},
TSFuncBuiltin = {
["@function.builtin"] = {
fg = theme.base0D,
},
TSFuncMacro = {
["@function.macro"] = {
fg = theme.base08,
},
TSKeywordOperator = {
["@keyword.operator"] = {
fg = theme.base0E,
},
TSMethod = {
["@method"] = {
fg = theme.base0D,
},
TSNamespace = {
["@namespace"] = {
fg = theme.base08,
},
TSNone = {
["@none"] = {
fg = theme.base05,
},
TSParameter = {
["@paramter"] = {
fg = theme.base08,
},
TSParameterReference = {
["@reference"] = {
fg = theme.base05,
},
TSPunctBracket = {
["@punctuation.bracket"] = {
fg = theme.base0F,
},
TSPunctDelimiter = {
["@punctuation.delimiter"] = {
fg = theme.base0F,
},
TSPunctSpecial = {
["@punctuation.special"] = {
fg = theme.base08,
},
TSStringRegex = {
["@string.regex"] = {
fg = theme.base0C,
},
TSStringEscape = {
["@string.escape"] = {
fg = theme.base0C,
},
TSSymbol = {
["@symbol"] = {
fg = theme.base0B,
},
TSTagDelimiter = {
-- @tag
["@tag.attribute"] = {
link = "@property",
},
["@tag.delimiter"] = {
fg = theme.base0F,
},
TSText = {
["@text"] = {
fg = theme.base05,
},
TSStrong = {
["@text.strong"] = {
bold = true,
},
TSEmphasis = {
["@text.emphasis"] = {
fg = theme.base09,
},
TSStrike = {
["@text.strike"] = {
fg = theme.base00,
strikethrough = true,
},
TSLiteral = {
["@text.literal"] = {
fg = theme.base09,
},
TSURI = {
["@text.uri"] = {
fg = theme.base09,
underline = true,
},
TSTypeBuiltin = {
["@type.builtin"] = {
fg = theme.base0A,
},
TSVariableBuiltin = {
fg = theme.base09,
},
TSVariable = {
["@variable"] = {
fg = theme.base05,
},
TSDefinition = {
["@variable.builtin"] = {
fg = theme.base09,
},
-- variable.global
["@definition"] = {
sp = theme.base04,
underline = true,
},
@ -166,27 +170,27 @@ return {
underline = true,
},
TSCurrentScope = {
["@scope"] = {
bold = true,
},
luaTSField = {
["@field"] = {
fg = theme.base08,
},
["@field.key"] = {
fg = theme.base0D,
},
TSFieldKey = {
["@property"] = {
fg = theme.base08,
},
TSProperty = {
fg = theme.base08,
},
TSInclude = {
["@include"] = {
link = "Include",
},
TSConditional = {
["@conditional"] = {
link = "Conditional",
},
}

10
lua/base46/themes/ayu-dark.lua
View file

@ -53,12 +53,12 @@ M.base_16 = {
}
M.polish_hl = {
TSTagDelimiter = { fg = M.base_30.cyan },
TSFunction = { fg = M.base_30.orange },
luaTSField = { fg = M.base_16.base0D },
TSParameter = { fg = M.base_16.base0F },
TSConstructor = { fg = M.base_16.base0A },
TSTagAttribute = { fg = M.base_30.orange },
["@tag.delimiter"] = { fg = M.base_30.cyan },
["@function"] = { fg = M.base_30.orange },
["@parameter"] = { fg = M.base_16.base0F },
["@constructor"] = { fg = M.base_16.base0A },
["@tag.attribute"] = { fg = M.base_30.orange },
}
M = require("base46").override_theme(M, "ayu-dark")

6
lua/base46/themes/catppuccin.lua
View file

@ -54,9 +54,9 @@ M.base_16 = {
}
M.polish_hl = {
TSVariable = { fg = M.base_30.lavender },
TSProperty = { fg = M.base_30.teal },
TSVariableBuiltin = { fg = M.base_30.red },
["@variable"] = { fg = M.base_30.lavender },
["@property"] = { fg = M.base_30.teal },
["@variable.builtin"] = { fg = M.base_30.red },
}
vim.opt.bg = "dark"

4
lua/base46/themes/catppuccin_latte.lua
View file

@ -63,8 +63,8 @@ M.polish_hl = {
WhichKeyDesc = { fg = M.base_30.white },
Pmenu = { bg = M.base_30.black2 },
St_pos_text = { fg = M.base_30.white },
TSVariableBuiltin = { fg = M.base_30.red },
TSProperty = { fg = M.base_30.teal },
["@variable.builtin"] = { fg = M.base_30.red },
["@property"] = { fg = M.base_30.teal },
}
M = require("base46").override_theme(M, "catppuccin_latte")

4
lua/base46/themes/chadracula.lua
View file

@ -53,8 +53,8 @@ M.base_16 = {
}
M.polish_hl = {
TSFuncBuiltin = { fg = M.base_30.cyan },
TSNumber = { fg = M.base_30.purple },
["@function.builtin"] = { fg = M.base_30.cyan },
["@number"] = { fg = M.base_30.purple },
}
vim.opt.bg = "dark"

16
lua/base46/themes/chocolate.lua
View file

@ -57,15 +57,15 @@ M.base_16 = {
}
M.polish_hl = {
TSField = { fg = M.base_30.purple },
TSVariable = { fg = M.base_16.base06 },
TSModule = { fg = M.base_30.beige },
["@field"] = { fg = M.base_30.purple },
["@variable"] = { fg = M.base_16.base06 },
["@module"] = { fg = M.base_30.beige },
Operator = { fg = M.base_30.blue },
TSAttribute = { fg = M.base_30.cyan },
TSPunctBracket = { fg = M.base_16.base06 },
TSParenthesis = { link = "TSPunctBracket" },
TSParameter = { fg = M.base_30.green },
TSFuncBuiltin = { fg = M.base_30.yellow },
["@attribute"] = { fg = M.base_30.cyan },
["@punctuation.bracket"] = { fg = M.base_16.base06 },
["@parenthesis"] = { link = "@punctuation.bracket" },
["@parameter"] = { fg = M.base_30.green },
["@function.builtin"] = { fg = M.base_30.yellow },
}
vim.opt.bg = "dark"

16
lua/base46/themes/dark_horizon.lua
View file

@ -54,15 +54,15 @@ M.base_16 = {
M.polish_hl = {
Include = { fg = M.base_16.base0E, bold = true },
TSVariable = { fg = M.base_16.base08 },
TSProperty = { fg = M.base_16.base0E },
Repeat = { fg = M.base_16.base0E },
TSTagDelimiter = { fg = M.base_16.base05 },
TSFunction = { fg = M.base_30.orange },
luaTSField = { fg = M.base_16.base0E },
TSParameter = { fg = M.base_16.base0F },
TSConstructor = { fg = M.base_16.base0A },
TSTagAttribute = { fg = M.base_16.orange },
Repeat = { fg = M.base_16.base0E },
["@variable"] = { fg = M.base_16.base08 },
["@property"] = { fg = M.base_16.base0E },
["@tag.delimiter"] = { fg = M.base_16.base05 },
["@function"] = { fg = M.base_30.orange },
["@parameter"] = { fg = M.base_16.base0F },
["@constructor"] = { fg = M.base_16.base0A },
["@tag.attribute"] = { fg = M.base_16.orange },
}
vim.opt.bg = "dark"

2
lua/base46/themes/doomchad.lua
View file

@ -53,7 +53,7 @@ M.base_16 = {
}
M.polish_hl = {
TSFieldKey = { fg = M.base_30.blue },
["@field"] = { fg = M.base_30.blue },
}
vim.opt.bg = "dark"

4
lua/base46/themes/everforest.lua
View file

@ -55,8 +55,8 @@ M.base_16 = {
vim.opt.bg = "dark"
M.polish_hl = {
TSTag = { fg = M.base_30.orange },
TSTagDelimiter = { fg = M.base_30.green },
["@tag"] = { fg = M.base_30.orange },
["@tag.delimiter"] = { fg = M.base_30.green },
}
M = require("base46").override_theme(M, "everforest")

8
lua/base46/themes/everforest_light.lua
View file

@ -54,10 +54,6 @@ M.base_16 = {
M.polish_hl = {
DiffAdd = { fg = M.base_30.green },
TSTag = { fg = M.base_30.orange },
TSField = { fg = M.base_16.base05 },
TSInclude = { fg = M.base_16.base08 },
TSConstructor = { fg = M.base_30.blue },
WhichKeyDesc = { fg = M.base_30.white },
WhichKey = { fg = M.base_30.white },
NvimTreeFolderName = { fg = "#4e565c" },
@ -65,6 +61,10 @@ M.polish_hl = {
Pmenu = { bg = M.base_30.black2 },
IndentBlanklineContextStart = { bg = M.base_30.black2 },
St_pos_text = { fg = M.base_30.white },
["@tag"] = { fg = M.base_30.orange },
["@field"] = { fg = M.base_16.base05 },
["@include"] = { fg = M.base_16.base08 },
["@constructor"] = { fg = M.base_30.blue },
}
vim.opt.bg = "light"

2
lua/base46/themes/falcon.lua
View file

@ -62,8 +62,8 @@ M.polish_hl = {
Type = { fg = M.base_30.white2 },
Include = { fg = M.base_30.tan },
Keyword = { fg = M.base_16.base0D },
TSKeyword = { fg = M.base_16.base0D },
Operator = { fg = M.base_30.red },
["@keyword"] = { fg = M.base_16.base0D },
}
vim.opt.bg = "dark"

4
lua/base46/themes/gatekeeper.lua
View file

@ -53,8 +53,8 @@ M.base_16 = {
}
M.polish_hl = {
TSVariable = { fg = M.base_30.orange },
TSParameter = { fg = M.base_30.white },
["@variable"] = { fg = M.base_30.orange },
["@parameter"] = { fg = M.base_30.white },
}
vim.opt.bg = "dark"

6
lua/base46/themes/gruvbox_material.lua
View file

@ -54,9 +54,9 @@ M.base_16 = {
M.polish_hl = {
Include = { fg = M.base_16.base0E },
TSVariable = { fg = M.base_16.base08 },
TSProperty = { fg = M.base_16.base0C },
Repeat = { fg = M.base_16.base0E },
Repeat = { fg = M.base_16.base0E },
["@variable"] = { fg = M.base_16.base08 },
["@property"] = { fg = M.base_16.base0C },
}
vim.opt.bg = "dark"

6
lua/base46/themes/kanagawa.lua
View file

@ -53,9 +53,9 @@ M.base_16 = {
}
M.polish_hl = {
TSInclude = { fg = M.base_30.purple },
TSURI = { fg = M.base_30.blue },
TSTagDelimiter = { fg = M.base_30.red },
["@include"] = { fg = M.base_30.purple },
["@uri"] = { fg = M.base_30.blue },
["@tag.delimiter"] = { fg = M.base_30.red },
Number = {
fg = M.base_30.baby_pink,
},

4
lua/base46/themes/monekai.lua
View file

@ -53,8 +53,8 @@ M.base_16 = {
}
M.polish_hl = {
TSParameter = { fg = M.base_30.blue },
TSFieldKey = { fg = M.base_30.red },
["@parameter"] = { fg = M.base_30.blue },
["@field.key"] = { fg = M.base_30.red },
}
vim.opt.bg = "dark"

2
lua/base46/themes/mountain.lua
View file

@ -53,7 +53,7 @@ M.base_16 = {
}
M.polish_hl = {
TSVariable = { fg = M.base_16.base05 },
["@variable"] = { fg = M.base_16.base05 },
}
vim.opt.bg = "dark"

6
lua/base46/themes/nightowl.lua
View file

@ -53,9 +53,9 @@ M.base_16 = {
}
M.polish_hl = {
TSParameter = { fg = M.base_30.orange },
TSKeywordReturn = { fg = M.base_30.cyan },
TSConditional = { fg = M.base_30.cyan },
["@parameter"] = { fg = M.base_30.orange },
["@keyword.return"] = { fg = M.base_30.cyan },
["@conditional"] = { fg = M.base_30.cyan },
PmenuSel = { bg = M.base_30.blue },
}

4
lua/base46/themes/nord.lua
View file

@ -53,8 +53,8 @@ M.base_16 = {
}
M.polish_hl = {
TSPunctBracket = { fg = M.base_30.white },
TSPunctDelimiter = { fg = M.base_30.white },
["@punctuation.bracket"] = { fg = M.base_30.white },
["@punctuation.delimiter"] = { fg = M.base_30.white },
}
vim.opt.bg = "dark"

2
lua/base46/themes/oceanic-next.lua
View file

@ -57,7 +57,7 @@ M.base_16 = {
}
M.polish_hl = {
TSParameter = {
["@parameter"] = {
fg = M.base_16.base0A,
},
Constant = {

2
lua/base46/themes/one_light.lua
View file

@ -57,7 +57,7 @@ vim.opt.bg = "light"
M.polish_hl = {
TelescopePromptPrefix = { fg = M.base_30.white },
TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
TSPunctBracket = { fg = M.base_30.nord_blue },
["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
FloatBorder = { fg = M.base_16.base05 },
DiffAdd = { fg = M.base_16.base05 },
TbLineThemeToggleBtn = { bg = M.base_30.one_bg3 },

2
lua/base46/themes/onenord_light.lua
View file

@ -57,7 +57,7 @@ M.polish_hl = {
WhichKey = { fg = M.base_30.white },
TelescopePromptPrefix = { fg = M.base_30.white },
TelescopeSelection = { bg = M.base_30.one_bg, fg = M.base_30.white },
TSPunctBracket = { fg = M.base_30.nord_blue },
["@punctuation.bracket"] = { fg = M.base_30.nord_blue },
FloatBorder = { fg = M.base_16.base05 },
DiffAdd = { fg = M.base_16.base05 },
St_pos_text = { fg = M.base_30.white },

4
lua/base46/themes/palenight.lua
View file

@ -53,8 +53,8 @@ M.base_16 = {
}
M.polish_hl = {
TSInclude = { fg = M.base_30.purple },
TSFieldKey = { fg = M.base_30.orange },
["@include"] = { fg = M.base_30.purple },
["@field.key"] = { fg = M.base_30.orange },
}
vim.opt.bg = "dark"

4
lua/base46/themes/radium.lua
View file

@ -53,8 +53,8 @@ M.base_16 = {
}
M.polish_hl = {
TSPunctBracket = { fg = M.base_16.base07 },
TSParenthesis = { link = "TSPunctBracket" },
["@punctuation.bracket"] = { fg = M.base_16.base07 },
["@parenthesis"] = { link = "@punctuation.bracket" },
}
vim.opt.bg = "dark"

6
lua/base46/themes/tokyonight.lua
View file

@ -53,9 +53,9 @@ M.base_16 = {
}
M.polish_hl = {
TSVariable = { fg = M.base_30.red },
TSFuncBuiltin = { fg = M.base_30.cyan },
TSParameter = { fg = M.base_30.white },
["@variable"] = { fg = M.base_30.red },
["@function.builtin"] = { fg = M.base_30.cyan },
["@parameter"] = { fg = M.base_30.white },
}
vim.opt.bg = "dark"

12
lua/base46/themes/vscode_dark.lua
View file

@ -55,13 +55,13 @@ M.base_16 = {
}
M.polish_hl = {
TSParameter = { fg = M.base_30.blue },
TSKeyword = { fg = M.base_30.blue },
TSVariable = { fg = M.base_30.cyan },
luaTSField = { fg = M.base_30.teal },
TSFieldKey = { fg = M.base_30.green1 },
TSKeywordReturn = { fg = M.base_16.base0E },
TSKeywordFunction = { fg = M.base_30.teal },
["@parameter"] = { fg = M.base_30.blue },
["@keyword"] = { fg = M.base_30.blue },
["@variable"] = { fg = M.base_30.cyan },
["@fieldkey"] = { fg = M.base_30.green1 },
["@keywordreturn"] = { fg = M.base_16.base0E },
["@keywordfunction"] = { fg = M.base_30.teal },
}
vim.opt.bg = "dark"

8
lua/base46/themes/wombat.lua
View file

@ -53,10 +53,10 @@ M.base_16 = {
}
M.polish_hl = {
TSInclude = { fg = M.base_30.red },
TSConstructor = { fg = M.base_30.orange },
TSVariable = { link = "TSConstructor" },
TSConditional = { link = "TSInclude" },
["@include"] = { fg = M.base_30.red },
["@constructor"] = { fg = M.base_30.orange },
["@variable"] = { link = "@constructor" },
["@conditional"] = { link = "@include" },
}
vim.opt.bg = "dark"

92
lua/base46/themes/yoru.lua
View file

@ -1,55 +1,55 @@
local M = {}
M.base_30 = {
white = "#edeff0",
darker_black = "#060809",
black = "#0c0e0f", -- nvim bg
lighter_black = "#121415",
one_bg = "#161819",
one_bg2 = "#1f2122",
one_bg3 = "#27292a",
grey = "#343637",
grey_fg = "#3e4041",
grey_fg2 = "#484a4b",
light_grey = "#505253",
red = "#DF5B61",
baby_pink = "#EE6A70",
pink = "#e8646a",
line = "#1b1d1e", -- for lines like vertsplit
green = "#78B892",
vibrant_green = "#81c19b",
nord_blue = "#5A84BC",
blue = "#6791C9",
yellow = "#ecd28b",
sun = "#f6dc95",
purple = "#c58cec",
dark_purple = "#BC83E3",
teal = "#70b8ca",
orange = "#E89982",
cyan = "#67AFC1",
statusline_bg = "#101213",
lightbg = "#1d1f20",
pmenu_bg = "#78B892",
folder_bg = "#6791C9",
white = "#edeff0",
darker_black = "#060809",
black = "#0c0e0f", -- nvim bg
lighter_black = "#121415",
one_bg = "#161819",
one_bg2 = "#1f2122",
one_bg3 = "#27292a",
grey = "#343637",
grey_fg = "#3e4041",
grey_fg2 = "#484a4b",
light_grey = "#505253",
red = "#DF5B61",
baby_pink = "#EE6A70",
pink = "#e8646a",
line = "#1b1d1e", -- for lines like vertsplit
green = "#78B892",
vibrant_green = "#81c19b",
nord_blue = "#5A84BC",
blue = "#6791C9",
yellow = "#ecd28b",
sun = "#f6dc95",
purple = "#c58cec",
dark_purple = "#BC83E3",
teal = "#70b8ca",
orange = "#E89982",
cyan = "#67AFC1",
statusline_bg = "#101213",
lightbg = "#1d1f20",
pmenu_bg = "#78B892",
folder_bg = "#6791C9",
}
M.base_16 = {
base00 = "#0c0e0f",
base01 = "#121415",
base02 = "#161819",
base03 = "#1f2122",
base04 = "#27292a",
base05 = "#edeff0",
base06 = "#e4e6e7",
base07 = "#f2f4f5",
base08 = "#f26e74",
base09 = "#ecd28b",
base0A = "#e79881",
base0B = "#82c29c",
base0C = "#6791C9",
base0D = "#709ad2",
base0E = "#c58cec",
base0F = "#e8646a",
base00 = "#0c0e0f",
base01 = "#121415",
base02 = "#161819",
base03 = "#1f2122",
base04 = "#27292a",
base05 = "#edeff0",
base06 = "#e4e6e7",
base07 = "#f2f4f5",
base08 = "#f26e74",
base09 = "#ecd28b",
base0A = "#e79881",
base0B = "#82c29c",
base0C = "#6791C9",
base0D = "#709ad2",
base0E = "#c58cec",
base0F = "#e8646a",
}
vim.opt.bg = "dark"