From 7ba913ab99432f1fb55ae46240bfa61bab330f1a Mon Sep 17 00:00:00 2001 From: Michael Robinson Date: Fri, 11 Sep 2020 17:32:56 +1200 Subject: [PATCH] Revert "add scala keywords" --- README.md | 3 +-- autoload/blacklist.vim | 52 ------------------------------------------ 2 files changed, 1 insertion(+), 54 deletions(-) diff --git a/README.md b/README.md index 7327eaf..cbd5c5e 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,6 @@ Current language support with keyword blacklists: * Python * Ruby * Rust -* Scala * TypeScript This can be customized locally by populating `g:semanticBlacklistOverride` like so: @@ -87,7 +86,7 @@ var $someObject = '1231'; var someObject = 1231; ``` -Without the `autocommand` outlined below, only the `someObject` portion of the variable would be semantically highlighted, and highlighted the same colour as the `$`-free variable. To have the preceding `$` included in the semantic highlight, use the following snippet in your vimrc: +Without the `autocommand` outlined below, only thed `someObject` portion of the variable would be semantically highlighted, and highlighted the same colour as the `$`-free variable. To have the preceding `$` included in the semantic highlight, use the following snippet in your vimrc: ``` autocmd FileType javascript setlocal iskeyword+=$ diff --git a/autoload/blacklist.vim b/autoload/blacklist.vim index bd6607c..ba59e52 100644 --- a/autoload/blacklist.vim +++ b/autoload/blacklist.vim @@ -605,58 +605,6 @@ let s:blacklist = { \ 'complex128', \ 'byte', \ ], - \ 'scala': [ - \ 'abstract', - \ 'case', - \ 'catch', - \ 'class', - \ 'def', - \ 'do', - \ 'else', - \ 'extends', - \ 'false', - \ 'final', - \ 'finally', - \ 'for', - \ 'forSome', - \ 'if', - \ 'implicit', - \ 'import', - \ 'lazy', - \ 'macro', - \ 'match', - \ 'new', - \ 'null', - \ 'object', - \ 'override', - \ 'package', - \ 'private', - \ 'protected', - \ 'return', - \ 'sealed', - \ 'super', - \ 'this', - \ 'throw', - \ 'trait', - \ 'try', - \ 'true', - \ 'type', - \ 'val', - \ 'var', - \ 'while', - \ 'with', - \ 'yield', - \ '_', - \ ':', - \ '=', - \ '=>', - \ '<-', - \ '<:', - \ '<%', - \ '>:', - \ '#', - \ '@', - \ ], \ } if (exists('g:semanticBlacklistOverride'))