Skip to content

Commit

Permalink
fix(terminal): assign magenta to correct terminal color (#640)
Browse files Browse the repository at this point in the history
## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->

This PR addresses 2 things:
1. Fixes the terminal color typo mentioned in #634 
2. Adds `PmenuMatch` and `PmenuMatchSel` hl groups, see
neovim/neovim#29311

## Related Issue(s)
FIxes #634 
neovim/neovim#29311
<!--
  If this PR fixes any issues, please link to the issue here.
  - Fixes #<issue_number>
-->

## Screenshots

Here's before and after the `PmenuMatch` hl groups (Built in lsp
completion):

Before:


![screenshot_2024_10_04_14_58_28](https://github.com/user-attachments/assets/7777c028-34d7-40e7-90b2-ee12cf881984)

After:

![screenshot_2024_10_04_14_57_56](https://github.com/user-attachments/assets/ce276677-4b5e-4e7a-b34a-55911d9203ff)
  • Loading branch information
kristijanhusak authored Oct 4, 2024
1 parent efd1417 commit cc0e0e2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions lua/tokyonight/groups/base.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ function M.get(c, opts)
FloatBorder = { fg = c.border_highlight, bg = c.bg_float },
FloatTitle = { fg = c.border_highlight, bg = c.bg_float },
Pmenu = { bg = c.bg_popup, fg = c.fg }, -- Popup menu: normal item.
PmenuMatch = { bg = c.bg_popup, fg = c.blue1 }, -- Popup menu: Matched text in normal item.
PmenuSel = { bg = Util.blend_bg(c.fg_gutter, 0.8) }, -- Popup menu: selected item.
PmenuMatchSel = { bg = Util.blend_bg(c.fg_gutter, 0.8), fg = c.blue1 }, -- Popup menu: Matched text in selected item.
PmenuSbar = { bg = Util.blend_fg(c.bg_popup, 0.95) }, -- Popup menu: scrollbar.
PmenuThumb = { bg = c.fg_gutter }, -- Popup menu: Thumb of the scrollbar.
Question = { fg = c.blue }, -- |hit-enter| prompt and yes/no questions
Expand Down
2 changes: 1 addition & 1 deletion lua/tokyonight/theme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function M.terminal(colors)
vim.g.terminal_color_12 = Util.blend_fg(colors.blue, 0.5)

vim.g.terminal_color_5 = colors.magenta
vim.g.terminal_color_18 = Util.blend_fg(colors.magenta, 0.5)
vim.g.terminal_color_13 = Util.blend_fg(colors.magenta, 0.5)

vim.g.terminal_color_6 = colors.cyan
vim.g.terminal_color_14 = Util.blend_fg(colors.cyan, 0.5)
Expand Down

0 comments on commit cc0e0e2

Please sign in to comment.