This commit is contained in:
Ray Elliott 2021-09-22 09:52:33 +01:00
parent 9cf8c5df17
commit 17e8a2cdaf
1 changed files with 49 additions and 24 deletions

View File

@ -105,11 +105,11 @@ local c_bg_hl_special_strong = {"#a3e0ff", 17, "cyan"}
local c_bg_hl_special = {"#beced5", 250, "cyan"}
local c_bg_hl_special_weak = {"#dce5ed", 250, "cyan"}
local c_fg_strongest = {'#444444', 236, 'darkgrey'}
local c_fg_stronger = {'#444444', 236, 'darkgrey'}
local c_fg_strong = {'#666666', 236, 'darkgrey'}
local c_fg = {'#8c8c8c', 244, 'gray'}
local c_fg_weak = {'#9d9d9d', 251, 'gray'}
local c_fg_weakest = {'#bbbbbb', 251, 'gray'}
local c_fg_weaker = {'#bbbbbb', 251, 'gray'}
local c_fg_exception = {'#7c4444', 251, 'gray'}
@ -119,7 +119,7 @@ local c_alert_weak = {'#d7a100', 203, 'red'}
local c_question = {'#000000', 0, 'black'}
local c_primary_strongest = { "#7f4b4b", 236, "black" }
local c_primary_stronger = { "#7f4b4b", 236, "black" }
local c_primary_strong = { "#5a4444", 236, "black" }
local c_primary = { "#6b5555", 244, "gray" }
local c_primary_weak = { "#7c6666", 248, "darkgray" }
@ -264,7 +264,7 @@ local highlight_group_normal = {fg=c_fg, bg=c_bg}
-- This is where the rest of your highlights should go.
local highlight_groups = {
--[[ 4.1. Text Analysis ]]
Comment = {fg=c_fg_weakest, style='italic'},
Comment = {fg=c_fg_weaker, style='italic'},
NonText = {fg=c_fg_weak},
EndOfBuffer = 'Comment',
Whitespace = 'NonText',
@ -285,11 +285,11 @@ local highlight_groups = {
Statement = {fg=c_fg_weak},
Conditional = {fg=c_fg_strong, style='bold'},
Repeat = 'Conditional',
Label = {fg=c_fg_strongest, style='bold'},
Label = {fg=c_fg_stronger, style='bold'},
Operator = {fg=c_fg, style='bold'},
Keyword = {fg=c_fg_weakest, style='bold'},
Keyword = {fg=c_fg_weaker, style='bold'},
Exception = {fg=c_fg_exception, style='bold'},
Noise = {fg=c_fg_weakest},
Noise = {fg=c_fg_weaker},
--[[ 4.1.4. Metatextual Information]]
PreProc = {fg=c_fg_weak},
@ -299,14 +299,14 @@ local highlight_groups = {
PreCondit = 'Macro',
--[[ 4.1.5. Semantics]]
Type = {fg=c_fg_weak, style='bold'},
StorageClass = {fg=c_fg_weak},
Type = {fg=c_primary, style='bold'},
StorageClass = {fg=c_primary},
Structure = 'StorageClass',
Typedef = 'StorageClass',
--[[ 4.1.6. Edge Cases]]
Special = {fg=c_primary_strongest},
SpecialChar = {fg=c_primary_strongest, style='bold'},
Special = {fg=c_primary_stronger},
SpecialChar = {fg=c_primary_stronger, style='bold'},
SpecialKey = 'SpecialCharacter',
Tag = {fg=c_primary_strong, style='bold'},
Delimiter = 'Noise',
@ -325,7 +325,7 @@ local highlight_groups = {
--[[ 4.2... Editor UI ]]
--[[ 4.2.1. Status Line]]
StatusLine = {fg=c_fg, bg=c_bg_ui, style='italic'},
StatusLineNC = {fg=c_fg_weakest, bg=c_bg_ui, style='italic'},
StatusLineNC = {fg=c_fg_weaker, bg=c_bg_ui, style='italic'},
StatusLineTerm = 'StatusLine',
StatusLineTermNC = 'StatusLineNC',
@ -362,12 +362,12 @@ local highlight_groups = {
DiffAdd = {bg=c_bg_success},
DiffChange = {bg=c_bg_modified},
DiffDelete = {bg=c_bg_fail},
DiffText = {fg=c_fg_strongest, bg=c_bg_success},
DiffText = {fg=c_fg_stronger, bg=c_bg_success},
--[[ 4.2.7. Searching]]
IncSearch = {style='inverse'},
MatchParen = {style={'bold', 'underline', color=c_fg_strongest}},
Search = {style={'underline', color=c_fg_strongest}},
MatchParen = {style={'bold', 'underline', color=c_fg_stronger}},
Search = {style={'underline', color=c_fg_stronger}},
--[[ 4.2.8. Spelling]]
SpellBad = {bg=c_bg_error_weak, fg=c_alert_strong,},
@ -470,7 +470,7 @@ local highlight_groups = {
razorUsing = 'Include',
--[[ 4.3.4. CSS ]]
cssAtRule = 'PreCondit',
cssAtRule = 'Label',
cssAttr = 'Keyword',
cssAttrComma = 'Noise',
cssAttrRegion = 'Keyword',
@ -481,13 +481,13 @@ local highlight_groups = {
cssFunctionComma = 'Noise',
cssImportant = 'Exception',
cssNoise = 'Noise',
cssProp = 'Label',
cssPseudoClass = 'Special',
cssProp = {fg=c_primary_weak},
cssPseudoClass = {fg=c_2_weak},
cssPseudoClassId = 'cssSelectorOp',
cssSelectorOp = 'Operator',
cssTagName = 'htmlTagName',
cssUnitDecorators = 'Type',
scssAmpersand = 'Special',
scssAmpersand = 'cssNestingSelector',
scssAttribute = 'Noise',
scssBoolean = 'Boolean',
scssDefault = 'Keyword',
@ -501,6 +501,24 @@ local highlight_groups = {
scssVariable = 'Define',
scssVariableAssignment = 'Operator',
-- added via custom scm highlights
cssTSProperty = 'cssProp',
cssIdentifier = {fg=c_2_strong, style='bold'},
cssTSType = 'htmlTagName',
cssIdSelector = 'SpecialChar',
cssNestingSelector = {fg=c_2_strong},
cssUniversalSelector = 'SpecialChar',
cssPropertyValue = {fg=c_fg, style='bold'},
cssMediaQuery = 'Function',
cssMediaQueryValue = 'cssAtRule',
cssMediaQueryValueUnit = 'cssMediaQueryValue',
cssMediaFeatureName = 'cssMediaQuery',
cssTSNumber = 'cssPropertyValue',
cssTSString = 'cssPropertyValue',
cssTSType = 'Noise',
cssTSOperator = 'Noise',
cssUnit = 'Noise',
--[[ 4.3.5. Dart ]]
dartLibrary = 'Statement',
@ -534,7 +552,7 @@ local highlight_groups = {
--[[ 4.3.8. HTML ]]
htmlArg = 'Label',
htmlBold = {style='bold'},
htmlTitle = {fg=c_fg_strongest, style='bold'},
htmlTitle = {fg=c_fg_stronger, style='bold'},
htmlEndTag = 'htmlTag',
htmlH1 = 'markdownH1',
htmlH2 = 'markdownH2',
@ -548,6 +566,14 @@ local highlight_groups = {
htmlTagN = htmlTagName,
htmlTagName = {fg=c_3},
htmlTSString = {fg=c_fg_strong},
htmlTSTag = 'htmlTag',
htmlTSTagAttribute = 'Statement',
htmlTSTitle = 'htmlTitle',
-- defined in custom html scm files
DataAttributeValue = 'Function',
--[[ 4.3.9. Java ]]
javaClassDecl = 'Structure',
@ -596,8 +622,8 @@ local highlight_groups = {
--[[ 4.3.13. Markdown ]]
markdownCode = 'mkdCode',
markdownCodeDelimiter = 'mkdCodeDelimiter',
markdownH1 = {fg=c_fg_strongest, style='bold'},
markdownH2 = {fg=c_fg_strongest, style='bold'},
markdownH1 = {fg=c_fg_stronger, style='bold'},
markdownH2 = {fg=c_fg_stronger, style='bold'},
markdownH3 = {fg=c_fg_strong, style='bold'},
markdownH4 = {fg=c_fg_strong, style='bold'},
markdownH5 = {fg=c_fg_strong, style='bold'},
@ -846,8 +872,7 @@ local highlight_groups = {
TSURI = 'Tag',
TSVariable = 'Identifier',
TSVariableBuiltin = 'Identifier',
htmlTSTag = 'htmlTag',
TSTitle = 'Title',
--[[ 4.4.9. barbar.nvim ]]
BufferCurrent = 'TabLineSel',