Skip to content

Commit

Permalink
Merge pull request cocopon#96 from cocopon/treesitter-support
Browse files Browse the repository at this point in the history
Add support for Tree-sitter
  • Loading branch information
cocopon authored Dec 24, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 866f9f4 + f3f8093 commit 8b77e54
Showing 4 changed files with 115 additions and 1 deletion.
3 changes: 3 additions & 0 deletions autoload/iceberg/palette/dark.vim
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ function! iceberg#palette#dark#create() abort
let hue_lblue = 190
let hue_blue = 215
let hue_purple = 255
let hue_pale = 225

" gui {{{
let g = {}
@@ -18,6 +19,7 @@ function! iceberg#palette#dark#create() abort
let g.orange = pgmnt#color#hsl(hue_orange, 0.65, 0.68)
let g.purple = pgmnt#color#hsl(hue_purple, 0.32, 0.68)
let g.red = pgmnt#color#hsl(hue_red, 0.65, 0.68)
let g.pale = pgmnt#color#hsl(hue_pale, 0.28, 0.72)

" normal
let g.normal_bg = pgmnt#color#hsl(hue_base, 0.20, 0.11)
@@ -149,6 +151,7 @@ function! iceberg#palette#dark#create() abort
let c.orange = 216
let c.purple = 140
let c.red = 203
let c.pale = 252

" normal
let c.normal_bg = 234
3 changes: 3 additions & 0 deletions autoload/iceberg/palette/light.vim
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ function! iceberg#palette#light#create() abort
let hue_lblue = 200
let hue_blue = 220
let hue_purple = 260
let hue_pale = 235

" gui {{{
let g = {}
@@ -18,6 +19,7 @@ function! iceberg#palette#light#create() abort
let g.orange = pgmnt#color#hsl(hue_orange, 0.55, 0.50)
let g.purple = pgmnt#color#hsl(hue_purple, 0.38, 0.53)
let g.red = pgmnt#color#hsl(hue_red, 0.55, 0.56)
let g.pale = pgmnt#color#hsl(hue_pale, 0.30, 0.45)

" normal
let g.normal_bg = pgmnt#color#hsl(hue_base, 0.10, 0.92)
@@ -150,6 +152,7 @@ function! iceberg#palette#light#create() abort
let c.orange = 130
let c.purple = 97
let c.red = 125
let c.pale = 237

" normal
let c.normal_bg = 254
50 changes: 49 additions & 1 deletion colors/iceberg.vim
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"
" File: iceberg.vim
" Maintainer: cocopon <[email protected]>
" Modified: 2020-12-25 11:57+0900
" Modified: 2021-12-24 18:59+0900
" License: MIT


@@ -112,6 +112,11 @@ if &background == 'light'
hi SyntasticStyleErrorSign ctermbg=253 ctermfg=125 guibg=#dcdfe7 guifg=#cc517a
hi SyntasticStyleWarningSign ctermbg=253 ctermfg=130 guibg=#dcdfe7 guifg=#c57339
hi SyntasticWarningSign ctermbg=253 ctermfg=130 guibg=#dcdfe7 guifg=#c57339
hi TSFunction ctermfg=237 guifg=#505695
hi TSFunctionBuiltin ctermfg=237 guifg=#505695
hi TSFunctionMacro ctermfg=237 guifg=#505695
hi TSMethod ctermfg=237 guifg=#505695
hi TSURI cterm=underline ctermfg=31 gui=underline guifg=#3f83a6 term=underline
hi ZenSpace ctermbg=125 guibg=#cc517a
hi icebergALAccentRed ctermfg=125 guifg=#cc517a

@@ -227,6 +232,11 @@ else
hi SyntasticStyleErrorSign ctermbg=235 ctermfg=203 guibg=#1e2132 guifg=#e27878
hi SyntasticStyleWarningSign ctermbg=235 ctermfg=216 guibg=#1e2132 guifg=#e2a478
hi SyntasticWarningSign ctermbg=235 ctermfg=216 guibg=#1e2132 guifg=#e2a478
hi TSFunction ctermfg=252 guifg=#a3adcb
hi TSFunctionBuiltin ctermfg=252 guifg=#a3adcb
hi TSFunctionMacro ctermfg=252 guifg=#a3adcb
hi TSMethod ctermfg=252 guifg=#a3adcb
hi TSURI cterm=underline ctermfg=109 gui=underline guifg=#89b8c2 term=underline
hi ZenSpace ctermbg=203 guibg=#e27878
hi icebergALAccentRed ctermfg=203 guifg=#e27878

