mirror of
https://github.com/vim/vim
synced 2025-05-02 06:17:46 +02:00
124371c5a1
Problem: default diff highlighting is too noisy
Solution: Link diff highlighting groups to new
Added/Removed/Changed, revert previous change
(Romain Lafourcade)
Remove diff* links added in #13776 and doc added in commit b1392be
The links added in #13776 are way too noisy for the contexts in which
the `diff` syntax is applied (git commits, patches, etc.).
This commit:
- removes those links
- adds new default highlighting groups Added, Changed and
Removed
- links the diff highlighting groups to those new defaults
- removes the doc changes
- adjusts the syntax_completion test for those newly added group
names
Note: Changes to the default color schemes will be handled separately,
by adding links to those newly created Added/Removed/Changed
highlighting groups.
related: #13776
closes #13825
Signed-off-by: Romain Lafourcade <romain.lafourcade@razorfish.fr>
Signed-off-by: Christian Brabandt <cb@256bit.org>
94 lines
4.7 KiB
VimL
94 lines
4.7 KiB
VimL
" Vim syntax support file
|
|
" Maintainer: The Vim Project <https://github.com/vim/vim>
|
|
" Last Change: 2023 Aug 10
|
|
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
|
|
|
|
" This file sets up the default methods for highlighting.
|
|
" It is loaded from "synload.vim" and from Vim for ":syntax reset".
|
|
" Also used from init_highlight().
|
|
|
|
if !exists("syntax_cmd") || syntax_cmd == "on"
|
|
" ":syntax on" works like in Vim 5.7: set colors but keep links
|
|
command -nargs=* SynColor hi <args>
|
|
command -nargs=* SynLink hi link <args>
|
|
else
|
|
if syntax_cmd == "enable"
|
|
" ":syntax enable" keeps any existing colors
|
|
command -nargs=* SynColor hi def <args>
|
|
command -nargs=* SynLink hi def link <args>
|
|
elseif syntax_cmd == "reset"
|
|
" ":syntax reset" resets all colors to the default
|
|
command -nargs=* SynColor hi <args>
|
|
command -nargs=* SynLink hi! link <args>
|
|
else
|
|
" User defined syncolor file has already set the colors.
|
|
finish
|
|
endif
|
|
endif
|
|
|
|
" Many terminals can only use six different colors (plus black and white).
|
|
" Therefore the number of colors used is kept low. It doesn't look nice with
|
|
" too many colors anyway.
|
|
" Careful with "cterm=bold", it changes the color to bright for some terminals.
|
|
" There are two sets of defaults: for a dark and a light background.
|
|
if &background == "dark"
|
|
SynColor Comment term=bold cterm=NONE ctermfg=Cyan ctermbg=NONE gui=NONE guifg=#80a0ff guibg=NONE
|
|
SynColor Constant term=underline cterm=NONE ctermfg=Magenta ctermbg=NONE gui=NONE guifg=#ffa0a0 guibg=NONE
|
|
SynColor Special term=bold cterm=NONE ctermfg=LightRed ctermbg=NONE gui=NONE guifg=Orange guibg=NONE
|
|
SynColor Identifier term=underline cterm=bold ctermfg=Cyan ctermbg=NONE gui=NONE guifg=#40ffff guibg=NONE
|
|
SynColor Statement term=bold cterm=NONE ctermfg=Yellow ctermbg=NONE gui=bold guifg=#ffff60 guibg=NONE
|
|
SynColor PreProc term=underline cterm=NONE ctermfg=LightBlue ctermbg=NONE gui=NONE guifg=#ff80ff guibg=NONE
|
|
SynColor Type term=underline cterm=NONE ctermfg=LightGreen ctermbg=NONE gui=bold guifg=#60ff60 guibg=NONE
|
|
SynColor Underlined term=underline cterm=underline ctermfg=LightBlue gui=underline guifg=#80a0ff
|
|
SynColor Ignore term=NONE cterm=NONE ctermfg=black ctermbg=NONE gui=NONE guifg=bg guibg=NONE
|
|
SynColor Added term=NONE cterm=NONE ctermfg=Green ctermbg=NONE gui=NONE guifg=LimeGreen guibg=NONE
|
|
SynColor Changed term=NONE cterm=NONE ctermfg=Blue ctermbg=NONE gui=NONE guifg=DodgerBlue guibg=NONE
|
|
SynColor Removed term=NONE cterm=NONE ctermfg=Red ctermbg=NONE gui=NONE guifg=Red guibg=NONE
|
|
else
|
|
SynColor Comment term=bold cterm=NONE ctermfg=DarkBlue ctermbg=NONE gui=NONE guifg=Blue guibg=NONE
|
|
SynColor Constant term=underline cterm=NONE ctermfg=DarkRed ctermbg=NONE gui=NONE guifg=Magenta guibg=NONE
|
|
" #6a5acd is SlateBlue
|
|
SynColor Special term=bold cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=#6a5acd guibg=NONE
|
|
SynColor Identifier term=underline cterm=NONE ctermfg=DarkCyan ctermbg=NONE gui=NONE guifg=DarkCyan guibg=NONE
|
|
SynColor Statement term=bold cterm=NONE ctermfg=Brown ctermbg=NONE gui=bold guifg=Brown guibg=NONE
|
|
" #6a0dad is Purple
|
|
SynColor PreProc term=underline cterm=NONE ctermfg=DarkMagenta ctermbg=NONE gui=NONE guifg=#6a0dad guibg=NONE
|
|
SynColor Type term=underline cterm=NONE ctermfg=DarkGreen ctermbg=NONE gui=bold guifg=SeaGreen guibg=NONE
|
|
SynColor Underlined term=underline cterm=underline ctermfg=DarkMagenta gui=underline guifg=SlateBlue
|
|
SynColor Ignore term=NONE cterm=NONE ctermfg=white ctermbg=NONE gui=NONE guifg=bg guibg=NONE
|
|
SynColor Added term=NONE cterm=NONE ctermfg=DarkGreen ctermbg=NONE gui=NONE guifg=SeaGreen guibg=NONE
|
|
SynColor Changed term=NONE cterm=NONE ctermfg=Blue ctermbg=NONE gui=NONE guifg=DodgerBlue guibg=NONE
|
|
SynColor Removed term=NONE cterm=NONE ctermfg=Red ctermbg=NONE gui=NONE guifg=Red guibg=NONE
|
|
endif
|
|
SynColor Error term=reverse cterm=NONE ctermfg=White ctermbg=Red gui=NONE guifg=White guibg=Red
|
|
SynColor Todo term=standout cterm=NONE ctermfg=Black ctermbg=Yellow gui=NONE guifg=Blue guibg=Yellow
|
|
|
|
" Common groups that link to default highlighting.
|
|
" You can specify other highlighting easily.
|
|
SynLink String Constant
|
|
SynLink Character Constant
|
|
SynLink Number Constant
|
|
SynLink Boolean Constant
|
|
SynLink Float Number
|
|
SynLink Function Identifier
|
|
SynLink Conditional Statement
|
|
SynLink Repeat Statement
|
|
SynLink Label Statement
|
|
SynLink Operator Statement
|
|
SynLink Keyword Statement
|
|
SynLink Exception Statement
|
|
SynLink Include PreProc
|
|
SynLink Define PreProc
|
|
SynLink Macro PreProc
|
|
SynLink PreCondit PreProc
|
|
SynLink StorageClass Type
|
|
SynLink Structure Type
|
|
SynLink Typedef Type
|
|
SynLink Tag Special
|
|
SynLink SpecialChar Special
|
|
SynLink Delimiter Special
|
|
SynLink SpecialComment Special
|
|
SynLink Debug Special
|
|
|
|
delcommand SynColor
|
|
delcommand SynLink
|