summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-03-04 09:32:57 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2019-03-04 09:34:05 +0100
commitc39dff0b10077c5dc9f9d1a3ea26722750765cbc (patch)
tree30ae2673831dafc4b953ee9ff886460e1d315ce4
parent288b0d2423e0338c6ed595bca33b7fe08f2ea5a8 (diff)
downloadvim-polyglot-c39dff0b10077c5dc9f9d1a3ea26722750765cbc.tar.gz
vim-polyglot-c39dff0b10077c5dc9f9d1a3ea26722750765cbc.zip
Sort packs, closes #367
-rwxr-xr-xbuild20
-rw-r--r--ftdetect/polyglot.vim132
2 files changed, 76 insertions, 76 deletions
diff --git a/build b/build
index 6fe3d6e4..9e00e4b5 100755
--- a/build
+++ b/build
@@ -151,12 +151,11 @@ update_readme() {
}
PACKS="
+ ansible:pearofducks/ansible-vim
apiblueprint:sheerun/apiblueprint.vim
applescript:mityu/vim-applescript:_SYNTAX
- asciidoc:asciidoc/vim-asciidoc
- yaml:stephpy/vim-yaml
- ansible:pearofducks/ansible-vim
arduino:sudar/vim-arduino-syntax
+ asciidoc:asciidoc/vim-asciidoc
autohotkey:hnamikaw/vim-autohotkey
blade:jwalton512/vim-blade
c++11:octol/vim-cpp-enhanced-highlight
@@ -167,9 +166,9 @@ PACKS="
clojure:guns/vim-clojure-static
cmake:pboettch/vim-cmake-syntax
coffee-script:kchmck/vim-coffee-script
+ cql:elubow/cql-vim
cryptol:victoredwardocallaghan/cryptol.vim
crystal:rhysd/vim-crystal
- cql:elubow/cql-vim
cucumber:tpope/vim-cucumber
dart:dart-lang/dart-vim-plugin
dockerfile:ekalinin/Dockerfile.vim
@@ -182,8 +181,8 @@ PACKS="
fish:dag/vim-fish
fsharp:fsharp/vim-fsharp:_BASIC
git:tpope/vim-git
- gmpl:maelvalais/gmpl.vim
glsl:tikhomirov/vim-glsl
+ gmpl:maelvalais/gmpl.vim
gnuplot:vim-scripts/gnuplot-syntax-highlighting
go:fatih/vim-go:_BASIC
graphql:jparise/vim-graphql
@@ -198,8 +197,8 @@ PACKS="
jasmine:glanotte/vim-jasmine
javascript:pangloss/vim-javascript:_JAVASCRIPT
jenkins:martinda/Jenkinsfile-vim-syntax
- json:elzr/vim-json
json5:GutenYe/json5.vim
+ json:elzr/vim-json
jst:briancollins/vim-jst
jsx:mxw/vim-jsx:_ALL
julia:JuliaEditorSupport/julia-vim
@@ -230,18 +229,18 @@ PACKS="
pug:digitaltoad/vim-pug
puppet:voxpupuli/vim-puppet
purescript:purescript-contrib/purescript-vim
- python:vim-python/python-syntax
python-compiler:aliev/vim-compiler-python
python-ident:Vimjas/vim-python-pep8-indent
+ python:vim-python/python-syntax
qml:peterhoeg/vim-qml
r-lang:vim-scripts/R.vim
racket:wlangstroth/vim-racket
- raml:IN3D/vim-raml
ragel:jneen/ragel.vim
+ raml:IN3D/vim-raml
rspec:sheerun/rspec.vim
+ rst:marshallward/vim-restructuredtext
ruby:vim-ruby/vim-ruby
rust:rust-lang/rust.vim
- rst:marshallward/vim-restructuredtext
sbt:derekwyatt/vim-sbt
scala:derekwyatt/vim-scala
scss:cakebaker/scss-syntax.vim
@@ -264,9 +263,10 @@ PACKS="
vbnet:vim-scripts/vbnet.vim
vcl:smerrill/vcl-vim-plugin
vifm:vifm/vifm.vim
- vue:posva/vim-vue
vm:lepture/vim-velocity
+ vue:posva/vim-vue
xls:vim-scripts/XSLT-syntax
+ yaml:stephpy/vim-yaml
yard:sheerun/vim-yardoc
"
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c04e099f..1448194b 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -73,43 +73,6 @@ augroup END
if (!exists('g:graphql_javascript_tags'))
let g:graphql_javascript_tags = ['gql', 'graphql', 'Relay.QL']
endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
- augroup filetypedetect
- " apiblueprint, from apiblueprint.vim in sheerun/apiblueprint.vim
-autocmd BufReadPost,BufNewFile *.apib set filetype=apiblueprint
-autocmd FileType apiblueprint set syntax=apiblueprint
-autocmd FileType apiblueprint set makeprg=drafter\ -l\ %
- augroup end
-endif
-
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
- augroup filetypedetect
- " applescript, from applescript.vim in mityu/vim-applescript:_SYNTAX
-"Plugin Name: AppleScript
-"Author: mityu
-"Last Change: 04-Mar-2017.
-
-let s:cpo_save=&cpo
-set cpo&vim
-
-au BufNewFile,BufRead *.scpt setf applescript
-au BufNewFile,BufRead *.applescript setf applescript
-
-let &cpo=s:cpo_save
-unlet s:cpo_save
-
-" vim: foldmethod=marker
- augroup end
-endif
-
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
- augroup filetypedetect
- " asciidoc, from asciidoc.vim in asciidoc/vim-asciidoc
-autocmd BufNewFile,BufRead *.asciidoc,*.adoc
- \ set ft=asciidoc
- augroup end
-endif
-
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
augroup filetypedetect
" ansible, from ansible.vim in pearofducks/ansible-vim
@@ -156,6 +119,35 @@ augroup END
augroup end
endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
+ augroup filetypedetect
+ " apiblueprint, from apiblueprint.vim in sheerun/apiblueprint.vim
+autocmd BufReadPost,BufNewFile *.apib set filetype=apiblueprint
+autocmd FileType apiblueprint set syntax=apiblueprint
+autocmd FileType apiblueprint set makeprg=drafter\ -l\ %
+ augroup end
+endif
+
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
+ augroup filetypedetect
+ " applescript, from applescript.vim in mityu/vim-applescript:_SYNTAX
+"Plugin Name: AppleScript
+"Author: mityu
+"Last Change: 04-Mar-2017.
+
+let s:cpo_save=&cpo
+set cpo&vim
+
+au BufNewFile,BufRead *.scpt setf applescript
+au BufNewFile,BufRead *.applescript setf applescript
+
+let &cpo=s:cpo_save
+unlet s:cpo_save
+
+" vim: foldmethod=marker
+ augroup end
+endif
+
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
augroup filetypedetect
" arduino, from arduino.vim in sudar/vim-arduino-syntax
@@ -163,6 +155,14 @@ au BufRead,BufNewFile *.ino,*.pde set filetype=arduino
augroup end
endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
+ augroup filetypedetect
+ " asciidoc, from asciidoc.vim in asciidoc/vim-asciidoc
+autocmd BufNewFile,BufRead *.asciidoc,*.adoc
+ \ set ft=asciidoc
+ augroup end
+endif
+
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
augroup filetypedetect
" blade, from blade.vim in jwalton512/vim-blade
@@ -201,6 +201,15 @@ autocmd BufNewFile,BufRead *.clj,*.cljs,*.edn,*.cljx,*.cljc,{build,profile}.boot
augroup end
endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cql') == -1
+ augroup filetypedetect
+ " cql, from cql.vim in elubow/cql-vim
+if has("autocmd")
+ au BufNewFile,BufRead *.cql set filetype=cql
+endif
+ augroup end
+endif
+
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
augroup filetypedetect
" cryptol, from cryptol.vim in victoredwardocallaghan/cryptol.vim
@@ -225,15 +234,6 @@ autocmd BufNewFile,BufReadPost *.ecr setlocal filetype=eruby
augroup end
endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cql') == -1
- augroup filetypedetect
- " cql, from cql.vim in elubow/cql-vim
-if has("autocmd")
- au BufNewFile,BufRead *.cql set filetype=cql
-endif
- augroup end
-endif
-
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
augroup filetypedetect
" cucumber, from cucumber.vim in tpope/vim-cucumber
@@ -342,13 +342,6 @@ autocmd BufNewFile,BufRead *.fs,*.fsi,*.fsx set filetype=fsharp
augroup end
endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gmpl') == -1
- augroup filetypedetect
- " gmpl, from gmpl.vim in maelvalais/gmpl.vim
-au BufRead,BufNewFile *.mod set filetype=gmpl
- augroup end
-endif
-
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
augroup filetypedetect
" glsl, from glsl.vim in tikhomirov/vim-glsl
@@ -363,6 +356,13 @@ autocmd! BufNewFile,BufRead *.vert,*.tesc,*.tese,*.glsl,*.geom,*.frag,*.comp set
augroup end
endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gmpl') == -1
+ augroup filetypedetect
+ " gmpl, from gmpl.vim in maelvalais/gmpl.vim
+au BufRead,BufNewFile *.mod set filetype=gmpl
+ augroup end
+endif
+
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
augroup filetypedetect
" go, from gofiletype.vim in fatih/vim-go:_BASIC
@@ -504,6 +504,13 @@ autocmd BufRead,BufNewFile *.Jenkinsfile setf Jenkinsfile
augroup end
endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json5') == -1
+ augroup filetypedetect
+ " json5, from json5.vim in GutenYe/json5.vim
+au BufNewFile,BufRead *.json5 setfiletype json5
+ augroup end
+endif
+
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
augroup filetypedetect
" json, from json.vim in elzr/vim-json
@@ -515,13 +522,6 @@ autocmd BufNewFile,BufRead *.template setlocal filetype=json
augroup end
endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json5') == -1
- augroup filetypedetect
- " json5, from json5.vim in GutenYe/json5.vim
-au BufNewFile,BufRead *.json5 setfiletype json5
- augroup end
-endif
-
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
augroup filetypedetect
" jst, from jst.vim in briancollins/vim-jst
@@ -1200,17 +1200,17 @@ autocmd BufRead,BufNewFile *vifm/colors/* :set filetype=vifm
augroup end
endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
augroup filetypedetect
- " vue, from vue.vim in posva/vim-vue
-au BufNewFile,BufRead *.vue,*.wpy setf vue
+ " vm, from velocity.vim in lepture/vim-velocity
+au BufRead,BufNewFile *.vm set ft=velocity syntax=velocity
augroup end
endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
augroup filetypedetect
- " vm, from velocity.vim in lepture/vim-velocity
-au BufRead,BufNewFile *.vm set ft=velocity syntax=velocity
+ " vue, from vue.vim in posva/vim-vue
+au BufNewFile,BufRead *.vue,*.wpy setf vue
augroup end
endif