ref(colors): sync with master-v3

Iron-E · Mar 29, 2023 · c591408 · c591408
1 parent 62d8817
commit c591408
Showing 1 changed file with 80 additions and 76 deletions.
diff --git a/colors/highlite.lua b/colors/highlite.lua
@@ -309,8 +309,8 @@ local highlight_groups = {
 	--[[ 4.2.2. Separators]]
 	FloatBorder = {fg = gray},
 	TabLine = function(self) return {fg = highlight_group_normal.fg, bg = self.StatusLine.bg} end,
-	TabLineFill = function(self) return {fg = self.TabLine.bg, bg = black} end,
-	TabLineSel = function(self) return {fg = self.TabLine.fg, bg = highlight_group_normal.bg} end,
+	TabLineFill = {fg = black, bg = black},
+	TabLineSel = function(self) return {fg = self.TabLine.fg, bg = gray_dark} end,
 	Title = {style = 'bold'},
 	VertSplit = {fg = white},
 
@@ -408,14 +408,17 @@ local highlight_groups = {
 	LspDiagnosticsUnderlineInfo  = 'DiagnosticUnderlineInfo',
 	LspDiagnosticsUnderlineWarning = 'DiagnosticUnderlineWarn',
 
-	['@lsp.mod.constant'] = 'Constant',
-	['@lsp.type.boolean'] = 'Boolean',
-	['@lsp.type.character'] = 'Character',
-	['@lsp.type.float'] = 'Float',
-	['@lsp.type.interface'] = 'Type',
-	['@lsp.type.namespace'] = 'Directory',
-	['@lsp.type.number'] = 'Number',
-	['@lsp.type.string'] = 'String',
+	['@lsp.mod.constant'] = '@constant',
+	['@lsp.mod.readonly'] = '@lsp.mod.constant',
+	['@lsp.type.boolean'] = '@boolean',
+	['@lsp.type.character'] = '@character',
+	['@lsp.type.float'] = '@float',
+	['@lsp.type.interface'] = '@lsp.type.type',
+	['@lsp.type.namespace'] = '@namespace',
+	['@lsp.type.number'] = '@number',
+	['@lsp.type.operator'] = '@operator',
+	['@lsp.type.string'] = '@string',
+	['@lsp.typemod.type.readonly'] = '@lsp.type.type',
 
 	--[[ 4.2.12. Cursor ]]
 	Cursor   = {style = 'inverse'},
@@ -575,26 +578,33 @@ local highlight_groups = {
 	jsonStringSQError = 'Exception',
 
 	--[[ 4.3.12. Lua ]]
+	['@lsp.type.function.lua'] = {},
 	['@lsp.type.keyword.lua'] = 'SpecialComment',
-	['@lsp.type.string.lua'] = 'String',
+	['@lsp.typemod.function.declaration.lua'] = '@lsp.type.function',
+	['@lsp.typemod.function.global.lua'] = '@lsp.type.function',
 	['@lsp.typemod.variable.defaultLibrary.lua'] = '@lsp.type.class.lua',
-	luaBraces   = 'Structure',
+	['@lsp.typemod.variable.definition.lua'] = '@structure.lua',
+	luaBraces = 'Structure',
 	luaBrackets = 'Delimiter',
-	luaBuiltin  = 'Keyword',
-	luaComma    = 'Delimiter',
+	luaBuiltin = 'Keyword',
+	luaComma = 'Delimiter',
+	luaDocTag = 'SpecialComment',
 	luaFuncArgName = 'Identifier',
 	luaFuncCall = 'Function',
-	luaFuncId   = 'luaNoise',
+	luaFuncId = 'luaNoise',
 	luaFuncKeyword = 'Type',
-	luaFuncName   = 'Function',
+	luaFuncName = 'Function',
 	luaFuncParens = 'Delimiter',
-	luaFuncTable  = 'Structure',
-	luaIn     = 'luaRepeat',
-	luaLocal  = 'Type',
-	luaNoise  = 'Delimiter',
+	luaFuncTable = 'Identifier',
+	luaFunction = 'Keyword',
+	luaGotoLabel = 'luaLabel',
+	luaIn = 'luaRepeat',
+	luaLocal = 'Keyword',
+	luaNoise = 'Delimiter',
 	luaParens = 'Delimiter',
 	luaSpecialTable = 'Structure',
 	luaSpecialValue = 'Function',
+	luaStatement = 'Keyword',
 	luaStringLongTag = function(self)
 		local delimiter = self.Delimiter
 		return {bg = delimiter.bg, fg = delimiter.fg, style = 'italic'}
@@ -607,6 +617,7 @@ local highlight_groups = {
 	--[[ 4.3.13. Markdown ]]
 	markdownCode = 'mkdCode',
 	markdownCodeDelimiter = 'mkdCodeDelimiter',
+	markdownEscape = 'SpecialChar',
 	markdownH1 = {fg = red, style = 'bold'},
 	markdownH2 = {fg = orange, style = 'bold'},
 	markdownH3 = {fg = yellow, style = 'bold'},
@@ -809,22 +820,23 @@ local highlight_groups = {
 	manUnderline = '@text.literal',
 
 	--[[ 4.3.39 Rust ]]
-	['@lsp.mod.callable.rust'] = 'Function',
-	['@lsp.type.builtinType.rust'] = 'Type',
+	['@lsp.mod.callable.rust'] = '@lsp.type.function',
+	['@lsp.type.builtinType.rust'] = '@lsp.type.type',
 	['@lsp.type.character.rust'] = {},
-	['@lsp.type.decorator.rust'] = 'PreProc',
-	['@lsp.type.derive.rust'] = 'Macro',
+	['@lsp.type.decorator.rust'] = '@preproc',
+	['@lsp.type.derive.rust'] = '@macro',
 	['@lsp.type.enumMember.rust'] = {},
 	['@lsp.type.macro.rust'] = {},
-	['@lsp.type.selfKeyword.rust'] = 'Keyword',
-	['@lsp.type.selfTypeKeyword.rust'] = 'Typedef',
+	['@lsp.type.operator.rust'] = {},
+	['@lsp.type.selfKeyword.rust'] = '@keyword',
+	['@lsp.type.selfTypeKeyword.rust'] = '@lsp.type.typeAlias.rust',
 	['@lsp.type.string.rust'] = {},
-	['@lsp.type.typeAlias.rust'] = 'Typedef',
+	['@lsp.type.typeAlias.rust'] = '@type.definition',
 	['@lsp.typemod.character.injected.rust'] = '@lsp.type.character',
 	['@lsp.typemod.deriveHelper.attribute.rust'] = '@lsp.type.decorator.rust',
-	['@lsp.typemod.keyword.injected.rust'] = 'Keyword',
-	['@lsp.typemod.macro.injected.rust'] = 'Macro',
-	['@lsp.typemod.operator.injected.rust'] = 'Operator',
+	['@lsp.typemod.keyword.injected.rust'] = '@keyword',
+	['@lsp.typemod.macro.injected.rust'] = '@macro',
+	['@lsp.typemod.operator.injected.rust'] = '@operator',
 	['@lsp.typemod.string.injected.rust'] = '@lsp.type.string',
 	rustAssert = 'Debug',
 	rustCharacterDelimiter = 'rustNoise',
@@ -938,62 +950,54 @@ local highlight_groups = {
 	NERDTreeLinkTarget = 'Tag',
 
 	--[[ 4.4.8. nvim-treesitter ]]
-	['@constant.builtin'] = '@constant',
-	['@constant.macro'] = '@define',
-	['@constructor'] = '@function',
-	['@function.builtin'] = '@function',
-	['@function.macro'] = '@macro',
 	['@namespace'] = 'Directory',
-	['@string.escape'] = '@string.special',
-	['@tag'] = 'Tag',
-	['@text.danger'] = 'ErrorMsg',
-	['@text.literal'] = 'mkdCode',
-	['@text.uri'] = 'Underlined',
-	['@text.warning'] = 'WarningMsg',
 
 	--[[ 4.4.9. barbar.nvim ]]
-	BufferAlternate       = function(self) return {fg = self.BufferVisible.fg, bg = gray_dark} end,
-	BufferAlternateERROR  = function(self) return {fg = self.ErrorMsg.fg, bg = gray_dark} end,
-	BufferAlternateHINT   = function(self) return {fg = self.HintMsg.fg, bg = gray_dark} end,
-	BufferAlternateIndex  = function(self) return {fg = self.Number.fg, bg = gray_dark} end,
-	BufferAlternateINFO   = function(self) return {fg = self.InfoMsg.fg, bg = gray_dark} end,
-	BufferAlternateMod    = function(self) return {fg = self.BufferVisibleMod.fg, bg = gray_dark, style = 'bold'} end,
-	BufferAlternateSign   = {fg = teal, bg = gray_dark},
+	BufferAlternate = function(self) return {fg = self.BufferVisible.fg, bg = self.TabLine.bg} end,
+	BufferAlternateERROR = function(self) return {fg = self.ErrorMsg.fg, bg = gray_dark} end,
+	BufferAlternateHINT = function(self) return {fg = self.DiagnosticFloatingHint.fg, bg = gray_dark} end,
+	BufferAlternateIndex = function(self) return {fg = self.Number.fg, bg = gray_dark} end,
+	BufferAlternateINFO = function(self) return {fg = self.DiagnosticFloatingInfo.fg, bg = gray_dark} end,
+	BufferAlternateMod = function(self) return {fg = self.BufferVisibleMod.fg, bg = gray_dark, style = 'bold'} end,
+	BufferAlternateSign = function(self) return {fg = self.DiagnosticFloatingHint.fg, bg = self.BufferAlternate.bg} end,
 	BufferAlternateTarget = function(self) return {fg = self.BufferAlternateSign.fg, bg = gray_dark, style = 'italic'} end,
-	BufferAlternateWARN   = function(self) return {fg = self.WarningMsg.fg, bg = gray_dark} end,
-
-	BufferCurrent       = 'TabLineSel',
-	BufferCurrentERROR  = function(self) return {fg = self.ErrorMsg.fg, bg = self.BufferCurrent.bg} end,
-	BufferCurrentHINT   = function(self) return {fg = self.HintMsg.fg, bg = self.BufferCurrent.bg} end,
-	BufferCurrentIndex  = function(self) return {fg = self.Number.fg, bg = self.BufferCurrent.bg} end,
-	BufferCurrentINFO   = function(self) return {fg = self.InfoMsg.fg, bg = self.BufferCurrent.bg} end,
-	BufferCurrentMod    = {fg = tan, bg = black, style = 'bold'},
-	BufferCurrentSign   = 'HintMsg',
+	BufferAlternateWARN = function(self) return {fg = self.WarningMsg.fg, bg = gray_dark} end,
+
+	BufferCurrent = 'TabLineSel',
+	BufferCurrentERROR = function(self) return {fg = self.ErrorMsg.fg, bg = self.BufferCurrent.bg} end,
+	BufferCurrentHINT = function(self) return {fg = self.DiagnosticFloatingHint.fg, bg = self.BufferCurrent.bg} end,
+	BufferCurrentIndex = function(self) return {fg = self.Number.fg, bg = self.BufferCurrent.bg} end,
+	BufferCurrentINFO = function(self) return {fg = self.DiagnosticFloatingInfo.fg, bg = self.BufferCurrent.bg} end,
+	BufferCurrentMod = {fg = tan, bg = black, style = 'bold'},
+	BufferCurrentSign = function(self) return {fg = teal, bg = self.BufferCurrent.bg} end,
 	BufferCurrentTarget = 'BufferCurrentSign',
-	BufferCurrentWARN   = function(self) return {fg = self.WarningMsg.fg, bg = self.BufferCurrent.bg} end,
-
-	BufferInactive       = 'BufferVisible',
-	BufferInactiveERROR  = function(self) return {fg = self.ErrorMsg.fg, bg = self.BufferInactive.bg} end,
-	BufferInactiveHINT   = function(self) return {fg = self.HintMsg.fg, bg = self.BufferInactive.bg} end,
-	BufferInactiveIndex  = function(self) return {fg = self.Number.fg, bg = self.BufferInactive.bg} end,
-	BufferInactiveINFO   = function(self) return {fg = self.InfoMsg.fg, bg = self.BufferInactive.bg} end,
-	BufferInactiveMod    = 'BufferVisibleMod',
-	BufferInactiveSign   = 'BufferVisibleSign',
+	BufferCurrentWARN = function(self) return {fg = self.WarningMsg.fg, bg = self.BufferCurrent.bg} end,
+
+	BufferInactive = 'BufferVisible',
+	BufferInactiveERROR = function(self) return {fg = self.ErrorMsg.fg, bg = self.BufferInactive.bg} end,
+	BufferInactiveHINT = function(self) return {fg = self.DiagnosticFloatingHint.fg, bg = self.BufferInactive.bg} end,
+	BufferInactiveIndex = function(self) return {fg = self.Number.fg, bg = self.BufferInactive.bg} end,
+	BufferInactiveINFO = function(self) return {fg = self.DiagnosticFloatingInfo.fg, bg = self.BufferInactive.bg} end,
+	BufferInactiveMod = 'BufferVisibleMod',
+	BufferInactiveSign = 'BufferVisibleSign',
 	BufferInactiveTarget = 'BufferVisibleTarget',
-	BufferInactiveWARN   = function(self) return {fg = self.WarningMsg.fg, bg = self.BufferInactive.bg} end,
+	BufferInactiveWARN = function(self) return {fg = self.WarningMsg.fg, bg = self.BufferInactive.bg} end,
 
-	BufferTabpages    = {style = 'bold'},
+	BufferTabpages = {style = 'bold'},
 	BufferTabpageFill = 'TabLineFill',
 
-	BufferVisible       = 'TabLine',
-	BufferVisibleERROR  = function(self) return {fg = self.ErrorMsg.fg, bg = self.BufferVisible.bg} end,
-	BufferVisibleHINT   = function(self) return {fg = self.HintMsg.fg, bg = self.BufferVisible.bg} end,
-	BufferVisibleIndex  = function(self) return {fg = self.Number.fg, bg = self.BufferVisible.bg} end,
-	BufferVisibleINFO   = function(self) return {fg = self.InfoMsg.fg, bg = self.BufferVisible.bg} end,
-	BufferVisibleMod    = function(self) return {fg = white, bg = self.BufferVisible.bg, style = 'italic'} end,
-	BufferVisibleSign   = function(self) return {fg = self.BufferVisibleMod.fg, bg = self.BufferVisibleMod.bg, style = 'bold'} end,
+	BufferVisible = 'TabLine',
+	BufferVisibleERROR = function(self) return {fg = self.ErrorMsg.fg, bg = self.BufferVisible.bg} end,
+	BufferVisibleHINT = function(self) return {fg = self.DiagnosticFloatingHint.fg, bg = self.BufferVisible.bg} end,
+	BufferVisibleIndex = function(self) return {fg = self.Number.fg, bg = self.BufferVisible.bg} end,
+	BufferVisibleINFO = function(self) return {fg = self.DiagnosticFloatingInfo.fg, bg = self.BufferVisible.bg} end,
+	BufferVisibleMod = function(self) return {fg = white, bg = self.BufferVisible.bg, style = 'italic'} end,
+	BufferVisibleSign = function(self)
+		local definition = self.BufferVisibleMod
+		return {fg = definition.fg, bg = definition.bg, style = 'bold'}
+	end,
 	BufferVisibleTarget = 'BufferVisibleSign',
-	BufferVisibleWARN   = function(self) return {fg = self.WarningMsg.fg, bg = self.BufferVisible.bg} end,
+	BufferVisibleWARN = function(self) return {fg = self.WarningMsg.fg, bg = self.BufferVisible.bg} end,
 
 	--[[ 4.4.10. vim-sandwhich ]]
 	OperatorSandwichChange = 'DiffText',