diff --git a/CHANGELOG.md b/CHANGELOG.md index 35d56e1..c3731ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ Changelog --- +# 10.0.0 [NekoPara Release] + +## 3 New Themes!! + +- Chocola (Dark) +- Vanilla (Dark) +- Coconut (Dark) + +![v17 Girls](https://doki.assets.unthrottled.io/misc/v17_girls.png) + # 9.0.0 [Hanekawa, Shima Rin, Nagatoro, Yumeko, & Yuno] ## 5 New Themes! diff --git a/after/plugin/chocola.vim b/after/plugin/chocola.vim new file mode 100644 index 0000000..368a38a --- /dev/null +++ b/after/plugin/chocola.vim @@ -0,0 +1,45 @@ +if chocola#should_abort() + finish +endif + +" Fzf: +if exists('g:loaded_fzf') && ! exists('g:fzf_colors') + let g:fzf_colors = { + \ 'fg': ['fg', 'Normal'], + \ 'bg': ['bg', 'Normal'], + \ 'hl': ['fg', 'Search'], + \ 'fg+': ['fg', 'Normal'], + \ 'bg+': ['bg', 'Normal'], + \ 'hl+': ['fg', 'ChocolaParameter'], + \ 'info': ['fg', 'ChocolaConstants'], + \ 'border': ['fg', 'Ignore'], + \ 'prompt': ['fg', 'ChocolaClassName'], + \ 'pointer': ['fg', 'Exception'], + \ 'marker': ['fg', 'Keyword'], + \ 'spinner': ['fg', 'Label'], + \ 'header': ['fg', 'Comment'], + \} +endif +"}}} +" ALE: +if exists('g:ale_enabled') + hi! link ALEError ChocolaErrorLine + hi! link ALEWarning ChocolaWarnLine + hi! link ALEInfo ChocolaInfoLine + + hi! link ALEErrorSign ChocolaRed + hi! link ALEWarningSign ChocolaParameter + hi! link ALEInfoSign ChocolaKeyColor + + hi! link ALEVirtualTextError Comment + hi! link ALEVirtualTextWarning Comment +endif +" }}} +" CtrlP: +if exists('g:loaded_ctrlp') + hi! link CtrlPMatch IncSearch + hi! link CtrlPBufferHid Normal +endif +" }}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/plugin/coconut.vim b/after/plugin/coconut.vim new file mode 100644 index 0000000..c9740d7 --- /dev/null +++ b/after/plugin/coconut.vim @@ -0,0 +1,45 @@ +if coconut#should_abort() + finish +endif + +" Fzf: +if exists('g:loaded_fzf') && ! exists('g:fzf_colors') + let g:fzf_colors = { + \ 'fg': ['fg', 'Normal'], + \ 'bg': ['bg', 'Normal'], + \ 'hl': ['fg', 'Search'], + \ 'fg+': ['fg', 'Normal'], + \ 'bg+': ['bg', 'Normal'], + \ 'hl+': ['fg', 'CoconutParameter'], + \ 'info': ['fg', 'CoconutConstants'], + \ 'border': ['fg', 'Ignore'], + \ 'prompt': ['fg', 'CoconutClassName'], + \ 'pointer': ['fg', 'Exception'], + \ 'marker': ['fg', 'Keyword'], + \ 'spinner': ['fg', 'Label'], + \ 'header': ['fg', 'Comment'], + \} +endif +"}}} +" ALE: +if exists('g:ale_enabled') + hi! link ALEError CoconutErrorLine + hi! link ALEWarning CoconutWarnLine + hi! link ALEInfo CoconutInfoLine + + hi! link ALEErrorSign CoconutRed + hi! link ALEWarningSign CoconutParameter + hi! link ALEInfoSign CoconutKeyColor + + hi! link ALEVirtualTextError Comment + hi! link ALEVirtualTextWarning Comment +endif +" }}} +" CtrlP: +if exists('g:loaded_ctrlp') + hi! link CtrlPMatch IncSearch + hi! link CtrlPBufferHid Normal +endif +" }}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/plugin/vanilla.vim b/after/plugin/vanilla.vim new file mode 100644 index 0000000..665c7db --- /dev/null +++ b/after/plugin/vanilla.vim @@ -0,0 +1,45 @@ +if vanilla#should_abort() + finish +endif + +" Fzf: +if exists('g:loaded_fzf') && ! exists('g:fzf_colors') + let g:fzf_colors = { + \ 'fg': ['fg', 'Normal'], + \ 'bg': ['bg', 'Normal'], + \ 'hl': ['fg', 'Search'], + \ 'fg+': ['fg', 'Normal'], + \ 'bg+': ['bg', 'Normal'], + \ 'hl+': ['fg', 'VanillaParameter'], + \ 'info': ['fg', 'VanillaConstants'], + \ 'border': ['fg', 'Ignore'], + \ 'prompt': ['fg', 'VanillaClassName'], + \ 'pointer': ['fg', 'Exception'], + \ 'marker': ['fg', 'Keyword'], + \ 'spinner': ['fg', 'Label'], + \ 'header': ['fg', 'Comment'], + \} +endif +"}}} +" ALE: +if exists('g:ale_enabled') + hi! link ALEError VanillaErrorLine + hi! link ALEWarning VanillaWarnLine + hi! link ALEInfo VanillaInfoLine + + hi! link ALEErrorSign VanillaRed + hi! link ALEWarningSign VanillaParameter + hi! link ALEInfoSign VanillaKeyColor + + hi! link ALEVirtualTextError Comment + hi! link ALEVirtualTextWarning Comment +endif +" }}} +" CtrlP: +if exists('g:loaded_ctrlp') + hi! link CtrlPMatch IncSearch + hi! link CtrlPBufferHid Normal +endif +" }}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/chocola_css.vim b/after/syntax/chocola_css.vim new file mode 100644 index 0000000..a956c93 --- /dev/null +++ b/after/syntax/chocola_css.vim @@ -0,0 +1,15 @@ +if chocola#should_abort('css') + finish +endif + +hi! link cssAttrComma Delimiter +hi! link cssAttrRegion ChocolaKeyword +hi! link cssAttributeSelector ChocolaClassNameItalic +hi! link cssBraces Delimiter +hi! link cssFunctionComma Delimiter +hi! link cssNoise ChocolaKeyword +hi! link cssProp ChocolaKeyColor +hi! link cssPseudoClass ChocolaKeyword +hi! link cssPseudoClassId ChocolaClassNameItalic +hi! link cssUnitDecorators ChocolaKeyword +hi! link cssVendor ChocolaClassNameItalic diff --git a/after/syntax/chocola_gitcommit.vim b/after/syntax/chocola_gitcommit.vim new file mode 100644 index 0000000..1b5c8e0 --- /dev/null +++ b/after/syntax/chocola_gitcommit.vim @@ -0,0 +1,12 @@ +if chocola#should_abort('gitcommit') + finish +endif + +" The following two are misnomers. Colors are correct. +hi! link diffFile ChocolaClassName +hi! link diffNewFile ChocolaRed + +hi! link diffAdded ChocolaClassName +hi! link diffLine ChocolaKeyColorItalic +hi! link diffRemoved ChocolaRed + diff --git a/after/syntax/chocola_html.vim b/after/syntax/chocola_html.vim new file mode 100644 index 0000000..725ca25 --- /dev/null +++ b/after/syntax/chocola_html.vim @@ -0,0 +1,9 @@ +if chocola#should_abort('html') + finish +endif + +hi! link htmlTag ChocolaFg +hi! link htmlArg ChocolaClassNameItalic +hi! link htmlTitle ChocolaFg +hi! link htmlH1 ChocolaFg +hi! link htmlSpecialChar ChocolaConstants diff --git a/after/syntax/chocola_javascript.vim b/after/syntax/chocola_javascript.vim new file mode 100644 index 0000000..fb664e1 --- /dev/null +++ b/after/syntax/chocola_javascript.vim @@ -0,0 +1,25 @@ +if chocola#should_abort('javascript') + finish +endif + +hi! link javaScriptBraces Delimiter +hi! link javaScriptNumber Constant +hi! link javaScriptNull Constant +hi! link javaScriptFunction Keyword + +" pangloss/vim-javascript + +hi! link jsArrowFunction Operator +hi! link jsClassMethodType Keyword +hi! link jsDestructuringAssignment ChocolaParameterItalic +hi! link jsDocParam ChocolaParameterItalic +hi! link jsDocTags Keyword +hi! link jsDocType Type +hi! link jsDocTypeBrackets ChocolaKeyColor +hi! link jsFuncArgOperator Operator +hi! link jsFunction Keyword +hi! link jsTemplateBraces Special + +"}}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/chocola_json.vim b/after/syntax/chocola_json.vim new file mode 100644 index 0000000..f430ee8 --- /dev/null +++ b/after/syntax/chocola_json.vim @@ -0,0 +1,6 @@ +if chocola#should_abort('json') + finish +endif + +hi! link jsonKeyword ChocolaKeyColor +hi! link jsonKeywordMatch ChocolaKeyword diff --git a/after/syntax/chocola_lua.vim b/after/syntax/chocola_lua.vim new file mode 100644 index 0000000..d1cb18e --- /dev/null +++ b/after/syntax/chocola_lua.vim @@ -0,0 +1,6 @@ +if chocola#should_abort('lua') + finish +endif + +hi! link luaFunc ChocolaKeyColor +hi! link luaTable ChocolaFg diff --git a/after/syntax/chocola_markdown.vim b/after/syntax/chocola_markdown.vim new file mode 100644 index 0000000..298ae0c --- /dev/null +++ b/after/syntax/chocola_markdown.vim @@ -0,0 +1,50 @@ +if chocola#should_abort('markdown', 'mkd') + finish +endif + +if b:current_syntax ==# 'mkd' +" plasticboy/vim-markdown + hi! link htmlBold ChocolaParameterBold + hi! link htmlBoldItalic ChocolaParameterBoldItalic + hi! link htmlH1 ChocolaConstantsBold + hi! link htmlItalic ChocolaStringColorItalic + hi! link mkdBlockquote ChocolaStringColorItalic + hi! link mkdBold ChocolaParameterBold + hi! link mkdBoldItalic ChocolaParameterBoldItalic + hi! link mkdCode ChocolaClassName + hi! link mkdCodeEnd ChocolaClassName + hi! link mkdCodeStart ChocolaClassName + hi! link mkdHeading ChocolaConstantsBold + hi! link mkdInlineUrl ChocolaLink + hi! link mkdItalic ChocolaStringColorItalic + hi! link mkdLink ChocolaKeyword + hi! link mkdListItem ChocolaKeyColor + hi! link mkdRule ChocolaComment + hi! link mkdUrl ChocolaLink +"}}}1 +elseif b:current_syntax ==# 'markdown' +" Builtin: + hi! link markdownBlockquote ChocolaKeyColor + hi! link markdownBold ChocolaParameterBold + hi! link markdownBoldItalic ChocolaParameterBoldItalic + hi! link markdownCodeBlock ChocolaClassName + hi! link markdownCode ChocolaClassName + hi! link markdownCodeDelimiter ChocolaClassName + hi! link markdownH1 ChocolaConstantsBold + hi! link markdownH2 markdownH1 + hi! link markdownH3 markdownH1 + hi! link markdownH4 markdownH1 + hi! link markdownH5 markdownH1 + hi! link markdownH6 markdownH1 + hi! link markdownHeadingDelimiter markdownH1 + hi! link markdownHeadingRule markdownH1 + hi! link markdownItalic ChocolaStringColorItalic + hi! link markdownLinkText ChocolaKeyword + hi! link markdownListMarker ChocolaKeyColor + hi! link markdownOrderedListMarker ChocolaKeyColor + hi! link markdownRule ChocolaComment + hi! link markdownUrl ChocolaLink +"}}} +endif + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/chocola_ocaml.vim b/after/syntax/chocola_ocaml.vim new file mode 100644 index 0000000..1ae3b5f --- /dev/null +++ b/after/syntax/chocola_ocaml.vim @@ -0,0 +1,7 @@ +if chocola#should_abort('ocaml') + finish +endif + +hi! link ocamlModule Type +hi! link ocamlModPath Normal +hi! link ocamlLabel ChocolaParameterItalic diff --git a/after/syntax/chocola_perl.vim b/after/syntax/chocola_perl.vim new file mode 100644 index 0000000..1420157 --- /dev/null +++ b/after/syntax/chocola_perl.vim @@ -0,0 +1,38 @@ +if chocola#should_abort('perl') + finish +endif + +" Regex +hi! link perlMatchStartEnd ChocolaRed + +" Builtin functions +hi! link perlOperator ChocolaKeyColor +hi! link perlStatementFiledesc ChocolaKeyColor +hi! link perlStatementFiles ChocolaKeyColor +hi! link perlStatementFlow ChocolaKeyColor +hi! link perlStatementHash ChocolaKeyColor +hi! link perlStatementIOfunc ChocolaKeyColor +hi! link perlStatementIPC ChocolaKeyColor +hi! link perlStatementList ChocolaKeyColor +hi! link perlStatementMisc ChocolaKeyColor +hi! link perlStatementNetwork ChocolaKeyColor +hi! link perlStatementNumeric ChocolaKeyColor +hi! link perlStatementProc ChocolaKeyColor +hi! link perlStatementPword ChocolaKeyColor +hi! link perlStatementRegexp ChocolaKeyColor +hi! link perlStatementScalar ChocolaKeyColor +hi! link perlStatementSocket ChocolaKeyColor +hi! link perlStatementTime ChocolaKeyColor +hi! link perlStatementVector ChocolaKeyColor + +" Highlighting for quoting constructs, tied to existing option in vim-perl +if get(g:, 'perl_string_as_statement', 0) + hi! link perlStringStartEnd ChocolaRed +endif + +" Signatures +hi! link perlSignature ChocolaParameterItalic +hi! link perlSubPrototype ChocolaParameterItalic + +" Hash keys +hi! link perlVarSimpleMemberName ChocolaConstants diff --git a/after/syntax/chocola_php.vim b/after/syntax/chocola_php.vim new file mode 100644 index 0000000..78d1281 --- /dev/null +++ b/after/syntax/chocola_php.vim @@ -0,0 +1,10 @@ +if chocola#should_abort('php') + finish +endif + +hi! link phpClass Type +hi! link phpClasses Type +hi! link phpDocTags ChocolaKeyColorItalic +hi! link phpFunction Function +hi! link phpParent Normal +hi! link phpSpecialFunction ChocolaKeyColor diff --git a/after/syntax/chocola_plantuml.vim b/after/syntax/chocola_plantuml.vim new file mode 100644 index 0000000..23dfc86 --- /dev/null +++ b/after/syntax/chocola_plantuml.vim @@ -0,0 +1,13 @@ +if chocola#should_abort('plantuml') + finish +endif + +hi! link plantumlClassPrivate SpecialKey +hi! link plantumlClassProtected ChocolaParameter +hi! link plantumlClassPublic Function +hi! link plantumlColonLine String +hi! link plantumlDirectedOrVerticalArrowLR Constant +hi! link plantumlDirectedOrVerticalArrowRL Constant +hi! link plantumlHorizontalArrow Constant +hi! link plantumlSkinParamKeyword ChocolaKeyColor +hi! link plantumlTypeKeyword Keyword diff --git a/after/syntax/chocola_python.vim b/after/syntax/chocola_python.vim new file mode 100644 index 0000000..d674cd9 --- /dev/null +++ b/after/syntax/chocola_python.vim @@ -0,0 +1,11 @@ +if chocola#should_abort('python') + finish +endif + +hi! link pythonBuiltinObj Type +hi! link pythonBuiltinObject Type +hi! link pythonBuiltinType Type +hi! link pythonClassVar ChocolaConstantsItalic +hi! link pythonExClass Type +hi! link pythonNone Type +hi! link pythonRun Comment diff --git a/after/syntax/chocola_ruby.vim b/after/syntax/chocola_ruby.vim new file mode 100644 index 0000000..dd8e89a --- /dev/null +++ b/after/syntax/chocola_ruby.vim @@ -0,0 +1,16 @@ +if chocola#should_abort('ruby') + finish +endif + +if ! exists('g:ruby_operators') + let g:ruby_operators=1 +endif + +hi! link rubyBlockArgument ChocolaParameterItalic +hi! link rubyBlockParameter ChocolaParameterItalic +hi! link rubyCurlyBlock ChocolaKeyword +hi! link rubyGlobalVariable ChocolaConstants +hi! link rubyInstanceVariable ChocolaConstantsItalic +hi! link rubyInterpolationDelimiter ChocolaKeyword +hi! link rubyRegexpDelimiter ChocolaRed +hi! link rubyStringDelimiter ChocolaStringColor diff --git a/after/syntax/chocola_rust.vim b/after/syntax/chocola_rust.vim new file mode 100644 index 0000000..9f7f9d0 --- /dev/null +++ b/after/syntax/chocola_rust.vim @@ -0,0 +1,5 @@ +if chocola#should_abort('rust') + finish +endif + +hi! link rustCommentLineDoc Comment diff --git a/after/syntax/chocola_sass.vim b/after/syntax/chocola_sass.vim new file mode 100644 index 0000000..569e245 --- /dev/null +++ b/after/syntax/chocola_sass.vim @@ -0,0 +1,12 @@ +if chocola#should_abort('sass') + finish +endif + +hi! link sassClass cssClassName +hi! link sassClassChar cssClassNameDot +hi! link sassId cssIdentifier +hi! link sassIdChar cssIdentifier +hi! link sassInterpolationDelimiter ChocolaKeyword +hi! link sassMixinName Function +hi! link sassProperty cssProp +hi! link sassVariableAssignment Operator diff --git a/after/syntax/chocola_sh.vim b/after/syntax/chocola_sh.vim new file mode 100644 index 0000000..5502c54 --- /dev/null +++ b/after/syntax/chocola_sh.vim @@ -0,0 +1,8 @@ +if chocola#should_abort('bash', 'ksh', 'posix', 'sh') + finish +endif + +hi! link shCommandSub NONE +hi! link shEscape ChocolaRed +hi! link shParen NONE +hi! link shParenError NONE diff --git a/after/syntax/chocola_tex.vim b/after/syntax/chocola_tex.vim new file mode 100644 index 0000000..2e403ff --- /dev/null +++ b/after/syntax/chocola_tex.vim @@ -0,0 +1,17 @@ +if chocola#should_abort('tex') + finish +endif + +hi! link texBeginEndName ChocolaParameterItalic +hi! link texBoldItalStyle ChocolaParameterBoldItalic +hi! link texBoldStyle ChocolaParameterBold +hi! link texInputFile ChocolaParameterItalic +hi! link texItalStyle ChocolaStringColorItalic +hi! link texLigature ChocolaConstants +hi! link texMath ChocolaConstants +hi! link texMathMatcher ChocolaConstants +hi! link texMathSymbol ChocolaConstants +hi! link texRefZone ChocolaBgDarker +hi! link texSpecialChar ChocolaConstants +hi! link texSubscripts ChocolaConstants +hi! link texTitle ChocolaFgBold diff --git a/after/syntax/chocola_typescript.vim b/after/syntax/chocola_typescript.vim new file mode 100644 index 0000000..7d342ef --- /dev/null +++ b/after/syntax/chocola_typescript.vim @@ -0,0 +1,57 @@ +if chocola#should_abort('typescript', 'typescriptreact') + finish +endif + +" HerringtonDarkholme/yats.vim + +hi! link typescriptAliasDeclaration Type +hi! link typescriptArrayMethod Function +hi! link typescriptArrowFunc Operator +hi! link typescriptArrowFuncArg ChocolaParameterItalic +hi! link typescriptAssign Operator +hi! link typescriptBOMWindowProp Constant +hi! link typescriptBinaryOp Operator +hi! link typescriptBraces Delimiter +hi! link typescriptCall typescriptArrowFuncArg +hi! link typescriptClassHeritage Type +hi! link typescriptClassName Type +hi! link typescriptDateMethod ChocolaKeyColor +hi! link typescriptDateStaticMethod Function +hi! link typescriptDecorator ChocolaClassNameItalic +hi! link typescriptDefaultParam Operator +hi! link typescriptES6SetMethod ChocolaKeyColor +hi! link typescriptEndColons Delimiter +hi! link typescriptEnum Type +hi! link typescriptEnumKeyword Keyword +hi! link typescriptFuncComma Delimiter +hi! link typescriptFuncKeyword Keyword +hi! link typescriptFuncType ChocolaParameterItalic +hi! link typescriptFuncTypeArrow Operator +hi! link typescriptGlobal Type +hi! link typescriptGlobalMethod ChocolaKeyColor +hi! link typescriptGlobalObjects Type +hi! link typescriptIdentifier ChocolaConstantsItalic +hi! link typescriptInterfaceHeritage Type +hi! link typescriptInterfaceName Type +hi! link typescriptInterpolationDelimiter Keyword +hi! link typescriptKeywordOp Keyword +hi! link typescriptLogicSymbols Operator +hi! link typescriptMember Identifier +hi! link typescriptMemberOptionality Special +hi! link typescriptObjectColon Special +hi! link typescriptObjectLabel Identifier +hi! link typescriptObjectSpread Operator +hi! link typescriptOperator Operator +hi! link typescriptParamImpl ChocolaParameterItalic +hi! link typescriptParens Delimiter +hi! link typescriptPredefinedType Type +hi! link typescriptRestOrSpread Operator +hi! link typescriptTernaryOp Operator +hi! link typescriptTypeAnnotation Special +hi! link typescriptTypeCast Operator +hi! link typescriptTypeParameter ChocolaParameterItalic +hi! link typescriptTypeReference Type +hi! link typescriptUnaryOp Operator +hi! link typescriptVariable Keyword + +" }}} diff --git a/after/syntax/chocola_typescriptreact.vim b/after/syntax/chocola_typescriptreact.vim new file mode 100644 index 0000000..d38424e --- /dev/null +++ b/after/syntax/chocola_typescriptreact.vim @@ -0,0 +1,10 @@ +if chocola#should_abort('typescriptreact') + finish +endif + +runtime! syntax/typescript.vim + +hi! link tsxAttrib ChocolaClassNameItalic +hi! link tsxEqual Operator +hi! link tsxIntrinsicTagName Keyword +hi! link tsxTagName Type diff --git a/after/syntax/chocola_vim.vim b/after/syntax/chocola_vim.vim new file mode 100644 index 0000000..94b1ffc --- /dev/null +++ b/after/syntax/chocola_vim.vim @@ -0,0 +1,14 @@ +if chocola#should_abort('vim') + finish +endif + +hi! link vimAutoCmdSfxList Type +hi! link vimAutoEventList Type +hi! link vimEnvVar Constant +hi! link vimFunction Function +hi! link vimHiBang Keyword +hi! link vimOption Type +hi! link vimSetMod Keyword +hi! link vimSetSep Delimiter +hi! link vimUserAttrbCmpltFunc Function +hi! link vimUserFunc Function diff --git a/after/syntax/chocola_xml.vim b/after/syntax/chocola_xml.vim new file mode 100644 index 0000000..cbbb05d --- /dev/null +++ b/after/syntax/chocola_xml.vim @@ -0,0 +1,13 @@ +if chocola#should_abort('xml') + finish +endif + +hi! link xmlAttrib ChocolaClassNameItalic +hi! link xmlEqual Operator +hi! link xmlTag Delimiter +hi! link xmlTagName Statement + +" Fixes missing highlight over end tags +syn region xmlTagName + \ matchgroup=xmlTag start=+"']\@=+ + \ matchgroup=xmlTag end=+>+ diff --git a/after/syntax/chocola_yaml.vim b/after/syntax/chocola_yaml.vim new file mode 100644 index 0000000..c280691 --- /dev/null +++ b/after/syntax/chocola_yaml.vim @@ -0,0 +1,12 @@ +if chocola#should_abort('yaml') + finish +endif + +hi! link yamlAlias ChocolaClassNameItalicUnderline +hi! link yamlAnchor ChocolaKeywordItalic +hi! link yamlBlockMappingKey ChocolaKeyColor +hi! link yamlFlowCollection ChocolaKeyword +hi! link yamlFlowIndicator Delimiter +hi! link yamlNodeTag ChocolaKeyword +hi! link yamlPlainScalar ChocolaStringColor + diff --git a/after/syntax/coconut_css.vim b/after/syntax/coconut_css.vim new file mode 100644 index 0000000..6cf1e77 --- /dev/null +++ b/after/syntax/coconut_css.vim @@ -0,0 +1,15 @@ +if coconut#should_abort('css') + finish +endif + +hi! link cssAttrComma Delimiter +hi! link cssAttrRegion CoconutKeyword +hi! link cssAttributeSelector CoconutClassNameItalic +hi! link cssBraces Delimiter +hi! link cssFunctionComma Delimiter +hi! link cssNoise CoconutKeyword +hi! link cssProp CoconutKeyColor +hi! link cssPseudoClass CoconutKeyword +hi! link cssPseudoClassId CoconutClassNameItalic +hi! link cssUnitDecorators CoconutKeyword +hi! link cssVendor CoconutClassNameItalic diff --git a/after/syntax/coconut_gitcommit.vim b/after/syntax/coconut_gitcommit.vim new file mode 100644 index 0000000..c4ff245 --- /dev/null +++ b/after/syntax/coconut_gitcommit.vim @@ -0,0 +1,12 @@ +if coconut#should_abort('gitcommit') + finish +endif + +" The following two are misnomers. Colors are correct. +hi! link diffFile CoconutClassName +hi! link diffNewFile CoconutRed + +hi! link diffAdded CoconutClassName +hi! link diffLine CoconutKeyColorItalic +hi! link diffRemoved CoconutRed + diff --git a/after/syntax/coconut_html.vim b/after/syntax/coconut_html.vim new file mode 100644 index 0000000..7adbe22 --- /dev/null +++ b/after/syntax/coconut_html.vim @@ -0,0 +1,9 @@ +if coconut#should_abort('html') + finish +endif + +hi! link htmlTag CoconutFg +hi! link htmlArg CoconutClassNameItalic +hi! link htmlTitle CoconutFg +hi! link htmlH1 CoconutFg +hi! link htmlSpecialChar CoconutConstants diff --git a/after/syntax/coconut_javascript.vim b/after/syntax/coconut_javascript.vim new file mode 100644 index 0000000..e77b589 --- /dev/null +++ b/after/syntax/coconut_javascript.vim @@ -0,0 +1,25 @@ +if coconut#should_abort('javascript') + finish +endif + +hi! link javaScriptBraces Delimiter +hi! link javaScriptNumber Constant +hi! link javaScriptNull Constant +hi! link javaScriptFunction Keyword + +" pangloss/vim-javascript + +hi! link jsArrowFunction Operator +hi! link jsClassMethodType Keyword +hi! link jsDestructuringAssignment CoconutParameterItalic +hi! link jsDocParam CoconutParameterItalic +hi! link jsDocTags Keyword +hi! link jsDocType Type +hi! link jsDocTypeBrackets CoconutKeyColor +hi! link jsFuncArgOperator Operator +hi! link jsFunction Keyword +hi! link jsTemplateBraces Special + +"}}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/coconut_json.vim b/after/syntax/coconut_json.vim new file mode 100644 index 0000000..79395f8 --- /dev/null +++ b/after/syntax/coconut_json.vim @@ -0,0 +1,6 @@ +if coconut#should_abort('json') + finish +endif + +hi! link jsonKeyword CoconutKeyColor +hi! link jsonKeywordMatch CoconutKeyword diff --git a/after/syntax/coconut_lua.vim b/after/syntax/coconut_lua.vim new file mode 100644 index 0000000..c6d621d --- /dev/null +++ b/after/syntax/coconut_lua.vim @@ -0,0 +1,6 @@ +if coconut#should_abort('lua') + finish +endif + +hi! link luaFunc CoconutKeyColor +hi! link luaTable CoconutFg diff --git a/after/syntax/coconut_markdown.vim b/after/syntax/coconut_markdown.vim new file mode 100644 index 0000000..8db5dcf --- /dev/null +++ b/after/syntax/coconut_markdown.vim @@ -0,0 +1,50 @@ +if coconut#should_abort('markdown', 'mkd') + finish +endif + +if b:current_syntax ==# 'mkd' +" plasticboy/vim-markdown + hi! link htmlBold CoconutParameterBold + hi! link htmlBoldItalic CoconutParameterBoldItalic + hi! link htmlH1 CoconutConstantsBold + hi! link htmlItalic CoconutStringColorItalic + hi! link mkdBlockquote CoconutStringColorItalic + hi! link mkdBold CoconutParameterBold + hi! link mkdBoldItalic CoconutParameterBoldItalic + hi! link mkdCode CoconutClassName + hi! link mkdCodeEnd CoconutClassName + hi! link mkdCodeStart CoconutClassName + hi! link mkdHeading CoconutConstantsBold + hi! link mkdInlineUrl CoconutLink + hi! link mkdItalic CoconutStringColorItalic + hi! link mkdLink CoconutKeyword + hi! link mkdListItem CoconutKeyColor + hi! link mkdRule CoconutComment + hi! link mkdUrl CoconutLink +"}}}1 +elseif b:current_syntax ==# 'markdown' +" Builtin: + hi! link markdownBlockquote CoconutKeyColor + hi! link markdownBold CoconutParameterBold + hi! link markdownBoldItalic CoconutParameterBoldItalic + hi! link markdownCodeBlock CoconutClassName + hi! link markdownCode CoconutClassName + hi! link markdownCodeDelimiter CoconutClassName + hi! link markdownH1 CoconutConstantsBold + hi! link markdownH2 markdownH1 + hi! link markdownH3 markdownH1 + hi! link markdownH4 markdownH1 + hi! link markdownH5 markdownH1 + hi! link markdownH6 markdownH1 + hi! link markdownHeadingDelimiter markdownH1 + hi! link markdownHeadingRule markdownH1 + hi! link markdownItalic CoconutStringColorItalic + hi! link markdownLinkText CoconutKeyword + hi! link markdownListMarker CoconutKeyColor + hi! link markdownOrderedListMarker CoconutKeyColor + hi! link markdownRule CoconutComment + hi! link markdownUrl CoconutLink +"}}} +endif + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/coconut_ocaml.vim b/after/syntax/coconut_ocaml.vim new file mode 100644 index 0000000..f6c4bb0 --- /dev/null +++ b/after/syntax/coconut_ocaml.vim @@ -0,0 +1,7 @@ +if coconut#should_abort('ocaml') + finish +endif + +hi! link ocamlModule Type +hi! link ocamlModPath Normal +hi! link ocamlLabel CoconutParameterItalic diff --git a/after/syntax/coconut_perl.vim b/after/syntax/coconut_perl.vim new file mode 100644 index 0000000..bb78a81 --- /dev/null +++ b/after/syntax/coconut_perl.vim @@ -0,0 +1,38 @@ +if coconut#should_abort('perl') + finish +endif + +" Regex +hi! link perlMatchStartEnd CoconutRed + +" Builtin functions +hi! link perlOperator CoconutKeyColor +hi! link perlStatementFiledesc CoconutKeyColor +hi! link perlStatementFiles CoconutKeyColor +hi! link perlStatementFlow CoconutKeyColor +hi! link perlStatementHash CoconutKeyColor +hi! link perlStatementIOfunc CoconutKeyColor +hi! link perlStatementIPC CoconutKeyColor +hi! link perlStatementList CoconutKeyColor +hi! link perlStatementMisc CoconutKeyColor +hi! link perlStatementNetwork CoconutKeyColor +hi! link perlStatementNumeric CoconutKeyColor +hi! link perlStatementProc CoconutKeyColor +hi! link perlStatementPword CoconutKeyColor +hi! link perlStatementRegexp CoconutKeyColor +hi! link perlStatementScalar CoconutKeyColor +hi! link perlStatementSocket CoconutKeyColor +hi! link perlStatementTime CoconutKeyColor +hi! link perlStatementVector CoconutKeyColor + +" Highlighting for quoting constructs, tied to existing option in vim-perl +if get(g:, 'perl_string_as_statement', 0) + hi! link perlStringStartEnd CoconutRed +endif + +" Signatures +hi! link perlSignature CoconutParameterItalic +hi! link perlSubPrototype CoconutParameterItalic + +" Hash keys +hi! link perlVarSimpleMemberName CoconutConstants diff --git a/after/syntax/coconut_php.vim b/after/syntax/coconut_php.vim new file mode 100644 index 0000000..6047302 --- /dev/null +++ b/after/syntax/coconut_php.vim @@ -0,0 +1,10 @@ +if coconut#should_abort('php') + finish +endif + +hi! link phpClass Type +hi! link phpClasses Type +hi! link phpDocTags CoconutKeyColorItalic +hi! link phpFunction Function +hi! link phpParent Normal +hi! link phpSpecialFunction CoconutKeyColor diff --git a/after/syntax/coconut_plantuml.vim b/after/syntax/coconut_plantuml.vim new file mode 100644 index 0000000..9d557a5 --- /dev/null +++ b/after/syntax/coconut_plantuml.vim @@ -0,0 +1,13 @@ +if coconut#should_abort('plantuml') + finish +endif + +hi! link plantumlClassPrivate SpecialKey +hi! link plantumlClassProtected CoconutParameter +hi! link plantumlClassPublic Function +hi! link plantumlColonLine String +hi! link plantumlDirectedOrVerticalArrowLR Constant +hi! link plantumlDirectedOrVerticalArrowRL Constant +hi! link plantumlHorizontalArrow Constant +hi! link plantumlSkinParamKeyword CoconutKeyColor +hi! link plantumlTypeKeyword Keyword diff --git a/after/syntax/coconut_python.vim b/after/syntax/coconut_python.vim new file mode 100644 index 0000000..33ed487 --- /dev/null +++ b/after/syntax/coconut_python.vim @@ -0,0 +1,11 @@ +if coconut#should_abort('python') + finish +endif + +hi! link pythonBuiltinObj Type +hi! link pythonBuiltinObject Type +hi! link pythonBuiltinType Type +hi! link pythonClassVar CoconutConstantsItalic +hi! link pythonExClass Type +hi! link pythonNone Type +hi! link pythonRun Comment diff --git a/after/syntax/coconut_ruby.vim b/after/syntax/coconut_ruby.vim new file mode 100644 index 0000000..fc81083 --- /dev/null +++ b/after/syntax/coconut_ruby.vim @@ -0,0 +1,16 @@ +if coconut#should_abort('ruby') + finish +endif + +if ! exists('g:ruby_operators') + let g:ruby_operators=1 +endif + +hi! link rubyBlockArgument CoconutParameterItalic +hi! link rubyBlockParameter CoconutParameterItalic +hi! link rubyCurlyBlock CoconutKeyword +hi! link rubyGlobalVariable CoconutConstants +hi! link rubyInstanceVariable CoconutConstantsItalic +hi! link rubyInterpolationDelimiter CoconutKeyword +hi! link rubyRegexpDelimiter CoconutRed +hi! link rubyStringDelimiter CoconutStringColor diff --git a/after/syntax/coconut_rust.vim b/after/syntax/coconut_rust.vim new file mode 100644 index 0000000..6c9db4c --- /dev/null +++ b/after/syntax/coconut_rust.vim @@ -0,0 +1,5 @@ +if coconut#should_abort('rust') + finish +endif + +hi! link rustCommentLineDoc Comment diff --git a/after/syntax/coconut_sass.vim b/after/syntax/coconut_sass.vim new file mode 100644 index 0000000..ad719ae --- /dev/null +++ b/after/syntax/coconut_sass.vim @@ -0,0 +1,12 @@ +if coconut#should_abort('sass') + finish +endif + +hi! link sassClass cssClassName +hi! link sassClassChar cssClassNameDot +hi! link sassId cssIdentifier +hi! link sassIdChar cssIdentifier +hi! link sassInterpolationDelimiter CoconutKeyword +hi! link sassMixinName Function +hi! link sassProperty cssProp +hi! link sassVariableAssignment Operator diff --git a/after/syntax/coconut_sh.vim b/after/syntax/coconut_sh.vim new file mode 100644 index 0000000..8ed79db --- /dev/null +++ b/after/syntax/coconut_sh.vim @@ -0,0 +1,8 @@ +if coconut#should_abort('bash', 'ksh', 'posix', 'sh') + finish +endif + +hi! link shCommandSub NONE +hi! link shEscape CoconutRed +hi! link shParen NONE +hi! link shParenError NONE diff --git a/after/syntax/coconut_tex.vim b/after/syntax/coconut_tex.vim new file mode 100644 index 0000000..d7c21f7 --- /dev/null +++ b/after/syntax/coconut_tex.vim @@ -0,0 +1,17 @@ +if coconut#should_abort('tex') + finish +endif + +hi! link texBeginEndName CoconutParameterItalic +hi! link texBoldItalStyle CoconutParameterBoldItalic +hi! link texBoldStyle CoconutParameterBold +hi! link texInputFile CoconutParameterItalic +hi! link texItalStyle CoconutStringColorItalic +hi! link texLigature CoconutConstants +hi! link texMath CoconutConstants +hi! link texMathMatcher CoconutConstants +hi! link texMathSymbol CoconutConstants +hi! link texRefZone CoconutBgDarker +hi! link texSpecialChar CoconutConstants +hi! link texSubscripts CoconutConstants +hi! link texTitle CoconutFgBold diff --git a/after/syntax/coconut_typescript.vim b/after/syntax/coconut_typescript.vim new file mode 100644 index 0000000..5397bda --- /dev/null +++ b/after/syntax/coconut_typescript.vim @@ -0,0 +1,57 @@ +if coconut#should_abort('typescript', 'typescriptreact') + finish +endif + +" HerringtonDarkholme/yats.vim + +hi! link typescriptAliasDeclaration Type +hi! link typescriptArrayMethod Function +hi! link typescriptArrowFunc Operator +hi! link typescriptArrowFuncArg CoconutParameterItalic +hi! link typescriptAssign Operator +hi! link typescriptBOMWindowProp Constant +hi! link typescriptBinaryOp Operator +hi! link typescriptBraces Delimiter +hi! link typescriptCall typescriptArrowFuncArg +hi! link typescriptClassHeritage Type +hi! link typescriptClassName Type +hi! link typescriptDateMethod CoconutKeyColor +hi! link typescriptDateStaticMethod Function +hi! link typescriptDecorator CoconutClassNameItalic +hi! link typescriptDefaultParam Operator +hi! link typescriptES6SetMethod CoconutKeyColor +hi! link typescriptEndColons Delimiter +hi! link typescriptEnum Type +hi! link typescriptEnumKeyword Keyword +hi! link typescriptFuncComma Delimiter +hi! link typescriptFuncKeyword Keyword +hi! link typescriptFuncType CoconutParameterItalic +hi! link typescriptFuncTypeArrow Operator +hi! link typescriptGlobal Type +hi! link typescriptGlobalMethod CoconutKeyColor +hi! link typescriptGlobalObjects Type +hi! link typescriptIdentifier CoconutConstantsItalic +hi! link typescriptInterfaceHeritage Type +hi! link typescriptInterfaceName Type +hi! link typescriptInterpolationDelimiter Keyword +hi! link typescriptKeywordOp Keyword +hi! link typescriptLogicSymbols Operator +hi! link typescriptMember Identifier +hi! link typescriptMemberOptionality Special +hi! link typescriptObjectColon Special +hi! link typescriptObjectLabel Identifier +hi! link typescriptObjectSpread Operator +hi! link typescriptOperator Operator +hi! link typescriptParamImpl CoconutParameterItalic +hi! link typescriptParens Delimiter +hi! link typescriptPredefinedType Type +hi! link typescriptRestOrSpread Operator +hi! link typescriptTernaryOp Operator +hi! link typescriptTypeAnnotation Special +hi! link typescriptTypeCast Operator +hi! link typescriptTypeParameter CoconutParameterItalic +hi! link typescriptTypeReference Type +hi! link typescriptUnaryOp Operator +hi! link typescriptVariable Keyword + +" }}} diff --git a/after/syntax/coconut_typescriptreact.vim b/after/syntax/coconut_typescriptreact.vim new file mode 100644 index 0000000..b18db52 --- /dev/null +++ b/after/syntax/coconut_typescriptreact.vim @@ -0,0 +1,10 @@ +if coconut#should_abort('typescriptreact') + finish +endif + +runtime! syntax/typescript.vim + +hi! link tsxAttrib CoconutClassNameItalic +hi! link tsxEqual Operator +hi! link tsxIntrinsicTagName Keyword +hi! link tsxTagName Type diff --git a/after/syntax/coconut_vim.vim b/after/syntax/coconut_vim.vim new file mode 100644 index 0000000..b33aacc --- /dev/null +++ b/after/syntax/coconut_vim.vim @@ -0,0 +1,14 @@ +if coconut#should_abort('vim') + finish +endif + +hi! link vimAutoCmdSfxList Type +hi! link vimAutoEventList Type +hi! link vimEnvVar Constant +hi! link vimFunction Function +hi! link vimHiBang Keyword +hi! link vimOption Type +hi! link vimSetMod Keyword +hi! link vimSetSep Delimiter +hi! link vimUserAttrbCmpltFunc Function +hi! link vimUserFunc Function diff --git a/after/syntax/coconut_xml.vim b/after/syntax/coconut_xml.vim new file mode 100644 index 0000000..fa328af --- /dev/null +++ b/after/syntax/coconut_xml.vim @@ -0,0 +1,13 @@ +if coconut#should_abort('xml') + finish +endif + +hi! link xmlAttrib CoconutClassNameItalic +hi! link xmlEqual Operator +hi! link xmlTag Delimiter +hi! link xmlTagName Statement + +" Fixes missing highlight over end tags +syn region xmlTagName + \ matchgroup=xmlTag start=+"']\@=+ + \ matchgroup=xmlTag end=+>+ diff --git a/after/syntax/coconut_yaml.vim b/after/syntax/coconut_yaml.vim new file mode 100644 index 0000000..eedacb1 --- /dev/null +++ b/after/syntax/coconut_yaml.vim @@ -0,0 +1,12 @@ +if coconut#should_abort('yaml') + finish +endif + +hi! link yamlAlias CoconutClassNameItalicUnderline +hi! link yamlAnchor CoconutKeywordItalic +hi! link yamlBlockMappingKey CoconutKeyColor +hi! link yamlFlowCollection CoconutKeyword +hi! link yamlFlowIndicator Delimiter +hi! link yamlNodeTag CoconutKeyword +hi! link yamlPlainScalar CoconutStringColor + diff --git a/after/syntax/vanilla_css.vim b/after/syntax/vanilla_css.vim new file mode 100644 index 0000000..1a384bb --- /dev/null +++ b/after/syntax/vanilla_css.vim @@ -0,0 +1,15 @@ +if vanilla#should_abort('css') + finish +endif + +hi! link cssAttrComma Delimiter +hi! link cssAttrRegion VanillaKeyword +hi! link cssAttributeSelector VanillaClassNameItalic +hi! link cssBraces Delimiter +hi! link cssFunctionComma Delimiter +hi! link cssNoise VanillaKeyword +hi! link cssProp VanillaKeyColor +hi! link cssPseudoClass VanillaKeyword +hi! link cssPseudoClassId VanillaClassNameItalic +hi! link cssUnitDecorators VanillaKeyword +hi! link cssVendor VanillaClassNameItalic diff --git a/after/syntax/vanilla_gitcommit.vim b/after/syntax/vanilla_gitcommit.vim new file mode 100644 index 0000000..7aa6993 --- /dev/null +++ b/after/syntax/vanilla_gitcommit.vim @@ -0,0 +1,12 @@ +if vanilla#should_abort('gitcommit') + finish +endif + +" The following two are misnomers. Colors are correct. +hi! link diffFile VanillaClassName +hi! link diffNewFile VanillaRed + +hi! link diffAdded VanillaClassName +hi! link diffLine VanillaKeyColorItalic +hi! link diffRemoved VanillaRed + diff --git a/after/syntax/vanilla_html.vim b/after/syntax/vanilla_html.vim new file mode 100644 index 0000000..430bad4 --- /dev/null +++ b/after/syntax/vanilla_html.vim @@ -0,0 +1,9 @@ +if vanilla#should_abort('html') + finish +endif + +hi! link htmlTag VanillaFg +hi! link htmlArg VanillaClassNameItalic +hi! link htmlTitle VanillaFg +hi! link htmlH1 VanillaFg +hi! link htmlSpecialChar VanillaConstants diff --git a/after/syntax/vanilla_javascript.vim b/after/syntax/vanilla_javascript.vim new file mode 100644 index 0000000..b37e2ef --- /dev/null +++ b/after/syntax/vanilla_javascript.vim @@ -0,0 +1,25 @@ +if vanilla#should_abort('javascript') + finish +endif + +hi! link javaScriptBraces Delimiter +hi! link javaScriptNumber Constant +hi! link javaScriptNull Constant +hi! link javaScriptFunction Keyword + +" pangloss/vim-javascript + +hi! link jsArrowFunction Operator +hi! link jsClassMethodType Keyword +hi! link jsDestructuringAssignment VanillaParameterItalic +hi! link jsDocParam VanillaParameterItalic +hi! link jsDocTags Keyword +hi! link jsDocType Type +hi! link jsDocTypeBrackets VanillaKeyColor +hi! link jsFuncArgOperator Operator +hi! link jsFunction Keyword +hi! link jsTemplateBraces Special + +"}}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/vanilla_json.vim b/after/syntax/vanilla_json.vim new file mode 100644 index 0000000..3f3288d --- /dev/null +++ b/after/syntax/vanilla_json.vim @@ -0,0 +1,6 @@ +if vanilla#should_abort('json') + finish +endif + +hi! link jsonKeyword VanillaKeyColor +hi! link jsonKeywordMatch VanillaKeyword diff --git a/after/syntax/vanilla_lua.vim b/after/syntax/vanilla_lua.vim new file mode 100644 index 0000000..b5dda1b --- /dev/null +++ b/after/syntax/vanilla_lua.vim @@ -0,0 +1,6 @@ +if vanilla#should_abort('lua') + finish +endif + +hi! link luaFunc VanillaKeyColor +hi! link luaTable VanillaFg diff --git a/after/syntax/vanilla_markdown.vim b/after/syntax/vanilla_markdown.vim new file mode 100644 index 0000000..caafabb --- /dev/null +++ b/after/syntax/vanilla_markdown.vim @@ -0,0 +1,50 @@ +if vanilla#should_abort('markdown', 'mkd') + finish +endif + +if b:current_syntax ==# 'mkd' +" plasticboy/vim-markdown + hi! link htmlBold VanillaParameterBold + hi! link htmlBoldItalic VanillaParameterBoldItalic + hi! link htmlH1 VanillaConstantsBold + hi! link htmlItalic VanillaStringColorItalic + hi! link mkdBlockquote VanillaStringColorItalic + hi! link mkdBold VanillaParameterBold + hi! link mkdBoldItalic VanillaParameterBoldItalic + hi! link mkdCode VanillaClassName + hi! link mkdCodeEnd VanillaClassName + hi! link mkdCodeStart VanillaClassName + hi! link mkdHeading VanillaConstantsBold + hi! link mkdInlineUrl VanillaLink + hi! link mkdItalic VanillaStringColorItalic + hi! link mkdLink VanillaKeyword + hi! link mkdListItem VanillaKeyColor + hi! link mkdRule VanillaComment + hi! link mkdUrl VanillaLink +"}}}1 +elseif b:current_syntax ==# 'markdown' +" Builtin: + hi! link markdownBlockquote VanillaKeyColor + hi! link markdownBold VanillaParameterBold + hi! link markdownBoldItalic VanillaParameterBoldItalic + hi! link markdownCodeBlock VanillaClassName + hi! link markdownCode VanillaClassName + hi! link markdownCodeDelimiter VanillaClassName + hi! link markdownH1 VanillaConstantsBold + hi! link markdownH2 markdownH1 + hi! link markdownH3 markdownH1 + hi! link markdownH4 markdownH1 + hi! link markdownH5 markdownH1 + hi! link markdownH6 markdownH1 + hi! link markdownHeadingDelimiter markdownH1 + hi! link markdownHeadingRule markdownH1 + hi! link markdownItalic VanillaStringColorItalic + hi! link markdownLinkText VanillaKeyword + hi! link markdownListMarker VanillaKeyColor + hi! link markdownOrderedListMarker VanillaKeyColor + hi! link markdownRule VanillaComment + hi! link markdownUrl VanillaLink +"}}} +endif + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/after/syntax/vanilla_ocaml.vim b/after/syntax/vanilla_ocaml.vim new file mode 100644 index 0000000..a3e6b69 --- /dev/null +++ b/after/syntax/vanilla_ocaml.vim @@ -0,0 +1,7 @@ +if vanilla#should_abort('ocaml') + finish +endif + +hi! link ocamlModule Type +hi! link ocamlModPath Normal +hi! link ocamlLabel VanillaParameterItalic diff --git a/after/syntax/vanilla_perl.vim b/after/syntax/vanilla_perl.vim new file mode 100644 index 0000000..6025498 --- /dev/null +++ b/after/syntax/vanilla_perl.vim @@ -0,0 +1,38 @@ +if vanilla#should_abort('perl') + finish +endif + +" Regex +hi! link perlMatchStartEnd VanillaRed + +" Builtin functions +hi! link perlOperator VanillaKeyColor +hi! link perlStatementFiledesc VanillaKeyColor +hi! link perlStatementFiles VanillaKeyColor +hi! link perlStatementFlow VanillaKeyColor +hi! link perlStatementHash VanillaKeyColor +hi! link perlStatementIOfunc VanillaKeyColor +hi! link perlStatementIPC VanillaKeyColor +hi! link perlStatementList VanillaKeyColor +hi! link perlStatementMisc VanillaKeyColor +hi! link perlStatementNetwork VanillaKeyColor +hi! link perlStatementNumeric VanillaKeyColor +hi! link perlStatementProc VanillaKeyColor +hi! link perlStatementPword VanillaKeyColor +hi! link perlStatementRegexp VanillaKeyColor +hi! link perlStatementScalar VanillaKeyColor +hi! link perlStatementSocket VanillaKeyColor +hi! link perlStatementTime VanillaKeyColor +hi! link perlStatementVector VanillaKeyColor + +" Highlighting for quoting constructs, tied to existing option in vim-perl +if get(g:, 'perl_string_as_statement', 0) + hi! link perlStringStartEnd VanillaRed +endif + +" Signatures +hi! link perlSignature VanillaParameterItalic +hi! link perlSubPrototype VanillaParameterItalic + +" Hash keys +hi! link perlVarSimpleMemberName VanillaConstants diff --git a/after/syntax/vanilla_php.vim b/after/syntax/vanilla_php.vim new file mode 100644 index 0000000..06174ea --- /dev/null +++ b/after/syntax/vanilla_php.vim @@ -0,0 +1,10 @@ +if vanilla#should_abort('php') + finish +endif + +hi! link phpClass Type +hi! link phpClasses Type +hi! link phpDocTags VanillaKeyColorItalic +hi! link phpFunction Function +hi! link phpParent Normal +hi! link phpSpecialFunction VanillaKeyColor diff --git a/after/syntax/vanilla_plantuml.vim b/after/syntax/vanilla_plantuml.vim new file mode 100644 index 0000000..847bc20 --- /dev/null +++ b/after/syntax/vanilla_plantuml.vim @@ -0,0 +1,13 @@ +if vanilla#should_abort('plantuml') + finish +endif + +hi! link plantumlClassPrivate SpecialKey +hi! link plantumlClassProtected VanillaParameter +hi! link plantumlClassPublic Function +hi! link plantumlColonLine String +hi! link plantumlDirectedOrVerticalArrowLR Constant +hi! link plantumlDirectedOrVerticalArrowRL Constant +hi! link plantumlHorizontalArrow Constant +hi! link plantumlSkinParamKeyword VanillaKeyColor +hi! link plantumlTypeKeyword Keyword diff --git a/after/syntax/vanilla_python.vim b/after/syntax/vanilla_python.vim new file mode 100644 index 0000000..9cc3ead --- /dev/null +++ b/after/syntax/vanilla_python.vim @@ -0,0 +1,11 @@ +if vanilla#should_abort('python') + finish +endif + +hi! link pythonBuiltinObj Type +hi! link pythonBuiltinObject Type +hi! link pythonBuiltinType Type +hi! link pythonClassVar VanillaConstantsItalic +hi! link pythonExClass Type +hi! link pythonNone Type +hi! link pythonRun Comment diff --git a/after/syntax/vanilla_ruby.vim b/after/syntax/vanilla_ruby.vim new file mode 100644 index 0000000..28dcde0 --- /dev/null +++ b/after/syntax/vanilla_ruby.vim @@ -0,0 +1,16 @@ +if vanilla#should_abort('ruby') + finish +endif + +if ! exists('g:ruby_operators') + let g:ruby_operators=1 +endif + +hi! link rubyBlockArgument VanillaParameterItalic +hi! link rubyBlockParameter VanillaParameterItalic +hi! link rubyCurlyBlock VanillaKeyword +hi! link rubyGlobalVariable VanillaConstants +hi! link rubyInstanceVariable VanillaConstantsItalic +hi! link rubyInterpolationDelimiter VanillaKeyword +hi! link rubyRegexpDelimiter VanillaRed +hi! link rubyStringDelimiter VanillaStringColor diff --git a/after/syntax/vanilla_rust.vim b/after/syntax/vanilla_rust.vim new file mode 100644 index 0000000..8f7c036 --- /dev/null +++ b/after/syntax/vanilla_rust.vim @@ -0,0 +1,5 @@ +if vanilla#should_abort('rust') + finish +endif + +hi! link rustCommentLineDoc Comment diff --git a/after/syntax/vanilla_sass.vim b/after/syntax/vanilla_sass.vim new file mode 100644 index 0000000..e601e40 --- /dev/null +++ b/after/syntax/vanilla_sass.vim @@ -0,0 +1,12 @@ +if vanilla#should_abort('sass') + finish +endif + +hi! link sassClass cssClassName +hi! link sassClassChar cssClassNameDot +hi! link sassId cssIdentifier +hi! link sassIdChar cssIdentifier +hi! link sassInterpolationDelimiter VanillaKeyword +hi! link sassMixinName Function +hi! link sassProperty cssProp +hi! link sassVariableAssignment Operator diff --git a/after/syntax/vanilla_sh.vim b/after/syntax/vanilla_sh.vim new file mode 100644 index 0000000..b14bf18 --- /dev/null +++ b/after/syntax/vanilla_sh.vim @@ -0,0 +1,8 @@ +if vanilla#should_abort('bash', 'ksh', 'posix', 'sh') + finish +endif + +hi! link shCommandSub NONE +hi! link shEscape VanillaRed +hi! link shParen NONE +hi! link shParenError NONE diff --git a/after/syntax/vanilla_tex.vim b/after/syntax/vanilla_tex.vim new file mode 100644 index 0000000..f4c55b0 --- /dev/null +++ b/after/syntax/vanilla_tex.vim @@ -0,0 +1,17 @@ +if vanilla#should_abort('tex') + finish +endif + +hi! link texBeginEndName VanillaParameterItalic +hi! link texBoldItalStyle VanillaParameterBoldItalic +hi! link texBoldStyle VanillaParameterBold +hi! link texInputFile VanillaParameterItalic +hi! link texItalStyle VanillaStringColorItalic +hi! link texLigature VanillaConstants +hi! link texMath VanillaConstants +hi! link texMathMatcher VanillaConstants +hi! link texMathSymbol VanillaConstants +hi! link texRefZone VanillaBgDarker +hi! link texSpecialChar VanillaConstants +hi! link texSubscripts VanillaConstants +hi! link texTitle VanillaFgBold diff --git a/after/syntax/vanilla_typescript.vim b/after/syntax/vanilla_typescript.vim new file mode 100644 index 0000000..7a5a324 --- /dev/null +++ b/after/syntax/vanilla_typescript.vim @@ -0,0 +1,57 @@ +if vanilla#should_abort('typescript', 'typescriptreact') + finish +endif + +" HerringtonDarkholme/yats.vim + +hi! link typescriptAliasDeclaration Type +hi! link typescriptArrayMethod Function +hi! link typescriptArrowFunc Operator +hi! link typescriptArrowFuncArg VanillaParameterItalic +hi! link typescriptAssign Operator +hi! link typescriptBOMWindowProp Constant +hi! link typescriptBinaryOp Operator +hi! link typescriptBraces Delimiter +hi! link typescriptCall typescriptArrowFuncArg +hi! link typescriptClassHeritage Type +hi! link typescriptClassName Type +hi! link typescriptDateMethod VanillaKeyColor +hi! link typescriptDateStaticMethod Function +hi! link typescriptDecorator VanillaClassNameItalic +hi! link typescriptDefaultParam Operator +hi! link typescriptES6SetMethod VanillaKeyColor +hi! link typescriptEndColons Delimiter +hi! link typescriptEnum Type +hi! link typescriptEnumKeyword Keyword +hi! link typescriptFuncComma Delimiter +hi! link typescriptFuncKeyword Keyword +hi! link typescriptFuncType VanillaParameterItalic +hi! link typescriptFuncTypeArrow Operator +hi! link typescriptGlobal Type +hi! link typescriptGlobalMethod VanillaKeyColor +hi! link typescriptGlobalObjects Type +hi! link typescriptIdentifier VanillaConstantsItalic +hi! link typescriptInterfaceHeritage Type +hi! link typescriptInterfaceName Type +hi! link typescriptInterpolationDelimiter Keyword +hi! link typescriptKeywordOp Keyword +hi! link typescriptLogicSymbols Operator +hi! link typescriptMember Identifier +hi! link typescriptMemberOptionality Special +hi! link typescriptObjectColon Special +hi! link typescriptObjectLabel Identifier +hi! link typescriptObjectSpread Operator +hi! link typescriptOperator Operator +hi! link typescriptParamImpl VanillaParameterItalic +hi! link typescriptParens Delimiter +hi! link typescriptPredefinedType Type +hi! link typescriptRestOrSpread Operator +hi! link typescriptTernaryOp Operator +hi! link typescriptTypeAnnotation Special +hi! link typescriptTypeCast Operator +hi! link typescriptTypeParameter VanillaParameterItalic +hi! link typescriptTypeReference Type +hi! link typescriptUnaryOp Operator +hi! link typescriptVariable Keyword + +" }}} diff --git a/after/syntax/vanilla_typescriptreact.vim b/after/syntax/vanilla_typescriptreact.vim new file mode 100644 index 0000000..01c2324 --- /dev/null +++ b/after/syntax/vanilla_typescriptreact.vim @@ -0,0 +1,10 @@ +if vanilla#should_abort('typescriptreact') + finish +endif + +runtime! syntax/typescript.vim + +hi! link tsxAttrib VanillaClassNameItalic +hi! link tsxEqual Operator +hi! link tsxIntrinsicTagName Keyword +hi! link tsxTagName Type diff --git a/after/syntax/vanilla_vim.vim b/after/syntax/vanilla_vim.vim new file mode 100644 index 0000000..cf55184 --- /dev/null +++ b/after/syntax/vanilla_vim.vim @@ -0,0 +1,14 @@ +if vanilla#should_abort('vim') + finish +endif + +hi! link vimAutoCmdSfxList Type +hi! link vimAutoEventList Type +hi! link vimEnvVar Constant +hi! link vimFunction Function +hi! link vimHiBang Keyword +hi! link vimOption Type +hi! link vimSetMod Keyword +hi! link vimSetSep Delimiter +hi! link vimUserAttrbCmpltFunc Function +hi! link vimUserFunc Function diff --git a/after/syntax/vanilla_xml.vim b/after/syntax/vanilla_xml.vim new file mode 100644 index 0000000..fdd0ef2 --- /dev/null +++ b/after/syntax/vanilla_xml.vim @@ -0,0 +1,13 @@ +if vanilla#should_abort('xml') + finish +endif + +hi! link xmlAttrib VanillaClassNameItalic +hi! link xmlEqual Operator +hi! link xmlTag Delimiter +hi! link xmlTagName Statement + +" Fixes missing highlight over end tags +syn region xmlTagName + \ matchgroup=xmlTag start=+"']\@=+ + \ matchgroup=xmlTag end=+>+ diff --git a/after/syntax/vanilla_yaml.vim b/after/syntax/vanilla_yaml.vim new file mode 100644 index 0000000..45e972f --- /dev/null +++ b/after/syntax/vanilla_yaml.vim @@ -0,0 +1,12 @@ +if vanilla#should_abort('yaml') + finish +endif + +hi! link yamlAlias VanillaClassNameItalicUnderline +hi! link yamlAnchor VanillaKeywordItalic +hi! link yamlBlockMappingKey VanillaKeyColor +hi! link yamlFlowCollection VanillaKeyword +hi! link yamlFlowIndicator Delimiter +hi! link yamlNodeTag VanillaKeyword +hi! link yamlPlainScalar VanillaStringColor + diff --git a/autoload/chocola.vim b/autoload/chocola.vim new file mode 100644 index 0000000..e53597d --- /dev/null +++ b/autoload/chocola.vim @@ -0,0 +1,57 @@ +" Palette: + +let g:chocola#palette = {} +let g:chocola#palette.fg = ['#d3d3d3', 252] + +let g:chocola#palette.bglighter = ['#30292c', 236] +let g:chocola#palette.bglight = ['#30292c', 236] +let g:chocola#palette.bg = ['#30292c', 236] +let g:chocola#palette.bgdark = ['#30292c', 236] +let g:chocola#palette.bgdarker = ['#30292c', 236] + +let g:chocola#palette.comment = ['#806872', 243] +let g:chocola#palette.selection = ['#6a3849', 238] +let g:chocola#palette.subtle = ['#352f31', 236] + +let g:chocola#palette.key_color = ['#48eae4', 80] +let g:chocola#palette.class_name = ['#f8835f', 209] +let g:chocola#palette.parameter_color = ['#FFB86C', 215] +let g:chocola#palette.keyword_color = ['#FF357C', 204] +let g:chocola#palette.constants_color = ['#96b7fb', 111] +let g:chocola#palette.red = ['#FF5555', 203] +let g:chocola#palette.string_color = ['#F6E9CB', 224] + +" +" Terminal Colors +" +let g:chocola#palette.color_0 = '#21222C' +let g:chocola#palette.color_1 = '#E356A7' +let g:chocola#palette.color_2 = '#42E66C' +let g:chocola#palette.color_3 = '#F1FA8C' +let g:chocola#palette.color_4 = '#9B6BDF' +let g:chocola#palette.color_5 = '#E64747' +let g:chocola#palette.color_6 = '#75D7EC' +let g:chocola#palette.color_7 = '#F8F8F2' +let g:chocola#palette.color_8 = '#6272A4' +let g:chocola#palette.color_9 = '#E356A7' +let g:chocola#palette.color_10 = '#42E66C' +let g:chocola#palette.color_11 = '#EFA554' +let g:chocola#palette.color_12 = '#9B6BDF' +let g:chocola#palette.color_13 = '#E64747' +let g:chocola#palette.color_14 = '#75D7EC' +let g:chocola#palette.color_15 = '#FFFFFF' + +" }}} + +" Helper function that takes a variadic list of filetypes as args and returns +" whether or not the execution of the ftplugin should be aborted. +func! chocola#should_abort(...) + if ! exists('g:colors_name') || g:colors_name !=# 'chocola' + return 1 + elseif a:0 > 0 && (! exists('b:current_syntax') || index(a:000, b:current_syntax) == -1) + return 1 + endif + return 0 +endfunction + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/autoload/coconut.vim b/autoload/coconut.vim new file mode 100644 index 0000000..8e29101 --- /dev/null +++ b/autoload/coconut.vim @@ -0,0 +1,57 @@ +" Palette: + +let g:coconut#palette = {} +let g:coconut#palette.fg = ['#d3d3d3', 252] + +let g:coconut#palette.bglighter = ['#3a3143', 237] +let g:coconut#palette.bglight = ['#3a3143', 237] +let g:coconut#palette.bg = ['#3a3143', 237] +let g:coconut#palette.bgdark = ['#3a3143', 237] +let g:coconut#palette.bgdarker = ['#3a3143', 237] + +let g:coconut#palette.comment = ['#6f6880', 242] +let g:coconut#palette.selection = ['#255b82', 24] +let g:coconut#palette.subtle = ['#393243', 237] + +let g:coconut#palette.key_color = ['#48eae4', 80] +let g:coconut#palette.class_name = ['#f689f6', 213] +let g:coconut#palette.parameter_color = ['#FFB86C', 215] +let g:coconut#palette.keyword_color = ['#b897f6', 141] +let g:coconut#palette.constants_color = ['#50b5d1', 74] +let g:coconut#palette.red = ['#FF5555', 203] +let g:coconut#palette.string_color = ['#F6E9CB', 224] + +" +" Terminal Colors +" +let g:coconut#palette.color_0 = '#21222C' +let g:coconut#palette.color_1 = '#E356A7' +let g:coconut#palette.color_2 = '#42E66C' +let g:coconut#palette.color_3 = '#F1FA8C' +let g:coconut#palette.color_4 = '#9B6BDF' +let g:coconut#palette.color_5 = '#E64747' +let g:coconut#palette.color_6 = '#75D7EC' +let g:coconut#palette.color_7 = '#F8F8F2' +let g:coconut#palette.color_8 = '#6272A4' +let g:coconut#palette.color_9 = '#E356A7' +let g:coconut#palette.color_10 = '#42E66C' +let g:coconut#palette.color_11 = '#EFA554' +let g:coconut#palette.color_12 = '#9B6BDF' +let g:coconut#palette.color_13 = '#E64747' +let g:coconut#palette.color_14 = '#75D7EC' +let g:coconut#palette.color_15 = '#FFFFFF' + +" }}} + +" Helper function that takes a variadic list of filetypes as args and returns +" whether or not the execution of the ftplugin should be aborted. +func! coconut#should_abort(...) + if ! exists('g:colors_name') || g:colors_name !=# 'coconut' + return 1 + elseif a:0 > 0 && (! exists('b:current_syntax') || index(a:000, b:current_syntax) == -1) + return 1 + endif + return 0 +endfunction + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/autoload/ram.vim b/autoload/ram.vim index 9c7f413..f080bf8 100644 --- a/autoload/ram.vim +++ b/autoload/ram.vim @@ -9,7 +9,7 @@ let g:ram#palette.bg = ['#302930', 236] let g:ram#palette.bgdark = ['#302930', 236] let g:ram#palette.bgdarker = ['#302930', 236] -let g:ram#palette.comment = ['#6272a4', 61] +let g:ram#palette.comment = ['#987fa5', 103] let g:ram#palette.selection = ['#7a546f', 95] let g:ram#palette.subtle = ['#353139', 236] diff --git a/autoload/satsuki.vim b/autoload/satsuki.vim index f8febd5..5bbac4a 100644 --- a/autoload/satsuki.vim +++ b/autoload/satsuki.vim @@ -30,7 +30,7 @@ let g:satsuki#palette.color_2 = '#3ab55b' let g:satsuki#palette.color_3 = '#F1FA8C' let g:satsuki#palette.color_4 = '#9B6BDF' let g:satsuki#palette.color_5 = '#E64747' -let g:satsuki#palette.color_6 = '#75D7EC' +let g:satsuki#palette.color_6 = '#27AACA' let g:satsuki#palette.color_7 = '#F8F8F2' let g:satsuki#palette.color_8 = '#6272A4' let g:satsuki#palette.color_9 = '#E356A7' @@ -38,7 +38,7 @@ let g:satsuki#palette.color_10 = '#3ab55b' let g:satsuki#palette.color_11 = '#db974d' let g:satsuki#palette.color_12 = '#9B6BDF' let g:satsuki#palette.color_13 = '#E64747' -let g:satsuki#palette.color_14 = '#75D7EC' +let g:satsuki#palette.color_14 = '#27AACA' let g:satsuki#palette.color_15 = '#FFFFFF' " }}} diff --git a/autoload/tohsaka_rin.vim b/autoload/tohsaka_rin.vim index d865f65..9eda299 100644 --- a/autoload/tohsaka_rin.vim +++ b/autoload/tohsaka_rin.vim @@ -9,7 +9,7 @@ let g:tohsaka_rin#palette.bg = ['#191718', 234] let g:tohsaka_rin#palette.bgdark = ['#191718', 234] let g:tohsaka_rin#palette.bgdarker = ['#191718', 234] -let g:tohsaka_rin#palette.comment = ['#6272a4', 61] +let g:tohsaka_rin#palette.comment = ['#4c8484', 66] let g:tohsaka_rin#palette.selection = ['#391717', 234] let g:tohsaka_rin#palette.subtle = ['#22191b', 234] diff --git a/autoload/vanilla.vim b/autoload/vanilla.vim new file mode 100644 index 0000000..aac049e --- /dev/null +++ b/autoload/vanilla.vim @@ -0,0 +1,57 @@ +" Palette: + +let g:vanilla#palette = {} +let g:vanilla#palette.fg = ['#cdcdcd', 252] + +let g:vanilla#palette.bglighter = ['#2d2f43', 236] +let g:vanilla#palette.bglight = ['#2d2f43', 236] +let g:vanilla#palette.bg = ['#2d2f43', 236] +let g:vanilla#palette.bgdark = ['#2d2f43', 236] +let g:vanilla#palette.bgdarker = ['#2d2f43', 236] + +let g:vanilla#palette.comment = ['#686a80', 242] +let g:vanilla#palette.selection = ['#374872', 238] +let g:vanilla#palette.subtle = ['#333446', 237] + +let g:vanilla#palette.key_color = ['#6a96e9', 68] +let g:vanilla#palette.class_name = ['#9d8df6', 141] +let g:vanilla#palette.parameter_color = ['#FFB86C', 215] +let g:vanilla#palette.keyword_color = ['#FFD448', 221] +let g:vanilla#palette.constants_color = ['#5ddeda', 80] +let g:vanilla#palette.red = ['#FF5555', 203] +let g:vanilla#palette.string_color = ['#F6E9CB', 224] + +" +" Terminal Colors +" +let g:vanilla#palette.color_0 = '#21222C' +let g:vanilla#palette.color_1 = '#E356A7' +let g:vanilla#palette.color_2 = '#42E66C' +let g:vanilla#palette.color_3 = '#F1FA8C' +let g:vanilla#palette.color_4 = '#9B6BDF' +let g:vanilla#palette.color_5 = '#E64747' +let g:vanilla#palette.color_6 = '#75D7EC' +let g:vanilla#palette.color_7 = '#F8F8F2' +let g:vanilla#palette.color_8 = '#6272A4' +let g:vanilla#palette.color_9 = '#E356A7' +let g:vanilla#palette.color_10 = '#42E66C' +let g:vanilla#palette.color_11 = '#EFA554' +let g:vanilla#palette.color_12 = '#9B6BDF' +let g:vanilla#palette.color_13 = '#E64747' +let g:vanilla#palette.color_14 = '#75D7EC' +let g:vanilla#palette.color_15 = '#FFFFFF' + +" }}} + +" Helper function that takes a variadic list of filetypes as args and returns +" whether or not the execution of the ftplugin should be aborted. +func! vanilla#should_abort(...) + if ! exists('g:colors_name') || g:colors_name !=# 'vanilla' + return 1 + elseif a:0 > 0 && (! exists('b:current_syntax') || index(a:000, b:current_syntax) == -1) + return 1 + endif + return 0 +endfunction + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: diff --git a/buildSrc/assets/themes/nekoPara/chocola/dark/chocola.dark.vim.definition.json b/buildSrc/assets/themes/nekoPara/chocola/dark/chocola.dark.vim.definition.json new file mode 100644 index 0000000..7f72546 --- /dev/null +++ b/buildSrc/assets/themes/nekoPara/chocola/dark/chocola.dark.vim.definition.json @@ -0,0 +1,7 @@ +{ + "id": "93035c21-9eb7-4b0e-92d0-35d66d16c8e0", + "overrides": {}, + "laf": {}, + "syntax": {}, + "colors": {} +} \ No newline at end of file diff --git a/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vim.definition.json b/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vim.definition.json new file mode 100644 index 0000000..498724a --- /dev/null +++ b/buildSrc/assets/themes/nekoPara/coconut/dark/coconut.dark.vim.definition.json @@ -0,0 +1,7 @@ +{ + "id": "432fdab1-b8fa-412e-8cca-1844f18a1a43", + "overrides": {}, + "laf": {}, + "syntax": {}, + "colors": {} +} \ No newline at end of file diff --git a/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vim.definition.json b/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vim.definition.json new file mode 100644 index 0000000..6752c0d --- /dev/null +++ b/buildSrc/assets/themes/nekoPara/vanilla/dark/vanilla.dark.vim.definition.json @@ -0,0 +1,7 @@ +{ + "id": "31d5574d-f56b-408f-81dc-9d44feeb62c2", + "overrides": {}, + "laf": {}, + "syntax": {}, + "colors": {} +} \ No newline at end of file diff --git a/buildSrc/package.json b/buildSrc/package.json index fd33c7f..2474394 100644 --- a/buildSrc/package.json +++ b/buildSrc/package.json @@ -12,7 +12,7 @@ "@types/jest": "^26.0.0", "@types/lodash": "^4.14.155", "copy-webpack-plugin": "^6.0.2", - "doki-build-source": "1.3.0", + "doki-build-source": "1.4.0", "jest": "^26.0.1", "rimraf": "^3.0.2", "ts-jest": "^26.1.0", diff --git a/buildSrc/yarn.lock b/buildSrc/yarn.lock index 6722330..6c0138a 100644 --- a/buildSrc/yarn.lock +++ b/buildSrc/yarn.lock @@ -1841,10 +1841,10 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -doki-build-source@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-1.3.0.tgz#b7516a96317ff559737f6e87fc81b931bbb1977c" - integrity sha512-3Z+BMS0p/FGOlCwuhBauAYeV+DXAF+5HdkMCVSYCYZkbLsqfsymnBM7Unw+vbrHJfI14P0gDuOTbgKOHX9V4Gw== +doki-build-source@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-1.4.0.tgz#93121324c155b8e755415503b72f007828817b2a" + integrity sha512-Mt11nNgcE0qSqRX4IysOH9U+G/MEjMLp/TX+x3xZJakAWcOOABIH/911bdgj7+buZoPIbzXsBdky5nnCdSHsYg== domain-browser@^1.1.1: version "1.2.0" diff --git a/colors/chocola.vim b/colors/chocola.vim new file mode 100644 index 0000000..a24c31d --- /dev/null +++ b/colors/chocola.vim @@ -0,0 +1,300 @@ +" Configuration: + +if v:version > 580 + highlight clear + if exists('syntax_on') + syntax reset + endif +endif + +let g:colors_name = 'chocola' + +if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256 + finish +endif + +" Palette: + +let s:fg = g:chocola#palette.fg + +let s:bglighter = g:chocola#palette.bglighter +let s:bglight = g:chocola#palette.bglight +let s:bg = g:chocola#palette.bg +let s:bgdark = g:chocola#palette.bgdark +let s:bgdarker = g:chocola#palette.bgdarker + +let s:comment = g:chocola#palette.comment +let s:selection = g:chocola#palette.selection +let s:subtle = g:chocola#palette.subtle + +let s:key_color = g:chocola#palette.key_color +let s:class_name = g:chocola#palette.class_name +let s:parameter_color = g:chocola#palette.parameter_color +let s:keyword_color = g:chocola#palette.keyword_color +let s:constants_color = g:chocola#palette.constants_color +let s:red = g:chocola#palette.red +let s:string_color = g:chocola#palette.string_color + +let s:none = ['NONE', 'NONE'] + +if has('nvim') + for s:i in range(16) + let g:terminal_color_{s:i} = g:chocola#palette['color_' . s:i] + endfor +endif + +if has('terminal') + let g:terminal_ansi_colors = [] + for s:i in range(16) + call add(g:terminal_ansi_colors, g:chocola#palette['color_' . s:i]) + endfor +endif + +" }}}2 +" User Configuration: + +if !exists('g:chocola_bold') + let g:chocola_bold = 1 +endif + +if !exists('g:chocola_italic') + let g:chocola_italic = 1 +endif + +if !exists('g:chocola_underline') + let g:chocola_underline = 1 +endif + +if !exists('g:chocola_undercurl') && g:chocola_underline != 0 + let g:chocola_undercurl = 1 +endif + +if !exists('g:chocola_inverse') + let g:chocola_inverse = 1 +endif + +if !exists('g:chocola_colorterm') + let g:chocola_colorterm = 1 +endif + +"}}}2 +" Script Helpers: + +let s:attrs = { + \ 'bold': g:chocola_bold == 1 ? 'bold' : 0, + \ 'italic': g:chocola_italic == 1 ? 'italic' : 0, + \ 'underline': g:chocola_underline == 1 ? 'underline' : 0, + \ 'undercurl': g:chocola_undercurl == 1 ? 'undercurl' : 0, + \ 'inverse': g:chocola_inverse == 1 ? 'inverse' : 0, + \} + +function! s:h(scope, fg, ...) " bg, attr_list, special + let l:fg = copy(a:fg) + let l:bg = get(a:, 1, ['NONE', 'NONE']) + + let l:attr_list = filter(get(a:, 2, ['NONE']), 'type(v:val) == 1') + let l:attrs = len(l:attr_list) > 0 ? join(l:attr_list, ',') : 'NONE' + + " Falls back to coloring foreground group on terminals because + " nearly all do not support undercurl + let l:special = get(a:, 3, ['NONE', 'NONE']) + if l:special[0] !=# 'NONE' && l:fg[0] ==# 'NONE' && !has('gui_running') + let l:fg[0] = l:special[0] + let l:fg[1] = l:special[1] + endif + + let l:hl_string = [ + \ 'highlight', a:scope, + \ 'guifg=' . l:fg[0], 'ctermfg=' . l:fg[1], + \ 'guibg=' . l:bg[0], 'ctermbg=' . l:bg[1], + \ 'gui=' . l:attrs, 'cterm=' . l:attrs, + \ 'guisp=' . l:special[0], + \] + + execute join(l:hl_string, ' ') +endfunction + +"}}}2 +"Highlight Groups: + +call s:h('ChocolaBgLight', s:none, s:bglight) +call s:h('ChocolaBgLighter', s:none, s:bglighter) +call s:h('ChocolaBgDark', s:none, s:bgdark) +call s:h('ChocolaBgDarker', s:none, s:bgdarker) + +call s:h('ChocolaFg', s:fg) +call s:h('ChocolaFgUnderline', s:fg, s:none, [s:attrs.underline]) +call s:h('ChocolaFgBold', s:fg, s:none, [s:attrs.bold]) + +call s:h('ChocolaComment', s:comment) +call s:h('ChocolaCommentBold', s:comment, s:none, [s:attrs.bold]) + +call s:h('ChocolaSelection', s:none, s:selection) + +call s:h('ChocolaSubtle', s:subtle) + +call s:h('ChocolaKeyColor', s:key_color) +call s:h('ChocolaKeyColorItalic', s:key_color, s:none, [s:attrs.italic]) + +call s:h('ChocolaClassName', s:class_name) +call s:h('ChocolaClassNameBold', s:class_name, s:none, [s:attrs.bold]) +call s:h('ChocolaClassNameItalic', s:class_name, s:none, [s:attrs.italic]) +call s:h('ChocolaClassNameItalicUnderline', s:class_name, s:none, [s:attrs.italic, s:attrs.underline]) + +call s:h('ChocolaParameter', s:parameter_color) +call s:h('ChocolaParameterBold', s:parameter_color, s:none, [s:attrs.bold]) +call s:h('ChocolaParameterItalic', s:parameter_color, s:none, [s:attrs.italic]) +call s:h('ChocolaParameterBoldItalic', s:parameter_color, s:none, [s:attrs.bold, s:attrs.italic]) +call s:h('ChocolaParameterInverse', s:bg, s:parameter_color) + +call s:h('ChocolaKeyword', s:keyword_color) +call s:h('ChocolaKeywordItalic', s:keyword_color, s:none, [s:attrs.italic]) + +call s:h('ChocolaConstants', s:constants_color) +call s:h('ChocolaConstantsBold', s:constants_color, s:none, [s:attrs.bold]) +call s:h('ChocolaConstantsItalic', s:constants_color, s:none, [s:attrs.italic]) + +call s:h('ChocolaRed', s:red) +call s:h('ChocolaRedInverse', s:fg, s:red) + +call s:h('ChocolaStringColor', s:string_color) +call s:h('ChocolaStringColorItalic', s:string_color, s:none, [s:attrs.italic]) + +call s:h('ChocolaError', s:red, s:none, [], s:red) + +call s:h('ChocolaErrorLine', s:none, s:none, [s:attrs.undercurl], s:red) +call s:h('ChocolaWarnLine', s:none, s:none, [s:attrs.undercurl], s:parameter_color) +call s:h('ChocolaInfoLine', s:none, s:none, [s:attrs.undercurl], s:key_color) + +call s:h('ChocolaTodo', s:key_color, s:none, [s:attrs.bold, s:attrs.inverse]) +call s:h('ChocolaSearch', s:class_name, s:none, [s:attrs.inverse]) +call s:h('ChocolaBoundary', s:comment, s:bgdark) +call s:h('ChocolaLink', s:key_color, s:none, [s:attrs.underline]) + +call s:h('ChocolaDiffChange', s:parameter_color, s:none) +call s:h('ChocolaDiffText', s:bg, s:parameter_color) +call s:h('ChocolaDiffDelete', s:red, s:bgdark) + +" }}}2 + +" }}} +" User Interface: + + +" Required as some plugins will overwrite +" call s:h('Normal', s:fg, g:chocola_colorterm || has('gui_running') ? s:bg : s:none ) +call s:h('StatusLine', s:none, s:bglighter, [s:attrs.bold]) +call s:h('StatusLineNC', s:none, s:bglight) +call s:h('StatusLineTerm', s:none, s:bglighter, [s:attrs.bold]) +call s:h('StatusLineTermNC', s:none, s:bglight) +call s:h('WildMenu', s:bg, s:constants_color, [s:attrs.bold]) +call s:h('CursorLine', s:none, s:subtle) + +" hi! link ColorColumn ChocolaBgDark +hi! link CursorColumn CursorLine +hi! link CursorLineNr ChocolaStringColor +hi! link DiffAdd ChocolaClassName +hi! link DiffAdded DiffAdd +hi! link DiffChange ChocolaDiffChange +hi! link DiffDelete ChocolaDiffDelete +hi! link DiffRemoved DiffDelete +hi! link DiffText ChocolaDiffText +hi! link Directory ChocolaConstantsBold +hi! link ErrorMsg ChocolaRedInverse +hi! link FoldColumn ChocolaSubtle +hi! link Folded ChocolaBoundary +hi! link IncSearch ChocolaParameterInverse +call s:h('LineNr', s:comment) +hi! link MoreMsg ChocolaFgBold +hi! link NonText ChocolaSubtle +" hi! link Pmenu ChocolaBgDark +" hi! link PmenuSbar ChocolaBgDark +hi! link PmenuSel ChocolaSelection +hi! link PmenuThumb ChocolaSelection +hi! link Question ChocolaFgBold +hi! link Search ChocolaSearch +call s:h('SignColumn', s:comment) +hi! link TabLine ChocolaBoundary +" hi! link TabLineFill ChocolaBgDarker +hi! link TabLineSel Normal +hi! link Title ChocolaClassNameBold +hi! link VertSplit ChocolaBoundary +hi! link Visual ChocolaSelection +hi! link VisualNOS Visual +hi! link WarningMsg ChocolaParameterInverse + +" }}} +" Syntax: + +" Required as some plugins will overwrite +call s:h('MatchParen', s:class_name, s:none, [s:attrs.underline]) +call s:h('Conceal', s:key_color, s:none) + +" Neovim uses SpecialKey for escape characters only. Vim uses it for that, plus whitespace. +if has('nvim') + hi! link SpecialKey ChocolaRed + hi! link LspDiagnosticsUnderline ChocolaFgUnderline + hi! link LspDiagnosticsInformation ChocolaKeyColor + hi! link LspDiagnosticsHint ChocolaKeyColor + hi! link LspDiagnosticsError ChocolaError + hi! link LspDiagnosticsWarning ChocolaParameter + hi! link LspDiagnosticsUnderlineError ChocolaErrorLine + hi! link LspDiagnosticsUnderlineHint ChocolaInfoLine + hi! link LspDiagnosticsUnderlineInformation ChocolaInfoLine + hi! link LspDiagnosticsUnderlineWarning ChocolaWarnLine +else + hi! link SpecialKey ChocolaSubtle +endif + +hi! link Comment ChocolaComment +hi! link Underlined ChocolaFgUnderline +hi! link Todo ChocolaTodo + +hi! link Error ChocolaError +hi! link SpellBad ChocolaErrorLine +hi! link SpellLocal ChocolaWarnLine +hi! link SpellCap ChocolaInfoLine +hi! link SpellRare ChocolaInfoLine + +hi! link Constant ChocolaConstants +hi! link String ChocolaStringColor +hi! link Character ChocolaKeyword +hi! link Number Constant +hi! link Boolean Constant +hi! link Float Constant + +hi! link Identifier ChocolaFg +hi! link Function ChocolaClassName + +hi! link Statement ChocolaKeyword +hi! link Conditional ChocolaKeyword +hi! link Repeat ChocolaKeyword +hi! link Label ChocolaKeyword +hi! link Operator ChocolaKeyword +hi! link Keyword ChocolaKeyword +hi! link Exception ChocolaKeyword + +hi! link PreProc ChocolaKeyword +hi! link Include ChocolaKeyword +hi! link Define ChocolaKeyword +hi! link Macro ChocolaKeyword +hi! link PreCondit ChocolaKeyword +hi! link StorageClass ChocolaKeyword +hi! link Structure ChocolaKeyword +hi! link Typedef ChocolaKeyword + +hi! link Type ChocolaKeyColorItalic + +hi! link Delimiter ChocolaFg + +hi! link Special ChocolaKeyword +hi! link SpecialComment ChocolaKeyColorItalic +hi! link Tag ChocolaKeyColor +hi! link helpHyperTextJump ChocolaLink +hi! link helpCommand ChocolaConstants +hi! link helpExample ChocolaClassName +hi! link helpBacktick Special + +"}}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0 et: diff --git a/colors/coconut.vim b/colors/coconut.vim new file mode 100644 index 0000000..e319ef4 --- /dev/null +++ b/colors/coconut.vim @@ -0,0 +1,300 @@ +" Configuration: + +if v:version > 580 + highlight clear + if exists('syntax_on') + syntax reset + endif +endif + +let g:colors_name = 'coconut' + +if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256 + finish +endif + +" Palette: + +let s:fg = g:coconut#palette.fg + +let s:bglighter = g:coconut#palette.bglighter +let s:bglight = g:coconut#palette.bglight +let s:bg = g:coconut#palette.bg +let s:bgdark = g:coconut#palette.bgdark +let s:bgdarker = g:coconut#palette.bgdarker + +let s:comment = g:coconut#palette.comment +let s:selection = g:coconut#palette.selection +let s:subtle = g:coconut#palette.subtle + +let s:key_color = g:coconut#palette.key_color +let s:class_name = g:coconut#palette.class_name +let s:parameter_color = g:coconut#palette.parameter_color +let s:keyword_color = g:coconut#palette.keyword_color +let s:constants_color = g:coconut#palette.constants_color +let s:red = g:coconut#palette.red +let s:string_color = g:coconut#palette.string_color + +let s:none = ['NONE', 'NONE'] + +if has('nvim') + for s:i in range(16) + let g:terminal_color_{s:i} = g:coconut#palette['color_' . s:i] + endfor +endif + +if has('terminal') + let g:terminal_ansi_colors = [] + for s:i in range(16) + call add(g:terminal_ansi_colors, g:coconut#palette['color_' . s:i]) + endfor +endif + +" }}}2 +" User Configuration: + +if !exists('g:coconut_bold') + let g:coconut_bold = 1 +endif + +if !exists('g:coconut_italic') + let g:coconut_italic = 1 +endif + +if !exists('g:coconut_underline') + let g:coconut_underline = 1 +endif + +if !exists('g:coconut_undercurl') && g:coconut_underline != 0 + let g:coconut_undercurl = 1 +endif + +if !exists('g:coconut_inverse') + let g:coconut_inverse = 1 +endif + +if !exists('g:coconut_colorterm') + let g:coconut_colorterm = 1 +endif + +"}}}2 +" Script Helpers: + +let s:attrs = { + \ 'bold': g:coconut_bold == 1 ? 'bold' : 0, + \ 'italic': g:coconut_italic == 1 ? 'italic' : 0, + \ 'underline': g:coconut_underline == 1 ? 'underline' : 0, + \ 'undercurl': g:coconut_undercurl == 1 ? 'undercurl' : 0, + \ 'inverse': g:coconut_inverse == 1 ? 'inverse' : 0, + \} + +function! s:h(scope, fg, ...) " bg, attr_list, special + let l:fg = copy(a:fg) + let l:bg = get(a:, 1, ['NONE', 'NONE']) + + let l:attr_list = filter(get(a:, 2, ['NONE']), 'type(v:val) == 1') + let l:attrs = len(l:attr_list) > 0 ? join(l:attr_list, ',') : 'NONE' + + " Falls back to coloring foreground group on terminals because + " nearly all do not support undercurl + let l:special = get(a:, 3, ['NONE', 'NONE']) + if l:special[0] !=# 'NONE' && l:fg[0] ==# 'NONE' && !has('gui_running') + let l:fg[0] = l:special[0] + let l:fg[1] = l:special[1] + endif + + let l:hl_string = [ + \ 'highlight', a:scope, + \ 'guifg=' . l:fg[0], 'ctermfg=' . l:fg[1], + \ 'guibg=' . l:bg[0], 'ctermbg=' . l:bg[1], + \ 'gui=' . l:attrs, 'cterm=' . l:attrs, + \ 'guisp=' . l:special[0], + \] + + execute join(l:hl_string, ' ') +endfunction + +"}}}2 +"Highlight Groups: + +call s:h('CoconutBgLight', s:none, s:bglight) +call s:h('CoconutBgLighter', s:none, s:bglighter) +call s:h('CoconutBgDark', s:none, s:bgdark) +call s:h('CoconutBgDarker', s:none, s:bgdarker) + +call s:h('CoconutFg', s:fg) +call s:h('CoconutFgUnderline', s:fg, s:none, [s:attrs.underline]) +call s:h('CoconutFgBold', s:fg, s:none, [s:attrs.bold]) + +call s:h('CoconutComment', s:comment) +call s:h('CoconutCommentBold', s:comment, s:none, [s:attrs.bold]) + +call s:h('CoconutSelection', s:none, s:selection) + +call s:h('CoconutSubtle', s:subtle) + +call s:h('CoconutKeyColor', s:key_color) +call s:h('CoconutKeyColorItalic', s:key_color, s:none, [s:attrs.italic]) + +call s:h('CoconutClassName', s:class_name) +call s:h('CoconutClassNameBold', s:class_name, s:none, [s:attrs.bold]) +call s:h('CoconutClassNameItalic', s:class_name, s:none, [s:attrs.italic]) +call s:h('CoconutClassNameItalicUnderline', s:class_name, s:none, [s:attrs.italic, s:attrs.underline]) + +call s:h('CoconutParameter', s:parameter_color) +call s:h('CoconutParameterBold', s:parameter_color, s:none, [s:attrs.bold]) +call s:h('CoconutParameterItalic', s:parameter_color, s:none, [s:attrs.italic]) +call s:h('CoconutParameterBoldItalic', s:parameter_color, s:none, [s:attrs.bold, s:attrs.italic]) +call s:h('CoconutParameterInverse', s:bg, s:parameter_color) + +call s:h('CoconutKeyword', s:keyword_color) +call s:h('CoconutKeywordItalic', s:keyword_color, s:none, [s:attrs.italic]) + +call s:h('CoconutConstants', s:constants_color) +call s:h('CoconutConstantsBold', s:constants_color, s:none, [s:attrs.bold]) +call s:h('CoconutConstantsItalic', s:constants_color, s:none, [s:attrs.italic]) + +call s:h('CoconutRed', s:red) +call s:h('CoconutRedInverse', s:fg, s:red) + +call s:h('CoconutStringColor', s:string_color) +call s:h('CoconutStringColorItalic', s:string_color, s:none, [s:attrs.italic]) + +call s:h('CoconutError', s:red, s:none, [], s:red) + +call s:h('CoconutErrorLine', s:none, s:none, [s:attrs.undercurl], s:red) +call s:h('CoconutWarnLine', s:none, s:none, [s:attrs.undercurl], s:parameter_color) +call s:h('CoconutInfoLine', s:none, s:none, [s:attrs.undercurl], s:key_color) + +call s:h('CoconutTodo', s:key_color, s:none, [s:attrs.bold, s:attrs.inverse]) +call s:h('CoconutSearch', s:class_name, s:none, [s:attrs.inverse]) +call s:h('CoconutBoundary', s:comment, s:bgdark) +call s:h('CoconutLink', s:key_color, s:none, [s:attrs.underline]) + +call s:h('CoconutDiffChange', s:parameter_color, s:none) +call s:h('CoconutDiffText', s:bg, s:parameter_color) +call s:h('CoconutDiffDelete', s:red, s:bgdark) + +" }}}2 + +" }}} +" User Interface: + + +" Required as some plugins will overwrite +" call s:h('Normal', s:fg, g:coconut_colorterm || has('gui_running') ? s:bg : s:none ) +call s:h('StatusLine', s:none, s:bglighter, [s:attrs.bold]) +call s:h('StatusLineNC', s:none, s:bglight) +call s:h('StatusLineTerm', s:none, s:bglighter, [s:attrs.bold]) +call s:h('StatusLineTermNC', s:none, s:bglight) +call s:h('WildMenu', s:bg, s:constants_color, [s:attrs.bold]) +call s:h('CursorLine', s:none, s:subtle) + +" hi! link ColorColumn CoconutBgDark +hi! link CursorColumn CursorLine +hi! link CursorLineNr CoconutStringColor +hi! link DiffAdd CoconutClassName +hi! link DiffAdded DiffAdd +hi! link DiffChange CoconutDiffChange +hi! link DiffDelete CoconutDiffDelete +hi! link DiffRemoved DiffDelete +hi! link DiffText CoconutDiffText +hi! link Directory CoconutConstantsBold +hi! link ErrorMsg CoconutRedInverse +hi! link FoldColumn CoconutSubtle +hi! link Folded CoconutBoundary +hi! link IncSearch CoconutParameterInverse +call s:h('LineNr', s:comment) +hi! link MoreMsg CoconutFgBold +hi! link NonText CoconutSubtle +" hi! link Pmenu CoconutBgDark +" hi! link PmenuSbar CoconutBgDark +hi! link PmenuSel CoconutSelection +hi! link PmenuThumb CoconutSelection +hi! link Question CoconutFgBold +hi! link Search CoconutSearch +call s:h('SignColumn', s:comment) +hi! link TabLine CoconutBoundary +" hi! link TabLineFill CoconutBgDarker +hi! link TabLineSel Normal +hi! link Title CoconutClassNameBold +hi! link VertSplit CoconutBoundary +hi! link Visual CoconutSelection +hi! link VisualNOS Visual +hi! link WarningMsg CoconutParameterInverse + +" }}} +" Syntax: + +" Required as some plugins will overwrite +call s:h('MatchParen', s:class_name, s:none, [s:attrs.underline]) +call s:h('Conceal', s:key_color, s:none) + +" Neovim uses SpecialKey for escape characters only. Vim uses it for that, plus whitespace. +if has('nvim') + hi! link SpecialKey CoconutRed + hi! link LspDiagnosticsUnderline CoconutFgUnderline + hi! link LspDiagnosticsInformation CoconutKeyColor + hi! link LspDiagnosticsHint CoconutKeyColor + hi! link LspDiagnosticsError CoconutError + hi! link LspDiagnosticsWarning CoconutParameter + hi! link LspDiagnosticsUnderlineError CoconutErrorLine + hi! link LspDiagnosticsUnderlineHint CoconutInfoLine + hi! link LspDiagnosticsUnderlineInformation CoconutInfoLine + hi! link LspDiagnosticsUnderlineWarning CoconutWarnLine +else + hi! link SpecialKey CoconutSubtle +endif + +hi! link Comment CoconutComment +hi! link Underlined CoconutFgUnderline +hi! link Todo CoconutTodo + +hi! link Error CoconutError +hi! link SpellBad CoconutErrorLine +hi! link SpellLocal CoconutWarnLine +hi! link SpellCap CoconutInfoLine +hi! link SpellRare CoconutInfoLine + +hi! link Constant CoconutConstants +hi! link String CoconutStringColor +hi! link Character CoconutKeyword +hi! link Number Constant +hi! link Boolean Constant +hi! link Float Constant + +hi! link Identifier CoconutFg +hi! link Function CoconutClassName + +hi! link Statement CoconutKeyword +hi! link Conditional CoconutKeyword +hi! link Repeat CoconutKeyword +hi! link Label CoconutKeyword +hi! link Operator CoconutKeyword +hi! link Keyword CoconutKeyword +hi! link Exception CoconutKeyword + +hi! link PreProc CoconutKeyword +hi! link Include CoconutKeyword +hi! link Define CoconutKeyword +hi! link Macro CoconutKeyword +hi! link PreCondit CoconutKeyword +hi! link StorageClass CoconutKeyword +hi! link Structure CoconutKeyword +hi! link Typedef CoconutKeyword + +hi! link Type CoconutKeyColorItalic + +hi! link Delimiter CoconutFg + +hi! link Special CoconutKeyword +hi! link SpecialComment CoconutKeyColorItalic +hi! link Tag CoconutKeyColor +hi! link helpHyperTextJump CoconutLink +hi! link helpCommand CoconutConstants +hi! link helpExample CoconutClassName +hi! link helpBacktick Special + +"}}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0 et: diff --git a/colors/vanilla.vim b/colors/vanilla.vim new file mode 100644 index 0000000..6a56353 --- /dev/null +++ b/colors/vanilla.vim @@ -0,0 +1,300 @@ +" Configuration: + +if v:version > 580 + highlight clear + if exists('syntax_on') + syntax reset + endif +endif + +let g:colors_name = 'vanilla' + +if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256 + finish +endif + +" Palette: + +let s:fg = g:vanilla#palette.fg + +let s:bglighter = g:vanilla#palette.bglighter +let s:bglight = g:vanilla#palette.bglight +let s:bg = g:vanilla#palette.bg +let s:bgdark = g:vanilla#palette.bgdark +let s:bgdarker = g:vanilla#palette.bgdarker + +let s:comment = g:vanilla#palette.comment +let s:selection = g:vanilla#palette.selection +let s:subtle = g:vanilla#palette.subtle + +let s:key_color = g:vanilla#palette.key_color +let s:class_name = g:vanilla#palette.class_name +let s:parameter_color = g:vanilla#palette.parameter_color +let s:keyword_color = g:vanilla#palette.keyword_color +let s:constants_color = g:vanilla#palette.constants_color +let s:red = g:vanilla#palette.red +let s:string_color = g:vanilla#palette.string_color + +let s:none = ['NONE', 'NONE'] + +if has('nvim') + for s:i in range(16) + let g:terminal_color_{s:i} = g:vanilla#palette['color_' . s:i] + endfor +endif + +if has('terminal') + let g:terminal_ansi_colors = [] + for s:i in range(16) + call add(g:terminal_ansi_colors, g:vanilla#palette['color_' . s:i]) + endfor +endif + +" }}}2 +" User Configuration: + +if !exists('g:vanilla_bold') + let g:vanilla_bold = 1 +endif + +if !exists('g:vanilla_italic') + let g:vanilla_italic = 1 +endif + +if !exists('g:vanilla_underline') + let g:vanilla_underline = 1 +endif + +if !exists('g:vanilla_undercurl') && g:vanilla_underline != 0 + let g:vanilla_undercurl = 1 +endif + +if !exists('g:vanilla_inverse') + let g:vanilla_inverse = 1 +endif + +if !exists('g:vanilla_colorterm') + let g:vanilla_colorterm = 1 +endif + +"}}}2 +" Script Helpers: + +let s:attrs = { + \ 'bold': g:vanilla_bold == 1 ? 'bold' : 0, + \ 'italic': g:vanilla_italic == 1 ? 'italic' : 0, + \ 'underline': g:vanilla_underline == 1 ? 'underline' : 0, + \ 'undercurl': g:vanilla_undercurl == 1 ? 'undercurl' : 0, + \ 'inverse': g:vanilla_inverse == 1 ? 'inverse' : 0, + \} + +function! s:h(scope, fg, ...) " bg, attr_list, special + let l:fg = copy(a:fg) + let l:bg = get(a:, 1, ['NONE', 'NONE']) + + let l:attr_list = filter(get(a:, 2, ['NONE']), 'type(v:val) == 1') + let l:attrs = len(l:attr_list) > 0 ? join(l:attr_list, ',') : 'NONE' + + " Falls back to coloring foreground group on terminals because + " nearly all do not support undercurl + let l:special = get(a:, 3, ['NONE', 'NONE']) + if l:special[0] !=# 'NONE' && l:fg[0] ==# 'NONE' && !has('gui_running') + let l:fg[0] = l:special[0] + let l:fg[1] = l:special[1] + endif + + let l:hl_string = [ + \ 'highlight', a:scope, + \ 'guifg=' . l:fg[0], 'ctermfg=' . l:fg[1], + \ 'guibg=' . l:bg[0], 'ctermbg=' . l:bg[1], + \ 'gui=' . l:attrs, 'cterm=' . l:attrs, + \ 'guisp=' . l:special[0], + \] + + execute join(l:hl_string, ' ') +endfunction + +"}}}2 +"Highlight Groups: + +call s:h('VanillaBgLight', s:none, s:bglight) +call s:h('VanillaBgLighter', s:none, s:bglighter) +call s:h('VanillaBgDark', s:none, s:bgdark) +call s:h('VanillaBgDarker', s:none, s:bgdarker) + +call s:h('VanillaFg', s:fg) +call s:h('VanillaFgUnderline', s:fg, s:none, [s:attrs.underline]) +call s:h('VanillaFgBold', s:fg, s:none, [s:attrs.bold]) + +call s:h('VanillaComment', s:comment) +call s:h('VanillaCommentBold', s:comment, s:none, [s:attrs.bold]) + +call s:h('VanillaSelection', s:none, s:selection) + +call s:h('VanillaSubtle', s:subtle) + +call s:h('VanillaKeyColor', s:key_color) +call s:h('VanillaKeyColorItalic', s:key_color, s:none, [s:attrs.italic]) + +call s:h('VanillaClassName', s:class_name) +call s:h('VanillaClassNameBold', s:class_name, s:none, [s:attrs.bold]) +call s:h('VanillaClassNameItalic', s:class_name, s:none, [s:attrs.italic]) +call s:h('VanillaClassNameItalicUnderline', s:class_name, s:none, [s:attrs.italic, s:attrs.underline]) + +call s:h('VanillaParameter', s:parameter_color) +call s:h('VanillaParameterBold', s:parameter_color, s:none, [s:attrs.bold]) +call s:h('VanillaParameterItalic', s:parameter_color, s:none, [s:attrs.italic]) +call s:h('VanillaParameterBoldItalic', s:parameter_color, s:none, [s:attrs.bold, s:attrs.italic]) +call s:h('VanillaParameterInverse', s:bg, s:parameter_color) + +call s:h('VanillaKeyword', s:keyword_color) +call s:h('VanillaKeywordItalic', s:keyword_color, s:none, [s:attrs.italic]) + +call s:h('VanillaConstants', s:constants_color) +call s:h('VanillaConstantsBold', s:constants_color, s:none, [s:attrs.bold]) +call s:h('VanillaConstantsItalic', s:constants_color, s:none, [s:attrs.italic]) + +call s:h('VanillaRed', s:red) +call s:h('VanillaRedInverse', s:fg, s:red) + +call s:h('VanillaStringColor', s:string_color) +call s:h('VanillaStringColorItalic', s:string_color, s:none, [s:attrs.italic]) + +call s:h('VanillaError', s:red, s:none, [], s:red) + +call s:h('VanillaErrorLine', s:none, s:none, [s:attrs.undercurl], s:red) +call s:h('VanillaWarnLine', s:none, s:none, [s:attrs.undercurl], s:parameter_color) +call s:h('VanillaInfoLine', s:none, s:none, [s:attrs.undercurl], s:key_color) + +call s:h('VanillaTodo', s:key_color, s:none, [s:attrs.bold, s:attrs.inverse]) +call s:h('VanillaSearch', s:class_name, s:none, [s:attrs.inverse]) +call s:h('VanillaBoundary', s:comment, s:bgdark) +call s:h('VanillaLink', s:key_color, s:none, [s:attrs.underline]) + +call s:h('VanillaDiffChange', s:parameter_color, s:none) +call s:h('VanillaDiffText', s:bg, s:parameter_color) +call s:h('VanillaDiffDelete', s:red, s:bgdark) + +" }}}2 + +" }}} +" User Interface: + + +" Required as some plugins will overwrite +" call s:h('Normal', s:fg, g:vanilla_colorterm || has('gui_running') ? s:bg : s:none ) +call s:h('StatusLine', s:none, s:bglighter, [s:attrs.bold]) +call s:h('StatusLineNC', s:none, s:bglight) +call s:h('StatusLineTerm', s:none, s:bglighter, [s:attrs.bold]) +call s:h('StatusLineTermNC', s:none, s:bglight) +call s:h('WildMenu', s:bg, s:constants_color, [s:attrs.bold]) +call s:h('CursorLine', s:none, s:subtle) + +" hi! link ColorColumn VanillaBgDark +hi! link CursorColumn CursorLine +hi! link CursorLineNr VanillaStringColor +hi! link DiffAdd VanillaClassName +hi! link DiffAdded DiffAdd +hi! link DiffChange VanillaDiffChange +hi! link DiffDelete VanillaDiffDelete +hi! link DiffRemoved DiffDelete +hi! link DiffText VanillaDiffText +hi! link Directory VanillaConstantsBold +hi! link ErrorMsg VanillaRedInverse +hi! link FoldColumn VanillaSubtle +hi! link Folded VanillaBoundary +hi! link IncSearch VanillaParameterInverse +call s:h('LineNr', s:comment) +hi! link MoreMsg VanillaFgBold +hi! link NonText VanillaSubtle +" hi! link Pmenu VanillaBgDark +" hi! link PmenuSbar VanillaBgDark +hi! link PmenuSel VanillaSelection +hi! link PmenuThumb VanillaSelection +hi! link Question VanillaFgBold +hi! link Search VanillaSearch +call s:h('SignColumn', s:comment) +hi! link TabLine VanillaBoundary +" hi! link TabLineFill VanillaBgDarker +hi! link TabLineSel Normal +hi! link Title VanillaClassNameBold +hi! link VertSplit VanillaBoundary +hi! link Visual VanillaSelection +hi! link VisualNOS Visual +hi! link WarningMsg VanillaParameterInverse + +" }}} +" Syntax: + +" Required as some plugins will overwrite +call s:h('MatchParen', s:class_name, s:none, [s:attrs.underline]) +call s:h('Conceal', s:key_color, s:none) + +" Neovim uses SpecialKey for escape characters only. Vim uses it for that, plus whitespace. +if has('nvim') + hi! link SpecialKey VanillaRed + hi! link LspDiagnosticsUnderline VanillaFgUnderline + hi! link LspDiagnosticsInformation VanillaKeyColor + hi! link LspDiagnosticsHint VanillaKeyColor + hi! link LspDiagnosticsError VanillaError + hi! link LspDiagnosticsWarning VanillaParameter + hi! link LspDiagnosticsUnderlineError VanillaErrorLine + hi! link LspDiagnosticsUnderlineHint VanillaInfoLine + hi! link LspDiagnosticsUnderlineInformation VanillaInfoLine + hi! link LspDiagnosticsUnderlineWarning VanillaWarnLine +else + hi! link SpecialKey VanillaSubtle +endif + +hi! link Comment VanillaComment +hi! link Underlined VanillaFgUnderline +hi! link Todo VanillaTodo + +hi! link Error VanillaError +hi! link SpellBad VanillaErrorLine +hi! link SpellLocal VanillaWarnLine +hi! link SpellCap VanillaInfoLine +hi! link SpellRare VanillaInfoLine + +hi! link Constant VanillaConstants +hi! link String VanillaStringColor +hi! link Character VanillaKeyword +hi! link Number Constant +hi! link Boolean Constant +hi! link Float Constant + +hi! link Identifier VanillaFg +hi! link Function VanillaClassName + +hi! link Statement VanillaKeyword +hi! link Conditional VanillaKeyword +hi! link Repeat VanillaKeyword +hi! link Label VanillaKeyword +hi! link Operator VanillaKeyword +hi! link Keyword VanillaKeyword +hi! link Exception VanillaKeyword + +hi! link PreProc VanillaKeyword +hi! link Include VanillaKeyword +hi! link Define VanillaKeyword +hi! link Macro VanillaKeyword +hi! link PreCondit VanillaKeyword +hi! link StorageClass VanillaKeyword +hi! link Structure VanillaKeyword +hi! link Typedef VanillaKeyword + +hi! link Type VanillaKeyColorItalic + +hi! link Delimiter VanillaFg + +hi! link Special VanillaKeyword +hi! link SpecialComment VanillaKeyColorItalic +hi! link Tag VanillaKeyColor +hi! link helpHyperTextJump VanillaLink +hi! link helpCommand VanillaConstants +hi! link helpExample VanillaClassName +hi! link helpBacktick Special + +"}}} + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0 et: diff --git a/package.json b/package.json index 3c43e68..56d7fee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doki-theme-vim", - "version": "9.0.0", + "version": "10.0.0", "description": "Complementary vim color scheme for your full Otaku cli experience. Works well with the Doki Theme for Hyper.js", "main": "index.js", "repository": "git@github.com:/doki-theme/doki-theme-vim.git",