@@ -361,6 +371,44 @@ hi! link StartifySlash Comment
hi! link StartifySpecial Normal
hi! link svssBraces Delimiter
hi! link swiftIdentifier Normal
hi! link TSAttribute Special
hi! link TSBoolean Constant
hi! link TSCharacter Constant
hi! link TSComment Comment
hi! link TSConstructor Normal
hi! link TSConditional Statement
hi! link TSConstant Constant
hi! link TSConstBuiltin Constant
hi! link TSConstMacro Constant
hi! link TSError Error
hi! link TSException Statement
hi! link TSField Normal
hi! link TSFloat Constant
hi! link TSInclude Statement
hi! link TSKeyword Statement
hi! link TSKeywordFunction Function
hi! link TSLabel Special
hi! link TSNamespace Statement
hi! link TSNumber Constant
hi! link TSOperator Normal
hi! link TSParameter Normal
hi! link TSParameterReference Normal
hi! link TSProperty TSField
hi! link TSPunctDelimiter Normal
hi! link TSPunctBracket Normal
hi! link TSPunctSpecial Special
hi! link TSRepeat Statement
hi! link TSString String
hi! link TSStringRegex String
hi! link TSStringEscape Special
hi! link TSTag htmlTagName
hi! link TSTagDelimiter htmlTagName
hi! link TSText Normal
hi! link TSTitle Title
hi! link TSType Type
hi! link TSTypeBuiltin Type
hi! link TSVariable Normal
hi! link TSVariableBuiltin Statement
hi! link typescriptAjaxMethods Normal
hi! link typescriptBraces Normal
hi! link typescriptEndColons Normal
60 changes: 60 additions & 0 deletions src/iceberg.vim
Original file line number Diff line number Diff line change
@@ -558,6 +558,26 @@ function! s:create_colors(palette) abort
\ 'guifg': g.orange,
\ }))

" [Tree-sitter](https://github.com/nvim-treesitter/nvim-treesitter)
call extend(rules, pgmnt#hi#group(
\ ['TSFunction', 'TSFunctionBuiltin', 'TSFunctionMacro'], {
\ 'ctermfg': c.pale,
\ 'guifg': g.pale,
\ }))
call extend(rules, pgmnt#hi#group(
\ ['TSMethod'], {
\ 'ctermfg': c.pale,
\ 'guifg': g.pale,
\ }))
call extend(rules, pgmnt#hi#group(
\ ['TSURI'], {
\ 'cterm': 'underline',
\ 'ctermfg': c.lblue,
\ 'gui': 'underline',
\ 'guifg': g.lblue,
\ 'term': 'underline',
\ }))

" [zenspace.vim](https://github.com/thinca/vim-zenspace)
call extend(rules, pgmnt#hi#group(
\ 'ZenSpace', {
@@ -763,6 +783,46 @@ function! s:create_links() abort
" [vim-swift](https://github.com/toyamarinyon/vim-swift)
call add(links, pgmnt#hi#link('swiftIdentifier', 'Normal'))

" [Tree-sitter](https://github.com/nvim-treesitter/nvim-treesitter)
call add(links, pgmnt#hi#link('TSAttribute', 'Special'))
call add(links, pgmnt#hi#link('TSBoolean', 'Constant'))
call add(links, pgmnt#hi#link('TSCharacter', 'Constant'))
call add(links, pgmnt#hi#link('TSComment', 'Comment'))
call add(links, pgmnt#hi#link('TSConstructor', 'Normal'))
call add(links, pgmnt#hi#link('TSConditional', 'Statement'))
call add(links, pgmnt#hi#link('TSConstant', 'Constant'))
call add(links, pgmnt#hi#link('TSConstBuiltin', 'Constant'))
call add(links, pgmnt#hi#link('TSConstMacro', 'Constant'))
call add(links, pgmnt#hi#link('TSError', 'Error'))
call add(links, pgmnt#hi#link('TSException', 'Statement'))
call add(links, pgmnt#hi#link('TSField', 'Normal'))
call add(links, pgmnt#hi#link('TSFloat', 'Constant'))
call add(links, pgmnt#hi#link('TSInclude', 'Statement'))
call add(links, pgmnt#hi#link('TSKeyword', 'Statement'))
call add(links, pgmnt#hi#link('TSKeywordFunction', 'Function'))
call add(links, pgmnt#hi#link('TSLabel', 'Special'))
call add(links, pgmnt#hi#link('TSNamespace', 'Statement'))
call add(links, pgmnt#hi#link('TSNumber', 'Constant'))
call add(links, pgmnt#hi#link('TSOperator', 'Normal'))
call add(links, pgmnt#hi#link('TSParameter', 'Normal'))
call add(links, pgmnt#hi#link('TSParameterReference', 'Normal'))
call add(links, pgmnt#hi#link('TSProperty', 'TSField'))
call add(links, pgmnt#hi#link('TSPunctDelimiter', 'Normal'))
call add(links, pgmnt#hi#link('TSPunctBracket', 'Normal'))
call add(links, pgmnt#hi#link('TSPunctSpecial', 'Special'))
call add(links, pgmnt#hi#link('TSRepeat', 'Statement'))
call add(links, pgmnt#hi#link('TSString', 'String'))
call add(links, pgmnt#hi#link('TSStringRegex', 'String'))
call add(links, pgmnt#hi#link('TSStringEscape', 'Special'))
call add(links, pgmnt#hi#link('TSTag', 'htmlTagName'))
call add(links, pgmnt#hi#link('TSTagDelimiter', 'htmlTagName'))
call add(links, pgmnt#hi#link('TSText', 'Normal'))
call add(links, pgmnt#hi#link('TSTitle', 'Title'))
call add(links, pgmnt#hi#link('TSType', 'Type'))
call add(links, pgmnt#hi#link('TSTypeBuiltin', 'Type'))
call add(links, pgmnt#hi#link('TSVariable', 'Normal'))
call add(links, pgmnt#hi#link('TSVariableBuiltin', 'Statement'))

" [typescript-vim](https://github.com/leafgarland/typescript-vim)
call add(links, pgmnt#hi#link('typescriptAjaxMethods', 'Normal'))
call add(links, pgmnt#hi#link('typescriptBraces', 'Normal'))

0 comments on commit 8b77e54

Please sign in to comment.