From 722deb460aae7f94e36bb3b069c787ed5fa357c3 Mon Sep 17 00:00:00 2001 From: Michael Welford Date: Fri, 3 Mar 2023 15:45:34 +1030 Subject: [PATCH] Update treesitter highlights to new style. --- autoload/airline/themes/falcon.vim | 2 +- autoload/lightline/colorscheme/falcon.vim | 62 ++++++++--------- colors/falcon.vim | 70 ++++++++++++++++---- corpus/react.js | 11 +++ estilo/syntax/treesitter.yml | 81 +++++++++++++++++++---- 5 files changed, 170 insertions(+), 56 deletions(-) create mode 100644 corpus/react.js diff --git a/autoload/airline/themes/falcon.vim b/autoload/airline/themes/falcon.vim index a09d6a7..5a3ae11 100644 --- a/autoload/airline/themes/falcon.vim +++ b/autoload/airline/themes/falcon.vim @@ -4,7 +4,7 @@ " URL:https://github.com/fenetikm/falcon " Author: Michael Welford " License: MIT -" Last Change: 2021/12/15 08:30 +" Last Change: 2023/03/03 15:43 " ============================================================ let g:airline#themes#falcon#palette = {} diff --git a/autoload/lightline/colorscheme/falcon.vim b/autoload/lightline/colorscheme/falcon.vim index af951ac..e4c1974 100644 --- a/autoload/lightline/colorscheme/falcon.vim +++ b/autoload/lightline/colorscheme/falcon.vim @@ -1,42 +1,44 @@ " ============================================================ -" Falcon -" +" falcon +" " URL: https://github.com/fenetikm/falcon " Author: Michael Welford " License: MIT -" Last Change: 2018/01/06 22:27 +" Last Change: 2023/03/03 15:43 " ============================================================ -if exists('g:lightline') - let s:p = {"normal": {}, "inactive": {}, "insert": {}, "replace": {}, "visual": {}, "tabline": {} } +let s:p = {"normal": {}, "inactive": {}, "insert": {}, "replace": {}, "visual": {}, "tabline": {} } - let s:p.normal.left = [[["#000004", 0], ["#dfdfe5", 254]], [["#dfdfe5", 248], ["#28282d", 241]], [["#787882", 248], ["#28282d", 241]]] - let s:p.normal.right = [[["#000004", 0], ["#dfdfe5", 254]], [["#787882", 248], ["#28282d", 241]]] - let s:p.normal.middle = [[["#57575e", 241], ["#28282d", 237]]] - let s:p.inactive.left = [[["#57575e", 241], ["#1c1c22", 237], 'italic'], [["#57575e", 241], ["#1c1c22", 237], 'italic']] - let s:p.inactive.right = [[["#57575e", 241], ["#1c1c22", 237], 'italic'], [["#57575e", 241], ["#1c1c22", 237], 'italic']] - let s:p.inactive.middle = [[["#57575e", 241], ["#1c1c22", 237], 'italic']] - let s:p.insert.left = [[["#000004", 0], ["#ff3600", 202]], [["#d4d4d9", 248], ["#28282d", 241]], [["#787882", 248], ["#28282d", 241]]] - let s:p.insert.right = [[["#000004", 0], ["#ff3600", 202]], [["#787882", 248], ["#28282d", 241]]] - let s:p.insert.middle = [[["#57575e", 241], ["#28282d", 241]]] - let s:p.replace.left = [[["#000004", 0], ["#ff761a", 208]], [["#d4d4d9", 248], ["#28282d", 241]], [["#787882", 248], ["#28282d", 241]]] - let s:p.replace.right = [[["#000004", 0], ["#ff761a", 208]], [["#787882", 248], ["#28282d", 241]]] - let s:p.replace.middle = [[["#57575e", 241], ["#28282d", 241]]] - let s:p.visual.left = [[["#000004", 0], ["#ffc552", 220]], [["#d4d4d9", 248], ["#28282d", 241]], [["#787882", 248], ["#28282d", 241]]] - let s:p.visual.right = [[["#000004", 0], ["#ffc552", 220]], [["#787882", 248], ["#28282d", 241]]] - let s:p.visual.middle = [[["#57575e", 241], ["#28282d", 241]]] - let s:p.tabline.left = [[["#57575e", 241], ["#28282d", 237]]] - let s:p.tabline.tabsel = [[["#dfdfe5", 248], ["#28282d", 237]]] - let s:p.tabline.middle = [[["#57575e", 241], ["#28282d", 237]]] - let s:p.tabline.right = [[["#57575e", 241], ["#28282d", 237]]] - let s:p.normal.error = [[["#000004", 254], ["#ff3600", 202]]] - let s:p.normal.warning = [[["#000004", 208], ["#ff761a", 208]]] - let s:p.normal.ok = [[["#000004", 208], ["#718e3f", 208]]] +let s:p.normal.left = [[["#000004", 0], ["#B4B4B9", 249]], [["#B4B4B9", 249], ["#28282D", 235]]] +let s:p.normal.middle = [[["#787882", 243], ["#36363A", 237]]] +let s:p.normal.right = [[["#DFDFE5", 254], ["#787882", 243]], [["#000004", 0], ["#B4B4B9", 249]]] +let s:p.normal.error = [[["#000004", 0], ["#FF3600", 202]]] +let s:p.normal.warning = [[["", ], ["", ]]] - let g:lightline#colorscheme#falcon#palette = lightline#colorscheme#flatten(s:p) -endif +let s:p.inactive.left = [[["#787882", 243], ["#36363A", 237]], [["#787882", 243], ["#36363A", 237]]] +let s:p.inactive.middle = [[["#787882", 243], ["#36363A", 237]]] +let s:p.inactive.right = [[["#787882", 243], ["#36363A", 237]], [["#787882", 243], ["#36363A", 237]]] + +let s:p.insert.left = [[["#000004", 0], ["#FF3600", 202]], [["#B4B4B9", 249], ["#787882", 243]]] +let s:p.insert.middle = [[["#B4B4B9", 249], ["#787882", 243]]] +let s:p.insert.right = [[["#B4B4B9", 249], ["#787882", 243]], [["#000004", 0], ["#FF3600", 202]]] + +let s:p.replace.left = [[["#000004", 0], ["#FF761A", 208]], [["#B4B4B9", 249], ["#787882", 243]]] +let s:p.replace.middle = [[["#B4B4B9", 249], ["#787882", 243]]] +let s:p.replace.right = [[["#B4B4B9", 249], ["#787882", 243]], [["#000004", 0], ["#FF761A", 208]]] + +let s:p.visual.left = [[["#000004", 0], ["#FFC552", 221]], [["#B4B4B9", 249], ["#787882", 243]]] +let s:p.visual.middle = [[["#B4B4B9", 249], ["#787882", 243]]] +let s:p.visual.right = [[["#B4B4B9", 249], ["#787882", 243]], [["#000004", 0], ["#FFC552", 221]]] + +let s:p.tabline.left = [[["#787882", 243], ["#36363A", 237]]] +let s:p.tabline.tabsel = [[["#DFDFE5", 254], ["#36363A", 237]]] +let s:p.tabline.middle = [[["#787882", 243], ["#36363A", 237]]] +let s:p.tabline.right = [[["#787882", 243], ["#36363A", 237]]] + +let g:lightline#colorscheme#falcon#palette = lightline#colorscheme#flatten(s:p) " =================================== -" Generated by Estilo 1.3.3 +" Generated by Estilo 1.5.1 " https://github.com/jacoborus/estilo " =================================== diff --git a/colors/falcon.vim b/colors/falcon.vim index a2e444c..48d4cb4 100644 --- a/colors/falcon.vim +++ b/colors/falcon.vim @@ -4,7 +4,7 @@ " URL: https://github.com/fenetikm/falcon " Author: Michael Welford " License: MIT -" Last Change: 2021/12/15 08:30 +" Last Change: 2023/03/03 15:43 " =============================================================== set background=dark @@ -510,18 +510,62 @@ hi tmuxCmds guifg=#FFC552 ctermfg=221 guibg=NONE ctermbg=NONE gui=NONE cterm=NON hi tmuxOptsSet guifg=#99A4BC ctermfg=248 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi tmuxOptions guifg=#FF761A ctermfg=208 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi tmuxOptsSetw guifg=#99A4BC ctermfg=248 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi link TSKeyword Keyword -hi link TSVariable Identifier -hi TSMethod guifg=#B4B4B9 ctermfg=249 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi link TSVariableBuiltin Type -hi link TSFunction Function -hi link TSOperator Operator -hi TSConstructor guifg=#B4B4B9 ctermfg=249 guibg=NONE ctermbg=NONE gui=Bold cterm=Bold -hi link TSException Keyword -hi link TSConstant Constant -hi link TSConstBuiltin Boolean -hi TSError guifg=#FFC552 ctermfg=221 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi TSKeywordFunction guifg=#CFC1B2 ctermfg=181 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi link @annotation PreProc +hi link @attribute PreProc +hi link @boolean Boolean +hi link @character Character +hi link @comment Comment +hi link @conditional Conditional +hi link @constant Constant +hi link @constant.builtin Boolean +hi link @constant.macro Define +hi @constructor guifg=#B4B4B9 ctermfg=249 guibg=NONE ctermbg=NONE gui=Bold cterm=Bold +hi @emphasis guifg=NONE ctermfg=NONE guibg=NONE ctermbg=NONE gui=Italic cterm=Italic +hi @error guifg=#FFC552 ctermfg=221 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi link @exception Keyword +hi link @field Identifier +hi link @float Float +hi link @function Function +hi link @function.builtin Special +hi link @function.macro Macro +hi link @include Include +hi link @keyword Keyword +hi @keyword.function guifg=#CFC1B2 ctermfg=181 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi link @keyword.operator Operator +hi link @keyword.return Operator +hi link @label Label +hi link @literal String +hi link @namespace Include +hi link @note Todo +hi link @number Number +hi @method guifg=#B4B4B9 ctermfg=249 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi link @operator Operator +hi link @parameter Identifier +hi link @parameter.reference Identifier +hi link @property Identifier +hi link @punctuation.bracket Delimiter +hi link @punctuation.delimiter Delimiter +hi link @punctuation.special Delimiter +hi link @repeat Repeat +hi @strike guifg=NONE ctermfg=NONE guibg=NONE ctermbg=NONE gui=standout cterm=standout +hi link @string String +hi link @string.escape SpecialChar +hi link @string.regex String +hi link @string.special String +hi @strong guifg=NONE ctermfg=NONE guibg=NONE ctermbg=NONE gui=Bold cterm=Bold +hi link @structure Structure +hi @symbol guifg=#99A4BC ctermfg=248 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi link @tag Tag +hi @tag.attribute guifg=#B4B4B9 ctermfg=249 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi link @tag.delimiter Delimiter +hi link @title Title +hi link @type Type +hi link @type.builtin Type +hi link @uri Underlined +hi @underline guifg=NONE ctermfg=NONE guibg=NONE ctermbg=NONE gui=underline cterm=underline +hi link @variable Identifier +hi link @variable.builtin Special +hi @warning guifg=#BC8F3F ctermfg=137 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi link twigVarDelim Delimiter hi link twigTagDelim Delimiter hi twigString guifg=#DFDFE5 ctermfg=254 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE diff --git a/corpus/react.js b/corpus/react.js new file mode 100644 index 0000000..6444c0e --- /dev/null +++ b/corpus/react.js @@ -0,0 +1,11 @@ +export const Dropdown: React.FC = ({options, onSelect }) => { + return ( + + + +); +} diff --git a/estilo/syntax/treesitter.yml b/estilo/syntax/treesitter.yml index d0541aa..348b709 100644 --- a/estilo/syntax/treesitter.yml +++ b/estilo/syntax/treesitter.yml @@ -1,12 +1,69 @@ -TSKeyword: '@Keyword' -TSVariable: '@Identifier' -TSMethod: 'normal_gray' -TSVariableBuiltin: '@Type' -TSFunction: '@Function' -TSOperator: '@Operator' -TSConstructor: 'normal_gray - b' -TSException: '@Keyword' -TSConstant: '@Constant' -TSConstBuiltin: '@Boolean' -TSError: 'yellow' -TSKeywordFunction: 'tan' +# TSKeyword: '@Keyword' +# TSVariable: '@Identifier' +# TSMethod: 'normal_gray' +# TSVariableBuiltin: '@Type' +# TSFunction: '@Function' +# TSOperator: '@Operator' +# TSConstructor: 'normal_gray - b' +# TSException: '@Keyword' +# TSConstant: '@Constant' +# TSConstBuiltin: '@Boolean' +# TSError: 'yellow' +# TSKeywordFunction: 'tan' +'@annotation': '@PreProc' +'@attribute': '@PreProc' +'@boolean': '@Boolean' +'@character': '@Character' +'@character.special': '' +'@comment': '@Comment' +'@conditional': '@Conditional' +'@constant': '@Constant' +'@constant.builtin': '@Boolean' +'@constant.macro': '@Define' +'@constructor': 'normal_gray - b' +'@emphasis': '- - i' +'@error': 'yellow' +'@exception': '@Keyword' +'@field': '@Identifier' +'@float': '@Float' +'@function': '@Function' +'@function.builtin': '@Special' +'@function.macro': '@Macro' +'@include': '@Include' +'@keyword': '@Keyword' +'@keyword.function': 'tan' +'@keyword.operator': '@Operator' +'@keyword.return': '@Operator' +'@label': '@Label' +'@literal': '@String' +'@namespace': '@Include' +'@note': '@Todo' +'@number': '@Number' +'@method': 'normal_gray' +'@operator': '@Operator' +'@parameter': '@Identifier' +'@parameter.reference': '@Identifier' +'@property': '@Identifier' +'@punctuation.bracket': '@Delimiter' +'@punctuation.delimiter': '@Delimiter' +'@punctuation.special': '@Delimiter' +'@repeat': '@Repeat' +'@strike': '- - s' +'@string': '@String' +'@string.escape': '@SpecialChar' +'@string.regex': '@String' +'@string.special': '@String' +'@strong': '- - b' +'@structure': '@Structure' +'@symbol': 'blue_gray' +'@tag': '@Tag' +'@tag.attribute': 'normal_gray' +'@tag.delimiter': '@Delimiter' +'@title': '@Title' +'@type': '@Type' +'@type.builtin': '@Type' +'@uri': '@Underlined' +'@underline': '- - u' +'@variable': '@Identifier' +'@variable.builtin': '@Special' +'@warning': 'mid_yellow'