From 0244e228faf6ee71750cbca3bdcd18411a927d22 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sun, 11 Sep 2016 13:24:17 +0200 Subject: Update --- README.md | 4 +- after/ftplugin/javascript.vim | 6 +- after/syntax/haml.vim | 10 + after/syntax/html.vim | 9 + compiler/typescript.vim | 4 + extras/flow.vim | 91 ++ extras/jsdoc.vim | 43 + extras/ngdoc.vim | 7 + ftdetect/polyglot.vim | 3 +- ftplugin/perl6.vim | 92 -- ftplugin/plantuml.vim | 26 +- ftplugin/purescript.vim | 5 + ftplugin/ruby.vim | 4 +- ftplugin/rust.vim | 1 - ftplugin/scala.vim | 6 +- indent/eelixir.vim | 19 +- indent/elixir.vim | 255 +++--- indent/eruby.vim | 7 + indent/haskell.vim | 85 +- indent/javascript.vim | 200 ++--- indent/perl6.vim | 131 --- indent/plantuml.vim | 58 ++ indent/ruby.vim | 41 +- indent/scala.vim | 9 +- syntax/coffee.vim | 2 +- syntax/eelixir.vim | 6 + syntax/elixir.vim | 35 +- syntax/gitrebase.vim | 2 +- syntax/go.vim | 46 +- syntax/haskell.vim | 19 +- syntax/perl6.vim | 1967 ----------------------------------------- syntax/plantuml.vim | 23 +- syntax/purescript.vim | 180 +++- syntax/ruby.vim | 9 +- syntax/tmux.vim | 4 +- syntax/typescript.vim | 2 +- 36 files changed, 881 insertions(+), 2530 deletions(-) delete mode 100644 ftplugin/perl6.vim create mode 100644 ftplugin/purescript.vim delete mode 100644 indent/perl6.vim create mode 100644 indent/plantuml.vim delete mode 100644 syntax/perl6.vim diff --git a/README.md b/README.md index 943f3fab..cbc54d2e 100644 --- a/README.md +++ b/README.md @@ -84,12 +84,12 @@ If you need full functionality of any plugin, please use it directly with your p - [perl](https://github.com/vim-perl/vim-perl) (syntax, indent, ftplugin, ftdetect) - [pgsql](https://github.com/exu/pgsql.vim) (syntax, ftdetect) - [php](https://github.com/StanAngeloff/php.vim) (syntax) -- [plantuml](https://github.com/aklt/plantuml-syntax) (syntax, ftplugin, ftdetect) +- [plantuml](https://github.com/aklt/plantuml-syntax) (syntax, indent, ftplugin, ftdetect) - [powershell](https://github.com/Persistent13/vim-ps1) (syntax, indent, ftplugin, ftdetect) - [protobuf](https://github.com/uarun/vim-protobuf) (syntax, indent, ftdetect) - [pug](https://github.com/digitaltoad/vim-pug) (syntax, indent, ftplugin, ftdetect) - [puppet](https://github.com/voxpupuli/vim-puppet) (syntax, indent, ftplugin, ftdetect) -- [purescript](https://github.com/raichoo/purescript-vim) (syntax, indent, ftdetect) +- [purescript](https://github.com/raichoo/purescript-vim) (syntax, indent, ftplugin, ftdetect) - [python](https://github.com/mitsuhiko/vim-python-combined) (syntax, indent) - [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin, ftdetect) - [r-lang](https://github.com/vim-scripts/R.vim) (syntax, ftplugin) diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim index e5324c1b..e9214981 100644 --- a/after/ftplugin/javascript.vim +++ b/after/ftplugin/javascript.vim @@ -7,6 +7,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == setlocal iskeyword+=$ suffixesadd+=.js -let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<' +if exists('b:undo_ftplugin') + let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<' +else + let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<' +endif endif diff --git a/after/syntax/haml.vim b/after/syntax/haml.vim index 5333de69..5128f7e5 100644 --- a/after/syntax/haml.vim +++ b/after/syntax/haml.vim @@ -5,6 +5,11 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') " URL: http://github.com/kchmck/vim-coffee-script " License: WTFPL + +if exists('b:current_syntax') + let s:current_syntax_save = b:current_syntax +endif + " Inherit coffee from html so coffeeComment isn't redefined and given higher " priority than hamlInterpolation. syn cluster hamlCoffeescript contains=@htmlCoffeeScript @@ -14,4 +19,9 @@ syn region hamlCoffeescriptFilter matchgroup=hamlFilter \ contains=@hamlCoffeeScript,hamlInterpolation \ keepend +if exists('s:current_syntax_save') + let b:current_syntax = s:current_syntax_save + unlet s:current_syntax_save +endif + endif diff --git a/after/syntax/html.vim b/after/syntax/html.vim index 5881b3e8..5979f111 100644 --- a/after/syntax/html.vim +++ b/after/syntax/html.vim @@ -5,6 +5,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') " URL: http://github.com/kchmck/vim-coffee-script " License: WTFPL +if exists('b:current_syntax') + let s:current_syntax_save = b:current_syntax +endif + " Syntax highlighting for text/coffeescript script tags syn include @htmlCoffeeScript syntax/coffee.vim syn region coffeeScript start=#