From 101708d8adb2c7403279a8725bdb9c3bc356d214 Mon Sep 17 00:00:00 2001 From: Josh Dick Date: Tue, 10 May 2016 14:34:57 -0400 Subject: [PATCH] Alphabetize JavaScript highlight groups and remove duplicate `jsThis` --- colors/onedark.vim | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/colors/onedark.vim b/colors/onedark.vim index 96b0b7f..e71f0f8 100644 --- a/colors/onedark.vim +++ b/colors/onedark.vim @@ -218,35 +218,34 @@ call s:h("htmlTagName", { "fg": s:red }) " JavaScript call s:h("javaScriptBraces", { "fg": s:white }) -call s:h("javaScriptIdentifier", { "fg": s:purple }) -call s:h("javaScriptReserved", { "fg": s:purple }) call s:h("javaScriptFunction", { "fg": s:purple }) +call s:h("javaScriptIdentifier", { "fg": s:purple }) call s:h("javaScriptNull", { "fg": s:dark_yellow }) call s:h("javaScriptNumber", { "fg": s:dark_yellow }) call s:h("javaScriptRequire", { "fg": s:cyan }) +call s:h("javaScriptReserved", { "fg": s:purple }) " https://github.com/pangloss/vim-javascript -call s:h("jsStorageClass", { "fg": s:purple }) -call s:h("jsFunction", { "fg": s:purple }) +call s:h("jsArrowFunction", { "fg": s:purple }) call s:h("jsClassKeywords", { "fg": s:purple }) -call s:h("jsThis", { "fg": s:red }) +call s:h("jsFuncCall", { "fg": s:blue }) +call s:h("jsFunction", { "fg": s:purple }) +call s:h("jsGlobalObjects", { "fg": s:yellow }) +call s:h("jsNull", { "fg": s:dark_yellow }) +call s:h("jsOperator", { "fg": s:purple }) +call s:h("jsStorageClass", { "fg": s:purple }) call s:h("jsTemplateBraces", { "fg": s:dark_red }) call s:h("jsTemplateVar", { "fg": s:dark_green }) -call s:h("jsOperator", { "fg": s:purple }) -call s:h("jsUndefined", { "fg": s:dark_yellow }) call s:h("jsThis", { "fg": s:red }) -call s:h("jsArrowFunction", { "fg": s:purple }) -call s:h("jsFuncCall", { "fg": s:blue }) -call s:h("jsNull", { "fg": s:dark_yellow }) -call s:h("jsGlobalObjects", { "fg": s:yellow }) +call s:h("jsUndefined", { "fg": s:dark_yellow }) " https://github.com/othree/yajs.vim +call s:h("javascriptArrowFunc", { "fg": s:purple }) call s:h("javascriptEndColons", { "fg": s:white }) call s:h("javascriptFuncArg", { "fg": s:white }) -call s:h("javascriptObjectLabel", { "fg": s:white }) call s:h("javascriptFuncKeyword", { "fg": s:purple }) -call s:h("javascriptVariable", { "fg": s:purple }) +call s:h("javascriptObjectLabel", { "fg": s:white }) call s:h("javascriptPropertyName", { "fg": s:green }) call s:h("javascriptTemplateSB", { "fg": s:dark_red }) -call s:h("javascriptArrowFunc", { "fg": s:purple }) +call s:h("javascriptVariable", { "fg": s:purple }) " JSON call s:h("jsonKeyword", { "fg": s:red })