diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rwxr-xr-x | build | 1 | ||||
| -rw-r--r-- | ftdetect/polyglot.vim | 7 | ||||
| -rw-r--r-- | syntax/jasmine.vim | 88 | ||||
| -rw-r--r-- | syntax/terraform.vim | 4 |
5 files changed, 3 insertions, 100 deletions
@@ -10,7 +10,7 @@ A collection of language packs for Vim. > One to rule them all, one to find them, one to bring them all and in the darkness bind them. - It **won't affect your startup time**, as scripts are loaded only on demand\*. -- It **installs and updates 120+ times faster** than the <!--Package Count-->147<!--/Package Count--> packages it consists of. +- It **installs and updates 120+ times faster** than the <!--Package Count-->146<!--/Package Count--> packages it consists of. - Solid syntax and indentation support (other features skipped). Only the best language packs. - All unnecessary files are ignored (like enormous documentation from php support). - No support for esoteric languages, only most popular ones (modern too, like `slim`). @@ -101,7 +101,6 @@ If you need full functionality of any plugin, please use it directly with your p - [i3](https://github.com/mboughaba/i3config.vim) (syntax, ftplugin) - [idris](https://github.com/idris-hackers/idris-vim) (syntax, indent, ftplugin) - [ion](https://github.com/vmchale/ion-vim) (syntax, ftplugin) -- [jasmine](https://github.com/glanotte/vim-jasmine) (syntax) - [javascript](https://github.com/pangloss/vim-javascript) (syntax, indent, compiler, ftplugin, extras) - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (syntax, indent) - [jinja](https://github.com/lepture/vim-jinja) (syntax, indent) @@ -219,7 +219,6 @@ PACKS=" i3:mboughaba/i3config.vim idris:idris-hackers/idris-vim ion:vmchale/ion-vim - jasmine:glanotte/vim-jasmine javascript:pangloss/vim-javascript:_JAVASCRIPT jenkins:martinda/Jenkinsfile-vim-syntax jinja:lepture/vim-jinja diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index d896692b..2069098a 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -660,13 +660,6 @@ autocmd BufNewFile,BufRead,StdinReadPost * augroup end endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jasmine') == -1 - augroup filetypedetect - " jasmine, from jasmine.vim in glanotte/vim-jasmine -autocmd BufNewFile,BufRead *Spec.js,*_spec.js set filetype=jasmine.javascript syntax=jasmine - augroup end -endif - if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1 augroup filetypedetect " javascript, from flow.vim in pangloss/vim-javascript:_JAVASCRIPT diff --git a/syntax/jasmine.vim b/syntax/jasmine.vim deleted file mode 100644 index 24a299ed..00000000 --- a/syntax/jasmine.vim +++ /dev/null @@ -1,88 +0,0 @@ -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jasmine') == -1 - -" Syntax highlighting for jasmine specs (used by http://github.com/thomd/vim-jasmine). - -" if b:current_syntax is defined, some other syntax files, earlier in 'runtimepath' was already loaded -if exists("b:current_syntax") - finish -endif - -" match the case of syntax elements -syntax case match - -" keywords -syntax keyword jasmineSuite describe it beforeEach afterEach beforeAll afterAll -syntax keyword jasmine jasmine - -" special -syntax match jasmineSpecial /\.Ajax/ -syntax match jasmineSpecial /\.addMatcher/ -syntax match jasmineSpecial /\.getEnv/ -syntax match jasmineSpecial /\.loadConfigFile/ -syntax match jasmineSpecial /\.onComplete/ -syntax match jasmineSpecial /\.QueryString/ -syntax match jasmineSpecial /\.HtmlSpecFilter/ -syntax match jasmineSpecial /\.addCustomEqualityTester/ -syntax match jasmineSpecial /\.configureDefaultReporter/ -syntax match jasmineSpecial /\.execute/ - -" clock -syntax match jasmineClock /\.Timer/ -syntax match jasmineClock /\.clock/ -syntax match jasmineClock /\.tick/ -syntax match jasmineClock /\.mockDate/ - -" disabled -syntax keyword jasmineDisabled xdescribe xit - -" focused -syntax keyword jasmineFocused fdescribe fit - -" expectation -syntax keyword jasmineExpectation expect - -" not -syntax region jasmineNot start=/not/ end=/\.to/me=s-1 - -" matchers -syntax match jasmineMatcher /\.to\h\+/ -syntax match jasmineMatcher /\.objectContaining/ -syntax match jasmineMatcher /\.arrayContaining/ -syntax match jasmineMatcher /\.anything/ -syntax match jasmineMatcher /\.any/ -syntax keyword jasmineSpy spyOn -syntax match jasmineSpy /\.createSpy/ -syntax match jasmineSpyMatcher /and\h\+/ - -" jasmine is a subset of the javascript language, thus we need to activate -" javascript syntax highlighting and add new jasmin group names to the -" JavaScriptAll cluster which is defined there -runtime! syntax/javascript.vim -syntax cluster JavaScriptAll add= - \ jasmine, - \ jasmineClock, - \ jasmineDisabled, - \ jasmineFocused, - \ jasmineExpectation, - \ jasmineMatcher, - \ jasmineNot, - \ jasmineSpecial, - \ jasmineSpy, - \ jasmineSpyMatcher, - \ jasmineSuite - -let b:current_syntax = "jasmine" - -hi def link jasmine Special -hi def link jasmineClock Special -hi def link jasmineDisabled Error -hi def link jasmineFocused Special -hi def link jasmineExpectation Statement -hi def link jasmineMatcher Statement -hi def link jasmineNot Special -hi def link jasmineSpecial Special -hi def link jasmineSpy Special -hi def link jasmineSpyMatcher Statement -hi def link jasmineSuite Statement - -endif diff --git a/syntax/terraform.vim b/syntax/terraform.vim index d72c7857..70e948af 100644 --- a/syntax/terraform.vim +++ b/syntax/terraform.vim @@ -5451,8 +5451,8 @@ syn region terraValueString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=terraS syn region terraStringInterp matchgroup=terraBraces start=/\${/ end=/}/ contained contains=ALL syn region terraHereDocText start=/<<-\?\z([a-z0-9A-Z]\+\)/ end=/^\s*\z1/ contains=terraStringInterp -"" TODO match keywords here, not a-z+ -syn match terraValueFunction "[a-z]\+(\@=" +"" Functions. +syn match terraValueFunction "[a-z0-9]\+(\@=" """ HCL2 syn keyword terraContent content |