From 888695fbcbb35a38e3522945cf1f217adfa3fea2 Mon Sep 17 00:00:00 2001 From: Max Del Canto Date: Tue, 31 Oct 2023 16:04:10 -0300 Subject: [PATCH] fix: jsx tags, methods being italized, incsearch low contrast --- after/queries/javascript/highlights.scm | 2 ++ after/queries/tsx/highlights.scm | 2 ++ doc/solarized.nvim.txt | 2 +- lua/solarized/themes/neo/editor.lua | 2 +- lua/solarized/themes/neo/syntax.lua | 6 +++--- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/after/queries/javascript/highlights.scm b/after/queries/javascript/highlights.scm index af0e8bc..530b26f 100644 --- a/after/queries/javascript/highlights.scm +++ b/after/queries/javascript/highlights.scm @@ -1,3 +1,5 @@ ; extends (jsx_self_closing_element (identifier) @tag (#set! "priority" 127)) +(jsx_opening_element (identifier) @tag (#set! "priority" 127)) +(jsx_closing_element (identifier) @tag (#set! "priority" 127)) diff --git a/after/queries/tsx/highlights.scm b/after/queries/tsx/highlights.scm index af0e8bc..530b26f 100644 --- a/after/queries/tsx/highlights.scm +++ b/after/queries/tsx/highlights.scm @@ -1,3 +1,5 @@ ; extends (jsx_self_closing_element (identifier) @tag (#set! "priority" 127)) +(jsx_opening_element (identifier) @tag (#set! "priority" 127)) +(jsx_closing_element (identifier) @tag (#set! "priority" 127)) diff --git a/doc/solarized.nvim.txt b/doc/solarized.nvim.txt index 2026b66..0ff0cc2 100644 --- a/doc/solarized.nvim.txt +++ b/doc/solarized.nvim.txt @@ -1,4 +1,4 @@ -*solarized.nvim.txt* For NVIM v0.9.1 Last change: 2023 October 02 +*solarized.nvim.txt* For NVIM v0.9.1 Last change: 2023 October 23 ============================================================================== Table of Contents *solarized.nvim-table-of-contents* diff --git a/lua/solarized/themes/neo/editor.lua b/lua/solarized/themes/neo/editor.lua index d105ec3..686eee5 100644 --- a/lua/solarized/themes/neo/editor.lua +++ b/lua/solarized/themes/neo/editor.lua @@ -28,7 +28,7 @@ return function(c, config) set_hl('Folded', { fg = c.base0, bg = c.base02 }) -- Line used for closed folds set_hl('FoldColumn', { fg = c.base0, bg = c.base04 }) -- 'foldcolumn' set_hl('SignColumn', { fg = c.base0, bg = c.base03 }, { transparent = config.transparent }) -- Column were signs are displayed - set_hl('IncSearch', { fg = c.base3, bg = c.base04 }, { transparent = config.transparent }) -- 'incsearch' highlighting, also for the text replaced + set_hl('IncSearch', { fg = c.base3, bg = c.base04, bold = true }, { transparent = config.transparent }) -- 'incsearch' highlighting, also for the text replaced set_hl('Substitute', { fg = c.orange, reverse = true }) -- :substitute replacement text highlight set_hl('LineNr', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Line number for ":number" and ":#" commands set_hl('LineNrAbove', { link = 'LineNr' }) -- Line number, above the cursor line diff --git a/lua/solarized/themes/neo/syntax.lua b/lua/solarized/themes/neo/syntax.lua index f625bb6..5931c1e 100644 --- a/lua/solarized/themes/neo/syntax.lua +++ b/lua/solarized/themes/neo/syntax.lua @@ -9,8 +9,8 @@ return function(c, config) set_hl('Number', { fg = c.magenta }, { styles = config.styles.numbers }) -- a number constant: 234, 0xff set_hl('Boolean', { fg = c.violet }) -- a boolean constant: TRUE, false set_hl('Float', { link = 'Number' }) -- a floating point constant: 2.3e10 - set_hl('Identifier', { fg = c.base0, italic = true }, { styles = config.styles.variables }) -- any variable name - set_hl('Function', { fg = c.blue, italic = true }, { styles = config.styles.functions }) -- function name (also: methods for classes) + set_hl('Identifier', { fg = c.base0 }, { styles = config.styles.variables }) -- any variable name + set_hl('Function', { fg = c.blue }, { styles = config.styles.functions }) -- function name (also: methods for classes) set_hl('Statement', { link = 'Keyword' }) -- any statement set_hl('Conditional', { link = 'Keyword' }) -- if, then, else, endif, switch, etc. set_hl('Repeat', { link = 'Keyword' }) -- for, do, while, etc. @@ -30,7 +30,7 @@ return function(c, config) set_hl('Special', { fg = c.magenta }) -- special symbol set_hl('SpecialChar', { fg = c.violet }) -- special character in a constant set_hl('Tag', { link = 'Special' }) -- you can use CTRL-] on this - set_hl('Delimiter', { fg = c.yellow }) -- character that needs attention + set_hl('Delimiter', { fg = c.orange }) -- character that needs attention set_hl('SpecialComment', { link = 'Keyword' }) -- special things inside a comment set_hl('Debug', { link = 'Keyword' }) -- debugging statements set_hl('Underlined', { fg = c.violet, underline = true }) --text that stands out, HTML links