From 4aa47ba39df6fb505e8e5ec10ec0bd96ffc585a9 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 3 Apr 2015 01:32:08 -0700 Subject: [PATCH] more refactoring this dumb theme --- vim/colors/Tomorrow-Night.vim | 493 ++++++++++++++++++---------------- 1 file changed, 255 insertions(+), 238 deletions(-) diff --git a/vim/colors/Tomorrow-Night.vim b/vim/colors/Tomorrow-Night.vim index 79f4f2f..60edf95 100644 --- a/vim/colors/Tomorrow-Night.vim +++ b/vim/colors/Tomorrow-Night.vim @@ -38,250 +38,267 @@ fun X(group, fg, bg, attr) if a:attr != "" | exec "hi " . a:group . " gui=" . a:attr | endif endfun -" Vim Highlighting -call X("Normal", s:foreground, s:background, "") -call X("LineNr", s:selection, "", "") -call X("NonText", s:selection, "", "") -call X("SpecialKey", s:selection, "", "") -call X("Search", s:background, s:yellow, "") -call X("TabLine", s:window, s:foreground, "reverse") -call X("TabLineFill", s:window, s:foreground, "reverse") -call X("StatusLine", s:window, s:yellow, "reverse") -call X("StatusLineNC", s:window, s:foreground, "reverse") -call X("VertSplit", s:window, s:window, "none") -call X("Visual", "", s:selection, "") -call X("Directory", s:blue, "", "") -call X("ModeMsg", s:green, "", "") -call X("MoreMsg", s:green, "", "") -call X("Question", s:green, "", "") -call X("WarningMsg", s:red, "", "") -call X("MatchParen", "", s:selection, "") -call X("Folded", s:comment, s:background, "") -call X("FoldColumn", "", s:background, "") -if version >= 700 - call X("CursorLine", "", s:line, "none") - call X("CursorColumn", "", s:line, "none") - call X("PMenu", s:foreground, s:selection, "none") - call X("PMenuSel", s:foreground, s:selection, "reverse") - call X("SignColumn", "", s:background, "none") -end -if version >= 703 - call X("ColorColumn", "", s:line, "none") -end +"exec 'normal yiw' | exec '%s/'.@0.'$//gn' -" Standard Highlighting -call X("Comment", s:comment, "", "") -call X("Todo", s:comment, s:background, "") -call X("Title", s:comment, "", "") -call X("Identifier", s:red, "", "none") -call X("Statement", s:foreground, "", "") -call X("Conditional", s:foreground, "", "") -call X("Repeat", s:foreground, "", "") -call X("Structure", s:purple, "", "") -call X("Function", s:blue, "", "") -call X("Constant", s:orange, "", "") -call X("Keyword", s:orange, "", "") -call X("String", s:green, "", "") -call X("Special", s:foreground, "", "") -call X("PreProc", s:purple, "", "") -call X("Operator", s:aqua, "", "none") -call X("Type", s:blue, "", "none") -call X("Define", s:purple, "", "none") -call X("Include", s:blue, "", "") -"call X("Ignore", "666666", "", "") +call X("Normal", s:foreground, s:background, "") +call X("_Aqua", s:aqua, "", "") " 3 +call X("_Blue", s:blue, "", "") " 27 +call X("_Comment", s:comment, "", "") " 6 +call X("_Green", s:green, "", "") " 18 +call X("_Orange", s:orange, "", "") " 23 +call X("_Plain", s:foreground, "", "") " 12 +call X("_Purple", s:purple, "", "") " 52 +call X("_Red", s:red, "", "") " 10 +call X("_Selection", s:selection, "", "") " 3 -" Vim Highlighting -call X("vimCommand", s:red, "", "none") +call X("_AquaNone", s:aqua, "", "none") " 1 +call X("_BlueNone", s:blue, "", "none") " 1 +call X("_Bold", "", "", "bold") " 1 +call X("_LineBGNone", "", s:line, "none") " 3 +call X("_RedNone", s:red, "", "none") " 2 +call X("_SelectBG", "", s:selection, "") " 2 +call X("_LineBlue", s:line, s:blue, "") " 1 +call X("_PurpleNone", s:purple, "", "none") " 1 -" C Highlighting -call X("cType", s:yellow, "", "") -call X("cStorageClass", s:purple, "", "") -call X("cConditional", s:purple, "", "") -call X("cRepeat", s:purple, "", "") +call X("_AquaPlainNone", s:aqua, s:background, "none") " 1 +call X("_CommentPlain", s:comment, s:background, "") " 2 +call X("_PlainBG", "", s:background, "") " 1 +call X("_PlainBGNone", "", s:background, "none") " 1 +call X("_RedBGPlain", s:background, s:red, "") " 1 +call X("_YellowPlainNone", s:yellow, s:background, "none") " 1 -" PHP Highlighting -call X("phpVarSelector", s:red, "", "") -call X("phpKeyword", s:purple, "", "") -call X("phpRepeat", s:purple, "", "") -call X("phpConditional", s:purple, "", "") -call X("phpStatement", s:purple, "", "") -call X("phpMemberSelector", s:foreground, "", "") +call X("_OrangePlainNone", s:orange, s:background, "none") " 1 +call X("_PurplePlainNone", s:purple, s:background, "none") " 1 -" Ruby Highlighting -call X("rubySymbol", s:green, "", "") -call X("rubyConstant", s:yellow, "", "") -call X("rubyAccess", s:yellow, "", "") -call X("rubyAttribute", s:blue, "", "") -call X("rubyInclude", s:blue, "", "") -call X("rubyLocalVariableOrMethod", s:orange, "", "") -call X("rubyCurlyBlock", s:orange, "", "") -call X("rubyStringDelimiter", s:green, "", "") -call X("rubyInterpolationDelimiter", s:orange, "", "") -call X("rubyConditional", s:purple, "", "") -call X("rubyRepeat", s:purple, "", "") -call X("rubyControl", s:purple, "", "") -call X("rubyException", s:purple, "", "") +call X("_Search", s:background, s:yellow, "") " 1 +call X("_TabLine", s:window, s:foreground, "reverse") " 3 +call X("_VertSplit", s:window, s:window, "none") " 1 +call X("_StatusLine", s:window, s:yellow, "reverse") " 1 +call X("_PMenu", s:foreground, s:selection, "none") " 1 +call X("_PMenuSel", s:foreground, s:selection, "reverse") " 1 +call X("_diffAdd", "", "4c4e39", "") " 1 +call X("_diffChange", "", "2b5b77", "") " 1 -" Crystal Highlighting -call X("crystalSymbol", s:green, "", "") -call X("crystalConstant", s:yellow, "", "") -call X("crystalAccess", s:yellow, "", "") -call X("crystalAttribute", s:blue, "", "") -call X("crystalInclude", s:blue, "", "") -call X("crystalLocalVariableOrMethod", s:orange, "", "") -call X("crystalCurlyBlock", s:orange, "", "") -call X("crystalStringDelimiter", s:green, "", "") -call X("crystalInterpolationDelimiter", s:orange, "", "") -call X("crystalConditional", s:purple, "", "") -call X("crystalRepeat", s:purple, "", "") -call X("crystalControl", s:purple, "", "") -call X("crystalException", s:purple, "", "") - -" Python Highlighting -call X("pythonInclude", s:purple, "", "") -call X("pythonStatement", s:purple, "", "") -call X("pythonConditional", s:purple, "", "") -call X("pythonRepeat", s:purple, "", "") -call X("pythonException", s:purple, "", "") -call X("pythonFunction", s:blue, "", "") -call X("pythonPreCondit", s:purple, "", "") -call X("pythonRepeat", s:aqua, "", "") -call X("pythonExClass", s:orange, "", "") - -" JavaScript Highlighting -call X("javaScriptBraces", s:foreground, "", "") -call X("javaScriptFunction", s:purple, "", "") -call X("javaScriptConditional", s:purple, "", "") -call X("javaScriptRepeat", s:purple, "", "") -call X("javaScriptNumber", s:orange, "", "") -call X("javaScriptMember", s:orange, "", "") -call X("javascriptNull", s:orange, "", "") -call X("javascriptGlobal", s:blue, "", "") -call X("javascriptStatement", s:red, "", "") - -" CoffeeScript Highlighting -call X("coffeeRepeat", s:purple, "", "") -call X("coffeeConditional", s:purple, "", "") -call X("coffeeKeyword", s:purple, "", "") -call X("coffeeObject", s:yellow, "", "") - -" HTML Highlighting -call X("htmlTag", s:red, "", "") -call X("htmlTagName", s:red, "", "") -call X("htmlArg", s:red, "", "") -call X("htmlScriptTag", s:red, "", "") - -" Diff Highlighting -call X("diffAdd", "", "4c4e39", "") -call X("diffDelete", s:background, s:red, "") -call X("diffChange", "", "2B5B77", "") -call X("diffText", s:line, s:blue, "") - -" ShowMarks Highlighting -call X("ShowMarksHLl", s:orange, s:background, "none") -call X("ShowMarksHLo", s:purple, s:background, "none") -call X("ShowMarksHLu", s:yellow, s:background, "none") -call X("ShowMarksHLm", s:aqua, s:background, "none") - -" Lua Highlighting -call X("luaStatement", s:purple, "", "") -call X("luaRepeat", s:purple, "", "") -call X("luaCondStart", s:purple, "", "") -call X("luaCondElseif", s:purple, "", "") -call X("luaCond", s:purple, "", "") -call X("luaCondEnd", s:purple, "", "") - -" Cucumber Highlighting -call X("cucumberGiven", s:blue, "", "") -call X("cucumberGivenAnd", s:blue, "", "") - -" Go Highlighting -call X("goDirective", s:purple, "", "") -call X("goDeclaration", s:purple, "", "") -call X("goStatement", s:purple, "", "") -call X("goConditional", s:purple, "", "") -call X("goConstants", s:orange, "", "") -call X("goTodo", s:yellow, "", "") -call X("goDeclType", s:blue, "", "") -call X("goBuiltins", s:purple, "", "") -call X("goRepeat", s:purple, "", "") -call X("goLabel", s:purple, "", "") - -" Clojure Highlighting -call X("clojureConstant", s:orange, "", "") -call X("clojureBoolean", s:orange, "", "") -call X("clojureCharacter", s:orange, "", "") -call X("clojureKeyword", s:green, "", "") -call X("clojureNumber", s:orange, "", "") -call X("clojureString", s:green, "", "") -call X("clojureRegexp", s:green, "", "") -call X("clojureParen", s:aqua, "", "") -call X("clojureVariable", s:yellow, "", "") -call X("clojureCond", s:blue, "", "") -call X("clojureDefine", s:purple, "", "") -call X("clojureException", s:red, "", "") -call X("clojureFunc", s:blue, "", "") -call X("clojureMacro", s:blue, "", "") -call X("clojureRepeat", s:blue, "", "") -call X("clojureSpecial", s:purple, "", "") -call X("clojureQuote", s:blue, "", "") -call X("clojureUnquote", s:blue, "", "") -call X("clojureMeta", s:blue, "", "") -call X("clojureDeref", s:blue, "", "") -call X("clojureAnonArg", s:blue, "", "") -call X("clojureRepeat", s:blue, "", "") -call X("clojureDispatch", s:blue, "", "") - -" Scala Highlighting -call X("scalaKeyword", s:purple, "", "") -call X("scalaKeywordModifier", s:purple, "", "") -call X("scalaOperator", s:blue, "", "") -call X("scalaPackage", s:red, "", "") -call X("scalaFqn", s:foreground, "", "") -call X("scalaFqnSet", s:foreground, "", "") -call X("scalaImport", s:purple, "", "") -call X("scalaBoolean", s:orange, "", "") -call X("scalaDef", s:purple, "", "") -call X("scalaVal", s:purple, "", "") -call X("scalaVar", s:aqua, "", "") -call X("scalaClass", s:purple, "", "") -call X("scalaObject", s:purple, "", "") -call X("scalaTrait", s:purple, "", "") -call X("scalaDefName", s:blue, "", "") -call X("scalaValName", s:foreground, "", "") -call X("scalaVarName", s:foreground, "", "") -call X("scalaClassName", s:foreground, "", "") -call X("scalaType", s:yellow, "", "") -call X("scalaTypeSpecializer", s:yellow, "", "") -call X("scalaAnnotation", s:orange, "", "") -call X("scalaNumber", s:orange, "", "") -call X("scalaDefSpecializer", s:yellow, "", "") -call X("scalaClassSpecializer", s:yellow, "", "") -call X("scalaBackTick", s:green, "", "") -call X("scalaRoot", s:foreground, "", "") -call X("scalaMethodCall", s:blue, "", "") -call X("scalaCaseType", s:yellow, "", "") -call X("scalaLineComment", s:comment, "", "") -call X("scalaComment", s:comment, "", "") -call X("scalaDocComment", s:comment, "", "") -call X("scalaDocTags", s:comment, "", "") -call X("scalaEmptyString", s:green, "", "") -call X("scalaMultiLineString", s:green, "", "") -call X("scalaUnicode", s:orange, "", "") -call X("scalaString", s:green, "", "") -call X("scalaStringEscape", s:green, "", "") -call X("scalaSymbol", s:orange, "", "") -call X("scalaChar", s:orange, "", "") -call X("scalaXml", s:green, "", "") -call X("scalaConstructorSpecializer", s:yellow, "", "") -call X("scalaBackTick", s:blue, "", "") - -" Git -call X("diffAdded", s:green, "", "") -call X("diffRemoved", s:red, "", "") -call X("gitcommitSummary", "", "", "bold") - -" Delete Functions delf X +" Vim Highlighting +hi! link ColorColumn _LineBGNone +hi! link CursorColumn _LineBGNone +hi! link Directory _Blue +hi! link FoldColumn _PlainBGNone +hi! link Folded _CommentPlain +hi! link LineNr _Selection +hi! link MatchParen _SelectBG +hi! link ModeMsg _Green +hi! link MoreMsg _Green +hi! link NonText _Selection +hi! link PMenu _PMenu +hi! link PMenuSel _PMenuSel +hi! link Question _Green +hi! link Search _Search +hi! link SignColumn _PlainBG +hi! link SpecialKey _Selection +hi! link StatusLine _StatusLine +hi! link StatusLineNC _TabLine +hi! link TabLine _TabLine +hi! link TabLineFill _TabLine +hi! link VertSplit _VertSplit +hi! link Visual _SelectBG +hi! link WarningMsg _Red + +" Standard Highlighting +hi! link Comment _Comment +hi! link Conditional _Plain +hi! link Constant _Orange +hi! link CursorLine _LineBGNone +hi! link Define _PurpleNone +hi! link Function _Blue +hi! link Identifier _RedNone +hi! link Include _Blue +hi! link Keyword _Orange +hi! link Operator _AquaNone +hi! link PreProc _Purple +hi! link Repeat _Plain +hi! link Special _Plain +hi! link Statement _Plain +hi! link String _Green +hi! link Structure _Purple +hi! link Title _Comment +hi! link Todo _CommentPlain +hi! link Type _BlueNone + +hi link vimCommand _RedNone + +hi link ShowMarksHLl _OrangePlainNone +hi link ShowMarksHLm _AquaPlainNone +hi link ShowMarksHLo _PurplePlainNone +hi link ShowMarksHLu _YellowPlainNone + +hi link cConditional _Purple +hi link cRepeat _Purple +hi link cStorageClass _Purple +hi link cType _Yellow + +hi link clojureAnonArg _Blue +hi link clojureBoolean _Orange +hi link clojureCharacter _Orange +hi link clojureCond _Blue +hi link clojureConstant _Orange +hi link clojureDefine _Purple +hi link clojureDeref _Blue +hi link clojureDispatch _Blue +hi link clojureException _Red +hi link clojureFunc _Blue +hi link clojureKeyword _Green +hi link clojureMacro _Blue +hi link clojureMeta _Blue +hi link clojureNumber _Orange +hi link clojureParen _Aqua +hi link clojureQuote _Blue +hi link clojureRegexp _Green +hi link clojureRepeat _Blue +hi link clojureRepeat _Blue +hi link clojureSpecial _Purple +hi link clojureString _Green +hi link clojureUnquote _Blue +hi link clojureVariable _Yellow + +hi link coffeeConditional _Purple +hi link coffeeKeyword _Purple +hi link coffeeObject _Yellow +hi link coffeeRepeat _Purple + +hi link crystalAccess _Yellow +hi link crystalAttribute _Blue +hi link crystalConditional _Purple +hi link crystalConstant _Yellow +hi link crystalControl _Purple +hi link crystalCurlyBlock _Orange +hi link crystalException _Purple +hi link crystalInclude _Blue +hi link crystalInterpolationDelimiter _Orange +hi link crystalLocalVariableOrMethod _Orange +hi link crystalRepeat _Purple +hi link crystalStringDelimiter _Green +hi link crystalSymbol _Green + +hi link cucumberGiven _Blue +hi link cucumberGivenAnd _Blue + +hi link diffAdd _diffAdd +hi link diffChange _diffChange +hi link diffDelete _RedBGPlain +hi link diffText _LineBlue +hi link diffAdded _Green +hi link diffRemoved _Red + +hi link gitcommitSummary _Bold + +hi link goBuiltins _Purple +hi link goConditional _Purple +hi link goConstants _Orange +hi link goDeclType _Blue +hi link goDeclaration _Purple +hi link goDirective _Purple +hi link goLabel _Purple +hi link goRepeat _Purple +hi link goStatement _Purple +hi link goTodo _Yellow + +hi link htmlArg _Red +hi link htmlScriptTag _Red +hi link htmlTag _Red +hi link htmlTagName _Red + +hi link javaScriptBraces _Plain +hi link javaScriptConditional _Purple +hi link javaScriptFunction _Purple +hi link javaScriptMember _Orange +hi link javaScriptNumber _Orange +hi link javaScriptRepeat _Purple +hi link javascriptGlobal _Blue +hi link javascriptNull _Orange +hi link javascriptStatement _Red + +hi link luaCond _Purple +hi link luaCondElseif _Purple +hi link luaCondEnd _Purple +hi link luaCondStart _Purple +hi link luaRepeat _Purple +hi link luaStatement _Purple + +hi link phpConditional _Purple +hi link phpKeyword _Purple +hi link phpMemberSelector _Plain +hi link phpRepeat _Purple +hi link phpStatement _Purple +hi link phpVarSelector _Red + +hi link pythonConditional _Purple +hi link pythonExClass _Orange +hi link pythonException _Purple +hi link pythonFunction _Blue +hi link pythonInclude _Purple +hi link pythonPreCondit _Purple +hi link pythonRepeat _Aqua +hi link pythonRepeat _Purple +hi link pythonStatement _Purple + +hi link rubyAccess _Yellow +hi link rubyAttribute _Blue +hi link rubyConditional _Purple +hi link rubyConstant _Yellow +hi link rubyControl _Purple +hi link rubyCurlyBlock _Orange +hi link rubyException _Purple +hi link rubyInclude _Blue +hi link rubyInterpolationDelimiter _Orange +hi link rubyLocalVariableOrMethod _Orange +hi link rubyRepeat _Purple +hi link rubyStringDelimiter _Green +hi link rubySymbol _Green + +hi link scalaAnnotation _Orange +hi link scalaBackTick _Blue +hi link scalaBackTick _Green +hi link scalaBoolean _Orange +hi link scalaCaseType _Yellow +hi link scalaChar _Orange +hi link scalaClass _Purple +hi link scalaClassName _Plain +hi link scalaClassSpecializer _Yellow +hi link scalaComment _Comment +hi link scalaConstructorSpecializer _Yellow +hi link scalaDef _Purple +hi link scalaDefName _Blue +hi link scalaDefSpecializer _Yellow +hi link scalaDocComment _Comment +hi link scalaDocTags _Comment +hi link scalaEmptyString _Green +hi link scalaFqn _Plain +hi link scalaFqnSet _Plain +hi link scalaImport _Purple +hi link scalaKeyword _Purple +hi link scalaKeywordModifier _Purple +hi link scalaLineComment _Comment +hi link scalaMethodCall _Blue +hi link scalaMultiLineString _Green +hi link scalaNumber _Orange +hi link scalaObject _Purple +hi link scalaOperator _Blue +hi link scalaPackage _Red +hi link scalaRoot _Plain +hi link scalaString _Green +hi link scalaStringEscape _Green +hi link scalaSymbol _Orange +hi link scalaTrait _Purple +hi link scalaType _Yellow +hi link scalaTypeSpecializer _Yellow +hi link scalaUnicode _Orange +hi link scalaVal _Purple +hi link scalaValName _Plain +hi link scalaVar _Aqua +hi link scalaVarName _Plain +hi link scalaXml _Green + set background=dark