Skip to content

Commit

Permalink
fix: indentblankline, treesitter, whitespace,readme.md
Browse files Browse the repository at this point in the history
  • Loading branch information
maxmx03 committed Jun 29, 2023
1 parent 3a9adcd commit 92adbfb
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 16 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ require('solarized').setup({
dashboard = true,
editor = true,
gitsign = true,
hop = true,
indentblankline = true,
lsp = true,
lspsaga = true,
Expand Down
2 changes: 1 addition & 1 deletion lua/solarized/themes/default/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ return function(c, config)
set_hl('Visual', { bg = c.base02, standout = true }) -- Visual mode selection.
set_hl('VisualNOS', { link = 'Visual' }) -- Visual mode selection when vim is "Not Owning the Selection".
set_hl('WarningMsg', { fg = c.warning, bold = true }) -- Warning messages.
-- set_hl('Whitespace', { bg = c.base02 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
set_hl('Whitespace', { fg = c.base01 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
set_hl('WildMenu', { fg = c.base2, bg = c.base02 }) -- Current match in 'wildmenu' completion.
set_hl('WinBar', { link = 'Pmenu' }) -- Window bar of current window.
set_hl('WinBarNC', { link = 'WinBar' }) -- Window bar of not-current windows.
Expand Down
20 changes: 14 additions & 6 deletions lua/solarized/themes/default/indentblankline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@ return function(c, config)
local utils = require('solarized.utils')
local set_hl = utils.set_hl

set_hl('IndentBlanklineChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of indent character.
set_hl('IndentBlanklineSpaceChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of space character.
-- set_hl('IndentBlanklineSpaceCharBlankline') -- Highlight of space character on blank lines.
set_hl('IndentBlanklineContextChar', { link = 'Keyword' }) -- Highlight of indent character when base of current context.
set_hl('IndentBlanklineContextSpaceChar', { link = 'Keyword' }) -- Highlight of space characters one indent level of the current context.
-- set_hl('IndentBlanklineContextStart') -- Highlight of the first line of the current context.
if vim.o.background == 'dark' then
set_hl('IndentBlanklineChar', { fg = '#475252' }) -- Highlight of indent character. Default: Whitespace
set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
set_hl('IndentBlanklineContextChar', { fg = '#647373' }) -- Highlight of indent character when base of current context. Default: Label
set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextSpaceChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
else
set_hl('IndentBlanklineChar', { fg = '#cbd5d8' }) -- Highlight of indent character. Default: Whitespace
set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
set_hl('IndentBlanklineContextChar', { fg = '#a8b8bd' }) -- Highlight of indent character when base of current context. Default: Label
set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextSpaceChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
end

-- set_hl('IndentBlanklineSpaceCharBlankline', {}) -- Highlight of space character on blank lines. Default: Whitespace
-- set_hl('IndentBlanklineContextStart', {}) -- Highlight of the first line of the current context. Default: Label
end
2 changes: 1 addition & 1 deletion lua/solarized/themes/default/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ return function(c, config)
set_hl('@text.reference', { link = 'Underlined' }) -- text references, footnotes, citations, etc.

set_hl('@text.literal', { link = '@text' }) -- literal or verbatim text (e.g., inline code)
set_hl('@text.literal.block', { link = '@text.environment.name' }) -- literal or verbatim text as a stand-alone block
set_hl('@text.literal.block', { link = '@text' }) -- literal or verbatim text as a stand-alone block

set_hl('@text.todo', { link = 'Todo' }) -- todo notes
set_hl('@text.note', { fg = c.info }) -- info notes
Expand Down
2 changes: 1 addition & 1 deletion lua/solarized/themes/neo/editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ return function(c, config)
set_hl('Visual', { bg = c.base02 }) -- Visual mode selection.
set_hl('VisualNOS', { link = 'Visual' }) -- Visual mode selection when vim is "Not Owning the Selection".
set_hl('WarningMsg', { fg = c.warning }) -- Warning messages.
set_hl('Whitespace', { bg = c.base02 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
set_hl('Whitespace', { fg = c.base01 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
set_hl('WildMenu', { bg = c.base02 }) -- Current match in 'wildmenu' completion.
set_hl('WinBar', { link = 'Pmenu' }) -- Window bar of current window.
set_hl('WinBarNC', { link = 'WinBar' }) -- Window bar of not-current windows.
Expand Down
20 changes: 14 additions & 6 deletions lua/solarized/themes/neo/indentblankline.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@ return function(c, config)
local utils = require('solarized.utils')
local set_hl = utils.set_hl

set_hl('IndentBlanklineChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of indent character.
set_hl('IndentBlanklineSpaceChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of space character.
-- set_hl('IndentBlanklineSpaceCharBlankline') -- Highlight of space character on blank lines.
set_hl('IndentBlanklineContextChar', { link = 'Keyword' }) -- Highlight of indent character when base of current context.
set_hl('IndentBlanklineContextSpaceChar', { link = 'Keyword' }) -- Highlight of space characters one indent level of the current context.
-- set_hl('IndentBlanklineContextStart') -- Highlight of the first line of the current context.
if vim.o.background == 'dark' then
set_hl('IndentBlanklineChar', { fg = '#424d00' }) -- Highlight of indent character. Default: Whitespace
set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
set_hl('IndentBlanklineContextChar', { fg = '#5d6b00' }) -- Highlight of indent character when base of current context. Default: Label
set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextSpaceChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
else
set_hl('IndentBlanklineChar', { fg = '#bddcf3' }) -- Highlight of indent character. Default: Whitespace
set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
set_hl('IndentBlanklineContextChar', { fg = '#91c5eb' }) -- Highlight of indent character when base of current context. Default: Label
set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
end

-- set_hl('IndentBlanklineSpaceCharBlankline', {}) -- Highlight of space character on blank lines. Default: Whitespace
-- set_hl('IndentBlanklineContextStart', {}) -- Highlight of the first line of the current context. Default: Label
end
2 changes: 1 addition & 1 deletion lua/solarized/themes/neo/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ return function(c, config)
set_hl('@text.reference', { link = 'Underlined' }) -- text references, footnotes, citations, etc.

set_hl('@text.literal', { link = '@text' }) -- literal or verbatim text (e.g., inline code)
set_hl('@text.literal.block', { link = '@text.environment.name' }) -- literal or verbatim text as a stand-alone block
set_hl('@text.literal.block', { link = '@text' }) -- literal or verbatim text as a stand-alone block

set_hl('@text.todo', { link = 'Todo' }) -- todo notes
set_hl('@text.note', { fg = c.info }) -- info notes
Expand Down

0 comments on commit 92adbfb

Please sign in to comment.