Add support for the special color names "bg", "background", "fg", "foreground" #5319
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This should fix #4463. |
|
Thanks a lot. Do you plan to add a test? See |
|
I'll try to add some tests. |
|
Added tests. Some will fail unfortunately. |
| end) | ||
|
|
||
| it('returns gui-color if "gui" arg is passed', function() | ||
| eq('Black', eval('synIDattr(hlID("Normal"), "bg", "gui")')) | ||
| eq('Maroon', eval('synIDattr(hlID("Keyword"), "sp", "gui")')) | ||
| eq('bg', eval('synIDattr(hlID("Visual"), "fg", "gui")')) | ||
| eq('fg', eval('synIDattr(hlID("Visual"), "bg", "gui")')) | ||
| eq('bg', eval('synIDattr(hlID("Visual"), "sp", "gui")')) |
There was a problem hiding this comment.
Let's move these into separate it() blocks like this, for clarity:
it('returns "Normal" values for group using special fg/bg names', function()
execute('highlight Visual ctermfg=bg ctermbg=fg guifg=bg guibg=fg guisp=bg')
eq(eval('synIDattr(hlID("Normal"), "fg", "gui")'), eval('synIDattr(hlID("Visual"), "fg", "gui")'))
eq(eval('synIDattr(hlID("Normal"), "bg", "gui")'), eval('synIDattr(hlID("Visual"), "bg", "gui")'))
...
end)All the tests you added can live in this single test. Note the execute() setup line also lives in this it() instead of before_each since it only applies to this one test.
Are there more bugs? Or something wrong with the changes here? |
Yes, the tests were buggy. Since |
What does that failure look like to the user (does it print an error message)? |
It prints |
| name_to_color(HL_TABLE()[idx].sg_rgb_sp_name); | ||
| } | ||
| set_hl_attr(idx); | ||
| } | ||
| // If the normal group has changed, it is simpler to refresh every UI | ||
| ui_refresh(); |
There was a problem hiding this comment.
I wonder if this is still needed now that you are calling set_hl_attr(idx) on every highlight group.
Anyways, let's put this and the block you added in a new function, highlight_groups_refresh().
There was a problem hiding this comment.
Yes, it is still needed. When I remove it, the tests still pass but with manual testing you can see that it doesn't work.
|
Is there anything else that needs to be fixed? |
justinmk
approved these changes
Sep 15, 2016
justinmk
pushed a commit
that referenced
this pull request
Sep 15, 2016
Refresh colors if changing Normal group
|
Merged/squashed/verified. Thanks for digging into this @keremc |
justinmk
added a commit
to justinmk/neovim
that referenced
this pull request
Oct 27, 2016
FEATURES: 0b5a7e4 neovim#4432 API: external UIs can render custom popupmenu c6ac4f8 neovim#4934 API: call any API method from vimscript 31df051 neovim#4568 API: nvim_call_atomic(): multiple calls in a single request b268ba3 neovim#5424 API: nvim_win_get_number(), nvim_tabpage_get_number() e7e2844 has("nvim-1.2.3") checks for a specific Nvim version 522b885 neovim#5295, neovim#5493 `:CheckHealth` checks tmux, terminfo, performance 719dae2 neovim#5384 events: allow event processing in getchar() f25797f neovim#5386 API: metadata: Nvim version & API level 22dfe69 neovim#5389 API: metadata: "since", "deprecated_since" 605e743 Added QuickFixLine highlight group CHANGES: 4af6ec7 neovim#5253 perf: Disable clipboard in do_cmdline() 6e9f329 neovim#5299 perf: Skip foldUpdate() in insert-mode. 9d4fcec neovim#5426 perf: Do not auto-update folds for some foldmethods. eeec0ca neovim#5419 tui: Default to normal-mode cursor shape. FIXES: e838452 neovim#5436 tui: Fix "weird characters" / "bleeding termcodes" 10a54ad neovim#5243 signal_init: Always unblock SIGCHLD. bccb49b neovim#5316 eval.c: Fix memory leak for detached pty job 626065d neovim#5227 tchdir: New tab should inherit CWD. cd321b7 neovim#5292 getcwd(): Return empty string if CWD is invalid. 6127eae shada: Fix non-writeable ShaDa directory handling ca65514 neovim#2789 system(): Respect shellxescape, shellxquote 2daf54e neovim#4874 Restore vim-like tab dragging 0c536b5 neovim#5319 syntax.c: Support bg/fg special color-names. 3c53371 neovim#4972 from justinmk/schedule-ui_refresh 68bcb32 neovim#4789 tui.c: Do not wait for tui loop on teardown. c8b6ec2 neovim#5409 v:count broken in command-line window 6bc3bce neovim#5461 fix emoji display 51937e1 neovim#5470 fix :terminal with :argadd, :argu 79d77da neovim#5481 external UIs: opening multiple files from command-line 657ba62 neovim#5501 rplugin: resolve paths in manifest file 6a6f188 neovim#5502 system('foo &', 'bar'): Show error, don't crash. 1ff162c neovim#5515 os_nodetype: open fd with O_NONBLOCK 2a6c5bb neovim#5450 modeline: Handle version number overflow. 0ade1bb neovim#5225 CI tests now run against Windows!
justinmk
added a commit
to justinmk/neovim
that referenced
this pull request
Oct 28, 2016
FEATURES: 0b5a7e4 neovim#4432 API: external UIs can render custom popupmenu c6ac4f8 neovim#4934 API: call any API method from vimscript 31df051 neovim#4568 API: nvim_call_atomic(): multiple calls in a single request b268ba3 neovim#5424 API: nvim_win_get_number(), nvim_tabpage_get_number() e7e2844 has("nvim-1.2.3") checks for a specific Nvim version 522b885 neovim#5295, neovim#5493 `:CheckHealth` checks tmux, terminfo, performance 719dae2 neovim#5384 events: allow event processing in getchar() f25797f neovim#5386 API: metadata: Nvim version & API level 22dfe69 neovim#5389 API: metadata: "since", "deprecated_since" 605e743 Added QuickFixLine highlight group CHANGES: 4af6ec7 neovim#5253 perf: Disable clipboard in do_cmdline() 6e9f329 neovim#5299 perf: Skip foldUpdate() in insert-mode. 9d4fcec neovim#5426 perf: Do not auto-update folds for some foldmethods. eeec0ca neovim#5419 tui: Default to normal-mode cursor shape. FIXES: e838452 neovim#5436 tui: Fix "weird characters" / "bleeding termcodes" 10a54ad neovim#5243 signal_init: Always unblock SIGCHLD. bccb49b neovim#5316 eval.c: Fix memory leak for detached pty job 626065d neovim#5227 tchdir: New tab should inherit CWD. cd321b7 neovim#5292 getcwd(): Return empty string if CWD is invalid. 6127eae shada: Fix non-writeable ShaDa directory handling ca65514 neovim#2789 system(): Respect shellxescape, shellxquote 2daf54e neovim#4874 Restore vim-like tab dragging 0c536b5 neovim#5319 syntax.c: Support bg/fg special color-names. 3c53371 neovim#4972 from justinmk/schedule-ui_refresh 68bcb32 neovim#4789 tui.c: Do not wait for tui loop on teardown. c8b6ec2 neovim#5409 v:count broken in command-line window 6bc3bce neovim#5461 fix emoji display 51937e1 neovim#5470 fix :terminal with :argadd, :argu 79d77da neovim#5481 external UIs: opening multiple files from command-line 657ba62 neovim#5501 rplugin: resolve paths in manifest file 6a6f188 neovim#5502 system('foo &', 'bar'): Show error, don't crash. 1ff162c neovim#5515 os_nodetype: open fd with O_NONBLOCK 2a6c5bb neovim#5450 modeline: Handle version number overflow. 0ade1bb neovim#5225 CI tests now run against Windows!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add support for special color names:
Normalhighlight group.Normal.Normalis modified, refresh the color attributes of all highlight groups.In vim all of this already works. Special color names are converted to real colors in
color_name2handle()forguibg/guifg(and indo_highlight()forctermbg/ctermfgbut this works in neovim too). When theNormalgroup is modified,do_highlight()callshighlight_gui_started()to refresh the highlight groups.