diff options
| -rw-r--r-- | autoload/polyglot/detect.vim | 8 | ||||
| -rw-r--r-- | filetype.vim (renamed from ftdetect/polyglot.vim) | 463 | ||||
| -rwxr-xr-x | scripts/build | 8 | ||||
| -rw-r--r-- | tests/extensions.vim | 1 |
4 files changed, 245 insertions, 235 deletions
diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim index 53086c4e..af143865 100644 --- a/autoload/polyglot/detect.vim +++ b/autoload/polyglot/detect.vim @@ -185,7 +185,7 @@ func! polyglot#detect#Pm() let &ft = g:filetype_pm | return endif if polyglot#shebang#Detect() | return | endif - set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#Pm() + set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#Pm() return endfunc @@ -207,7 +207,7 @@ func! polyglot#detect#Pl() let &ft = g:filetype_pl | return endif if polyglot#shebang#Detect() | return | endif - set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#Pl() + set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#Pl() return endfunc @@ -231,7 +231,7 @@ func! polyglot#detect#T() let &ft = g:filetype_t | return endif if polyglot#shebang#Detect() | return | endif - set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#T() + set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#T() return endfunc @@ -259,6 +259,6 @@ func! polyglot#detect#Html() set ft=xhtml | return endif endfor - set ft=html | au! BufWritePost <buffer> ++once call polyglot#detect#Html() + set ft=html | au BufWritePost <buffer> ++once call polyglot#detect#Html() return endfunc diff --git a/ftdetect/polyglot.vim b/filetype.vim index 52323e92..b6b78fd5 100644 --- a/ftdetect/polyglot.vim +++ b/filetype.vim @@ -1,6 +1,15 @@ -" Please do not edit this file directly, instead modify polyglot.vim or scripts/build +" Vim support file to detect file types +" +" Maintainer: Adam Stankiewicz <sheerun@sher.pl> +" URL: https://github.com/sheerun/vim-polyglot -" don't spam the user when Vim is started in Vi compatibility mode +" Listen very carefully, I will say this only once +if exists("did_load_polyglot") + finish +endif +let did_load_polyglot = 1 + +" Line continuation is used here, remove 'C' from 'cpoptions' let s:cpo_save = &cpo set cpo&vim @@ -100,32 +109,32 @@ augroup filetypedetect " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE if !has_key(s:disabled_packages, '8th') - au! BufNewFile,BufRead *.8th set ft=8th + au BufNewFile,BufRead *.8th set ft=8th endif if !has_key(s:disabled_packages, 'conf') - au! BufNewFile,BufRead *.conf,auto.master,config set ft=conf + au BufNewFile,BufRead *.conf,auto.master,config set ft=conf endif if !has_key(s:disabled_packages, 'haproxy') - au! BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy + au BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy') endif if !has_key(s:disabled_packages, 'a2ps') - au! BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps + au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps endif if !has_key(s:disabled_packages, 'a65') - au! BufNewFile,BufRead *.a65 set ft=a65 + au BufNewFile,BufRead *.a65 set ft=a65 endif if !has_key(s:disabled_packages, 'aap') - au! BufNewFile,BufRead *.aap set ft=aap + au BufNewFile,BufRead *.aap set ft=aap endif if !has_key(s:disabled_packages, 'abap') - au! BufNewFile,BufRead *.abap set ft=abap + au BufNewFile,BufRead *.abap set ft=abap endif if !has_key(s:disabled_packages, 'abaqus') @@ -133,59 +142,59 @@ if !has_key(s:disabled_packages, 'abaqus') endif if !has_key(s:disabled_packages, 'abc') - au! BufNewFile,BufRead *.abc set ft=abc + au BufNewFile,BufRead *.abc set ft=abc endif if !has_key(s:disabled_packages, 'abel') - au! BufNewFile,BufRead *.abl set ft=abel + au BufNewFile,BufRead *.abl set ft=abel endif if !has_key(s:disabled_packages, 'acedb') - au! BufNewFile,BufRead *.wrm set ft=acedb + au BufNewFile,BufRead *.wrm set ft=acedb endif if !has_key(s:disabled_packages, 'acpiasl') - au! BufNewFile,BufRead *.asl,*.dsl set ft=asl + au BufNewFile,BufRead *.asl,*.dsl set ft=asl endif if !has_key(s:disabled_packages, 'ada') - au! BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada + au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada endif if !has_key(s:disabled_packages, 'ahdl') - au! BufNewFile,BufRead *.tdf set ft=ahdl + au BufNewFile,BufRead *.tdf set ft=ahdl endif if !has_key(s:disabled_packages, 'aidl') - au! BufNewFile,BufRead *.aidl set ft=aidl + au BufNewFile,BufRead *.aidl set ft=aidl endif if !has_key(s:disabled_packages, 'alsaconf') - au! BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf + au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf endif if !has_key(s:disabled_packages, 'aml') - au! BufNewFile,BufRead *.aml set ft=aml + au BufNewFile,BufRead *.aml set ft=aml endif if !has_key(s:disabled_packages, 'ampl') - au! BufNewFile,BufRead *.run set ft=ampl + au BufNewFile,BufRead *.run set ft=ampl endif if !has_key(s:disabled_packages, 'csv') - au! BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv + au BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv endif if !has_key(s:disabled_packages, 'xml') - au! BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml + au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml endif if !has_key(s:disabled_packages, 'ant') - au! BufNewFile,BufRead build.xml set ft=ant + au BufNewFile,BufRead build.xml set ft=ant endif if !has_key(s:disabled_packages, 'apache') - au! BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache + au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache au BufNewFile,BufRead srm.conf* call s:StarSetf('apache') au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache') au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache') @@ -199,54 +208,54 @@ if !has_key(s:disabled_packages, 'apache') endif if !has_key(s:disabled_packages, 'apiblueprint') - au! BufNewFile,BufRead *.apib set ft=apiblueprint + au BufNewFile,BufRead *.apib set ft=apiblueprint endif if !has_key(s:disabled_packages, 'applescript') - au! BufNewFile,BufRead *.applescript,*.scpt set ft=applescript + au BufNewFile,BufRead *.applescript,*.scpt set ft=applescript endif if !has_key(s:disabled_packages, 'aptconf') - au! BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf + au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf') endif if !has_key(s:disabled_packages, 'arch') - au! BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch + au BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch endif if !has_key(s:disabled_packages, 'c/c++') au! BufNewFile,BufRead *.h call polyglot#detect#H() - au! BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c - au! BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp + au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c + au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp endif if !has_key(s:disabled_packages, 'arduino') - au! BufNewFile,BufRead *.ino,*.pde set ft=arduino + au BufNewFile,BufRead *.ino,*.pde set ft=arduino endif if !has_key(s:disabled_packages, 'art') - au! BufNewFile,BufRead *.art set ft=art + au BufNewFile,BufRead *.art set ft=art endif if !has_key(s:disabled_packages, 'asciidoc') - au! BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc + au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc endif if !has_key(s:disabled_packages, 'autohotkey') - au! BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey + au BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey endif if !has_key(s:disabled_packages, 'elf') - au! BufNewFile,BufRead *.am set ft=elf + au BufNewFile,BufRead *.am set ft=elf endif if !has_key(s:disabled_packages, 'automake') - au! BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake + au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake endif if !has_key(s:disabled_packages, 'asn') - au! BufNewFile,BufRead *.asn,*.asn1 set ft=asn + au BufNewFile,BufRead *.asn,*.asn1 set ft=asn endif if !has_key(s:disabled_packages, 'aspvbs') @@ -259,323 +268,323 @@ if !has_key(s:disabled_packages, 'aspperl') endif if !has_key(s:disabled_packages, 'atlas') - au! BufNewFile,BufRead *.as,*.atl set ft=atlas + au BufNewFile,BufRead *.as,*.atl set ft=atlas endif if !has_key(s:disabled_packages, 'autoit') - au! BufNewFile,BufRead *.au3 set ft=autoit + au BufNewFile,BufRead *.au3 set ft=autoit endif if !has_key(s:disabled_packages, 'ave') - au! BufNewFile,BufRead *.ave set ft=ave + au BufNewFile,BufRead *.ave set ft=ave endif if !has_key(s:disabled_packages, 'awk') - au! BufNewFile,BufRead *.awk,*.gawk set ft=awk + au BufNewFile,BufRead *.awk,*.gawk set ft=awk endif if !has_key(s:disabled_packages, 'caddyfile') - au! BufNewFile,BufRead Caddyfile set ft=caddyfile + au BufNewFile,BufRead Caddyfile set ft=caddyfile endif if !has_key(s:disabled_packages, 'cpp-modern') endif if !has_key(s:disabled_packages, 'carp') - au! BufNewFile,BufRead *.carp set ft=carp + au BufNewFile,BufRead *.carp set ft=carp endif if !has_key(s:disabled_packages, 'clojure') - au! BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure + au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure endif if !has_key(s:disabled_packages, 'cmake') - au! BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake + au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake endif if !has_key(s:disabled_packages, 'coffee-script') - au! BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee - au! BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee + au BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee + au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee endif if !has_key(s:disabled_packages, 'cjsx') endif if !has_key(s:disabled_packages, 'cryptol') - au! BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol + au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol endif if !has_key(s:disabled_packages, 'crystal') - au! BufNewFile,BufRead *.ecr set ft=ecrystal - au! BufNewFile,BufRead *.cr,Projectfile set ft=crystal + au BufNewFile,BufRead *.ecr set ft=ecrystal + au BufNewFile,BufRead *.cr,Projectfile set ft=crystal endif if !has_key(s:disabled_packages, 'cucumber') - au! BufNewFile,BufRead *.feature,*.story set ft=cucumber + au BufNewFile,BufRead *.feature,*.story set ft=cucumber endif if !has_key(s:disabled_packages, 'cue') - au! BufNewFile,BufRead *.cue set ft=cuesheet + au BufNewFile,BufRead *.cue set ft=cuesheet endif if !has_key(s:disabled_packages, 'dart') - au! BufNewFile,BufRead *.dart,*.drt set ft=dart + au BufNewFile,BufRead *.dart,*.drt set ft=dart endif if !has_key(s:disabled_packages, 'dhall') - au! BufNewFile,BufRead *.dhall set ft=dhall + au BufNewFile,BufRead *.dhall set ft=dhall endif if !has_key(s:disabled_packages, 'dlang') - au! BufNewFile,BufRead *.sdl set ft=dsdl - au! BufNewFile,BufRead *.ddoc set ft=ddoc - au! BufNewFile,BufRead *.dd set ft=dd - au! BufNewFile,BufRead *.lst set ft=dcov - au! BufNewFile,BufRead *.d,*.di set ft=d + au BufNewFile,BufRead *.sdl set ft=dsdl + au BufNewFile,BufRead *.ddoc set ft=ddoc + au BufNewFile,BufRead *.dd set ft=dd + au BufNewFile,BufRead *.lst set ft=dcov + au BufNewFile,BufRead *.d,*.di set ft=d endif if !has_key(s:disabled_packages, 'yaml') - au! BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml + au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml endif if !has_key(s:disabled_packages, 'dockerfile') - au! BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose - au! BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile + au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose + au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile') endif if !has_key(s:disabled_packages, 'elixir') - au! BufNewFile,BufRead *.eex,*.leex set ft=eelixir - au! BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir + au BufNewFile,BufRead *.eex,*.leex set ft=eelixir + au BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir endif if !has_key(s:disabled_packages, 'elm') - au! BufNewFile,BufRead *.elm set ft=elm + au BufNewFile,BufRead *.elm set ft=elm endif if !has_key(s:disabled_packages, 'emberscript') - au! BufNewFile,BufRead *.em,*.emberscript set ft=ember-script + au BufNewFile,BufRead *.em,*.emberscript set ft=ember-script endif if !has_key(s:disabled_packages, 'emblem') - au! BufNewFile,BufRead *.em,*.emblem set ft=emblem + au BufNewFile,BufRead *.em,*.emblem set ft=emblem endif if !has_key(s:disabled_packages, 'erlang') - au! BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang + au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang endif if !has_key(s:disabled_packages, 'fennel') - au! BufNewFile,BufRead *.fnl set ft=fennel + au BufNewFile,BufRead *.fnl set ft=fennel endif if !has_key(s:disabled_packages, 'ferm') - au! BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm + au BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm endif if !has_key(s:disabled_packages, 'fish') - au! BufNewFile,BufRead *.fish set ft=fish + au BufNewFile,BufRead *.fish set ft=fish endif if !has_key(s:disabled_packages, 'flatbuffers') - au! BufNewFile,BufRead *.fbs set ft=fbs + au BufNewFile,BufRead *.fbs set ft=fbs endif if !has_key(s:disabled_packages, 'forth') au! BufNewFile,BufRead *.fs call polyglot#detect#Fs() - au! BufNewFile,BufRead *.ft,*.fth set ft=forth + au BufNewFile,BufRead *.ft,*.fth set ft=forth endif if !has_key(s:disabled_packages, 'fsharp') au! BufNewFile,BufRead *.fs call polyglot#detect#Fs() - au! BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp + au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp endif if !has_key(s:disabled_packages, 'gdscript') - au! BufNewFile,BufRead *.gd set ft=gdscript3 + au BufNewFile,BufRead *.gd set ft=gdscript3 endif if !has_key(s:disabled_packages, 'git') - au! BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit + au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail') - au! BufNewFile,BufRead git-rebase-todo set ft=gitrebase - au! BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig + au BufNewFile,BufRead git-rebase-todo set ft=gitrebase + au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig') endif if !has_key(s:disabled_packages, 'glsl') au! BufNewFile,BufRead *.fs call polyglot#detect#Fs() - au! BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl + au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl endif if !has_key(s:disabled_packages, 'gmpl') - au! BufNewFile,BufRead *.mod set ft=gmpl + au BufNewFile,BufRead *.mod set ft=gmpl endif if !has_key(s:disabled_packages, 'gnuplot') - au! BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot + au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot endif if !has_key(s:disabled_packages, 'go') - au! BufNewFile,BufRead *.tmpl set ft=gohtmltmpl - au! BufNewFile,BufRead go.mod set ft=gomod - au! BufNewFile,BufRead *.go set ft=go + au BufNewFile,BufRead *.tmpl set ft=gohtmltmpl + au BufNewFile,BufRead go.mod set ft=gomod + au BufNewFile,BufRead *.go set ft=go endif if !has_key(s:disabled_packages, 'javascript') - au! BufNewFile,BufRead *.flow set ft=flow - au! BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript + au BufNewFile,BufRead *.flow set ft=flow + au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript endif if !has_key(s:disabled_packages, 'jsx') - au! BufNewFile,BufRead *.jsx set ft=javascriptreact + au BufNewFile,BufRead *.jsx set ft=javascriptreact endif if !has_key(s:disabled_packages, 'graphql') - au! BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql + au BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql endif if !has_key(s:disabled_packages, 'groovy') - au! BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy + au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy endif if !has_key(s:disabled_packages, 'gradle') endif if !has_key(s:disabled_packages, 'grub') - au! BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub + au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub endif if !has_key(s:disabled_packages, 'haml') - au! BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml + au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml endif if !has_key(s:disabled_packages, 'handlebars') - au! BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars - au! BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache + au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars + au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache endif if !has_key(s:disabled_packages, 'haskell') - au! BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell + au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell endif if !has_key(s:disabled_packages, 'haxe') - au! BufNewFile,BufRead *.hx,*.hxsl set ft=haxe + au BufNewFile,BufRead *.hx,*.hxsl set ft=haxe endif if !has_key(s:disabled_packages, 'hcl') - au! BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl + au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl endif if !has_key(s:disabled_packages, 'hive') - au! BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive + au BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive endif if !has_key(s:disabled_packages, 'html5') au! BufNewFile,BufRead *.html call polyglot#detect#Html() - au! BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html + au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html endif if !has_key(s:disabled_packages, 'i3') - au! BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config + au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config endif if !has_key(s:disabled_packages, 'icalendar') - au! BufNewFile,BufRead *.ics set ft=icalendar + au BufNewFile,BufRead *.ics set ft=icalendar endif if !has_key(s:disabled_packages, 'idris') au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr() au! BufNewFile,BufRead *.idr call polyglot#detect#Idr() - au! BufNewFile,BufRead idris-response set ft=idris + au BufNewFile,BufRead idris-response set ft=idris endif if !has_key(s:disabled_packages, 'idris2') au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr() au! BufNewFile,BufRead *.idr call polyglot#detect#Idr() - au! BufNewFile,BufRead *.ipkg,idris-response set ft=idris2 + au BufNewFile,BufRead *.ipkg,idris-response set ft=idris2 endif if !has_key(s:disabled_packages, 'ion') - au! BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion + au BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion endif if !has_key(s:disabled_packages, 'javascript-sql') endif if !has_key(s:disabled_packages, 'jenkins') - au! BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile + au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile') endif if !has_key(s:disabled_packages, 'htmldjango') - au! BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango + au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango endif if !has_key(s:disabled_packages, 'jq') - au! BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq + au BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq') endif if !has_key(s:disabled_packages, 'json5') - au! BufNewFile,BufRead *.json5 set ft=json5 + au BufNewFile,BufRead *.json5 set ft=json5 endif if !has_key(s:disabled_packages, 'json') - au! BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json + au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json endif if !has_key(s:disabled_packages, 'jsonnet') - au! BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet + au BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet endif if !has_key(s:disabled_packages, 'jst') - au! BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst + au BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst endif if !has_key(s:disabled_packages, 'julia') - au! BufNewFile,BufRead *.jl set ft=julia + au BufNewFile,BufRead *.jl set ft=julia endif if !has_key(s:disabled_packages, 'kotlin') - au! BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin + au BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin endif if !has_key(s:disabled_packages, 'ledger') - au! BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger + au BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger endif if !has_key(s:disabled_packages, 'less') - au! BufNewFile,BufRead *.less set ft=less + au BufNewFile,BufRead *.less set ft=less endif if !has_key(s:disabled_packages, 'lilypond') - au! BufNewFile,BufRead *.ily,*.ly set ft=lilypond + au BufNewFile,BufRead *.ily,*.ly set ft=lilypond endif if !has_key(s:disabled_packages, 'livescript') - au! BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript + au BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript endif if !has_key(s:disabled_packages, 'llvm') - au! BufNewFile,BufRead *.td set ft=tablegen - au! BufNewFile,BufRead *.ll set ft=llvm + au BufNewFile,BufRead *.td set ft=tablegen + au BufNewFile,BufRead *.ll set ft=llvm endif if !has_key(s:disabled_packages, 'log') - au! BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log + au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log endif if !has_key(s:disabled_packages, 'lua') - au! BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua + au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua endif if !has_key(s:disabled_packages, 'm4') - au! BufNewFile,BufRead *.at,*.m4 set ft=m4 + au BufNewFile,BufRead *.at,*.m4 set ft=m4 endif if !has_key(s:disabled_packages, 'mako') - au! BufNewFile,BufRead *.mako,*.mao set ft=mako + au BufNewFile,BufRead *.mako,*.mao set ft=mako au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype @@ -584,24 +593,24 @@ endif if !has_key(s:disabled_packages, 'mathematica') au! BufNewFile,BufRead *.m call polyglot#detect#M() - au! BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma + au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma endif if !has_key(s:disabled_packages, 'markdown') - au! BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown + au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown endif if !has_key(s:disabled_packages, 'mdx') - au! BufNewFile,BufRead *.mdx set ft=markdown.mdx + au BufNewFile,BufRead *.mdx set ft=markdown.mdx endif if !has_key(s:disabled_packages, 'meson') - au! BufNewFile,BufRead *.wrap set ft=dosini - au! BufNewFile,BufRead meson.build,meson_options.txt set ft=meson + au BufNewFile,BufRead *.wrap set ft=dosini + au BufNewFile,BufRead meson.build,meson_options.txt set ft=meson endif if !has_key(s:disabled_packages, 'moonscript') - au! BufNewFile,BufRead *.moon set ft=moon + au BufNewFile,BufRead *.moon set ft=moon endif if !has_key(s:disabled_packages, 'murphi') @@ -609,17 +618,17 @@ if !has_key(s:disabled_packages, 'murphi') endif if !has_key(s:disabled_packages, 'nginx') - au! BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx + au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx') au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx') endif if !has_key(s:disabled_packages, 'nim') - au! BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim + au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim endif if !has_key(s:disabled_packages, 'nix') - au! BufNewFile,BufRead *.nix set ft=nix + au BufNewFile,BufRead *.nix set ft=nix endif if !has_key(s:disabled_packages, 'objc') @@ -628,24 +637,24 @@ if !has_key(s:disabled_packages, 'objc') endif if !has_key(s:disabled_packages, 'ocaml') - au! BufNewFile,BufRead *.sexp set ft=sexplib - au! BufNewFile,BufRead *.root set ft=ocpbuildroot - au! BufNewFile,BufRead *.ocp set ft=ocpbuild - au! BufNewFile,BufRead _tags set ft=ocamlbuild_tags - au! BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune - au! BufNewFile,BufRead _oasis set ft=oasis - au! BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam - au! BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake - au! BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml + au BufNewFile,BufRead *.sexp set ft=sexplib + au BufNewFile,BufRead *.root set ft=ocpbuildroot + au BufNewFile,BufRead *.ocp set ft=ocpbuild + au BufNewFile,BufRead _tags set ft=ocamlbuild_tags + au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune + au BufNewFile,BufRead _oasis set ft=oasis + au BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam + au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake + au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml endif if !has_key(s:disabled_packages, 'octave') au! BufNewFile,BufRead *.m call polyglot#detect#M() - au! BufNewFile,BufRead *.oct set ft=octave + au BufNewFile,BufRead *.oct set ft=octave endif if !has_key(s:disabled_packages, 'opencl') - au! BufNewFile,BufRead *.cl,*.opencl set ft=opencl + au BufNewFile,BufRead *.cl,*.opencl set ft=opencl endif if !has_key(s:disabled_packages, 'perl') @@ -653,60 +662,60 @@ if !has_key(s:disabled_packages, 'perl') au! BufNewFile,BufRead *.t call polyglot#detect#T() au! BufNewFile,BufRead *.pm call polyglot#detect#Pm() au! BufNewFile,BufRead *.pl call polyglot#detect#Pl() - au! BufNewFile,BufRead *.xs set ft=xs - au! BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason - au! BufNewFile,BufRead *.pod set ft=pod - au! BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl + au BufNewFile,BufRead *.xs set ft=xs + au BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason + au BufNewFile,BufRead *.pod set ft=pod + au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl endif if !has_key(s:disabled_packages, 'pgsql') - au! BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql + au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql endif if !has_key(s:disabled_packages, 'cql') - au! BufNewFile,BufRead *.cql set ft=cql + au BufNewFile,BufRead *.cql set ft=cql endif if !has_key(s:disabled_packages, 'php') - au! BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php + au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php endif if !has_key(s:disabled_packages, 'blade') - au! BufNewFile,BufRead *.blade,*.blade.php set ft=blade + au BufNewFile,BufRead *.blade,*.blade.php set ft=blade endif if !has_key(s:disabled_packages, 'plantuml') - au! BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml + au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml endif if !has_key(s:disabled_packages, 'pony') - au! BufNewFile,BufRead *.pony set ft=pony + au BufNewFile,BufRead *.pony set ft=pony endif if !has_key(s:disabled_packages, 'powershell') - au! BufNewFile,BufRead *.ps1xml set ft=ps1xml - au! BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1 + au BufNewFile,BufRead *.ps1xml set ft=ps1xml + au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1 endif if !has_key(s:disabled_packages, 'protobuf') - au! BufNewFile,BufRead *.proto set ft=proto + au BufNewFile,BufRead *.proto set ft=proto endif if !has_key(s:disabled_packages, 'pug') - au! BufNewFile,BufRead *.jade,*.pug set ft=pug + au BufNewFile,BufRead *.jade,*.pug set ft=pug endif if !has_key(s:disabled_packages, 'puppet') - au! BufNewFile,BufRead *.epp set ft=embeddedpuppet - au! BufNewFile,BufRead *.pp,Modulefile set ft=puppet + au BufNewFile,BufRead *.epp set ft=embeddedpuppet + au BufNewFile,BufRead *.pp,Modulefile set ft=puppet endif if !has_key(s:disabled_packages, 'purescript') - au! BufNewFile,BufRead *.purs set ft=purescript + au BufNewFile,BufRead *.purs set ft=purescript endif if !has_key(s:disabled_packages, 'python') - au! BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python + au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python endif if !has_key(s:disabled_packages, 'python-indent') @@ -716,237 +725,237 @@ if !has_key(s:disabled_packages, 'python-compiler') endif if !has_key(s:disabled_packages, 'requirements') - au! BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements + au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements endif if !has_key(s:disabled_packages, 'qmake') - au! BufNewFile,BufRead *.pri,*.pro set ft=qmake + au BufNewFile,BufRead *.pri,*.pro set ft=qmake endif if !has_key(s:disabled_packages, 'qml') - au! BufNewFile,BufRead *.qbs,*.qml set ft=qml + au BufNewFile,BufRead *.qbs,*.qml set ft=qml endif if !has_key(s:disabled_packages, 'r-lang') - au! BufNewFile,BufRead *.rd set ft=rhelp - au! BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r + au BufNewFile,BufRead *.rd set ft=rhelp + au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r endif if !has_key(s:disabled_packages, 'racket') - au! BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket + au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket endif if !has_key(s:disabled_packages, 'ragel') - au! BufNewFile,BufRead *.rl set ft=ragel + au BufNewFile,BufRead *.rl set ft=ragel endif if !has_key(s:disabled_packages, 'raku') au! BufNewFile,BufRead *.t call polyglot#detect#T() au! BufNewFile,BufRead *.pm call polyglot#detect#Pm() au! BufNewFile,BufRead *.pl call polyglot#detect#Pl() - au! BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku + au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku endif if !has_key(s:disabled_packages, 'raml') - au! BufNewFile,BufRead *.raml set ft=raml + au BufNewFile,BufRead *.raml set ft=raml endif if !has_key(s:disabled_packages, 'razor') - au! BufNewFile,BufRead *.cshtml,*.razor set ft=razor + au BufNewFile,BufRead *.cshtml,*.razor set ft=razor endif if !has_key(s:disabled_packages, 'reason') au! BufNewFile,BufRead *.re call polyglot#detect#Re() - au! BufNewFile,BufRead *.rei set ft=reason + au BufNewFile,BufRead *.rei set ft=reason endif if !has_key(s:disabled_packages, 'rst') - au! BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst + au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst endif if !has_key(s:disabled_packages, 'ruby') - au! BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby - au! BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby + au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby + au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby') endif if !has_key(s:disabled_packages, 'rspec') - au! BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec + au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec endif if !has_key(s:disabled_packages, 'yard') endif if !has_key(s:disabled_packages, 'brewfile') - au! BufNewFile,BufRead Brewfile set ft=brewfile + au BufNewFile,BufRead Brewfile set ft=brewfile endif if !has_key(s:disabled_packages, 'rust') - au! BufNewFile,BufRead *.rs,*.rs.in set ft=rust + au BufNewFile,BufRead *.rs,*.rs.in set ft=rust endif if !has_key(s:disabled_packages, 'scala') - au! BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala + au BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala endif if !has_key(s:disabled_packages, 'sbt') - au! BufNewFile,BufRead *.sbt set ft=sbt.scala + au BufNewFile,BufRead *.sbt set ft=sbt.scala endif if !has_key(s:disabled_packages, 'scss') - au! BufNewFile,BufRead *.scss set ft=scss + au BufNewFile,BufRead *.scss set ft=scss endif if !has_key(s:disabled_packages, 'sh') - au! BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh + au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh') au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh') au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh') - au! BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh + au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh endif if !has_key(s:disabled_packages, 'zinit') endif if !has_key(s:disabled_packages, 'slim') - au! BufNewFile,BufRead *.slim set ft=slim + au BufNewFile,BufRead *.slim set ft=slim endif if !has_key(s:disabled_packages, 'slime') - au! BufNewFile,BufRead *.slime set ft=slime + au BufNewFile,BufRead *.slime set ft=slime endif if !has_key(s:disabled_packages, 'smt2') - au! BufNewFile,BufRead *.smt,*.smt2 set ft=smt2 + au BufNewFile,BufRead *.smt,*.smt2 set ft=smt2 endif if !has_key(s:disabled_packages, 'solidity') - au! BufNewFile,BufRead *.sol set ft=solidity + au BufNewFile,BufRead *.sol set ft=solidity endif if !has_key(s:disabled_packages, 'stylus') - au! BufNewFile,BufRead *.styl,*.stylus set ft=stylus + au BufNewFile,BufRead *.styl,*.stylus set ft=stylus endif if !has_key(s:disabled_packages, 'svelte') - au! BufNewFile,BufRead *.svelte set ft=svelte + au BufNewFile,BufRead *.svelte set ft=svelte endif if !has_key(s:disabled_packages, 'svg') - au! BufNewFile,BufRead *.svg set ft=svg + au BufNewFile,BufRead *.svg set ft=svg endif if !has_key(s:disabled_packages, 'svg-indent') endif if !has_key(s:disabled_packages, 'swift') - au! BufNewFile,BufRead *.swift set ft=swift + au BufNewFile,BufRead *.swift set ft=swift endif if !has_key(s:disabled_packages, 'sxhkd') - au! BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc + au BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc endif if !has_key(s:disabled_packages, 'systemd') - au! BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd + au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd au BufNewFile,BufRead *.#* call s:StarSetf('systemd') endif if !has_key(s:disabled_packages, 'terraform') - au! BufNewFile,BufRead *.tf,*.tfvars set ft=terraform + au BufNewFile,BufRead *.tf,*.tfvars set ft=terraform endif if !has_key(s:disabled_packages, 'textile') - au! BufNewFile,BufRead *.textile set ft=textile + au BufNewFile,BufRead *.textile set ft=textile endif if !has_key(s:disabled_packages, 'thrift') - au! BufNewFile,BufRead *.thrift set ft=thrift + au BufNewFile,BufRead *.thrift set ft=thrift endif if !has_key(s:disabled_packages, 'tmux') - au! BufNewFile,BufRead {.,}tmux*.conf set ft=tmux + au BufNewFile,BufRead {.,}tmux*.conf set ft=tmux endif if !has_key(s:disabled_packages, 'toml') - au! BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml + au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml endif if !has_key(s:disabled_packages, 'tptp') - au! BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp + au BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp endif if !has_key(s:disabled_packages, 'twig') - au! BufNewFile,BufRead *.xml.twig set ft=xml.twig - au! BufNewFile,BufRead *.twig set ft=html.twig + au BufNewFile,BufRead *.xml.twig set ft=xml.twig + au BufNewFile,BufRead *.twig set ft=html.twig endif if !has_key(s:disabled_packages, 'typescript') - au! BufNewFile,BufRead *.tsx set ft=typescriptreact - au! BufNewFile,BufRead *.ts set ft=typescript + au BufNewFile,BufRead *.tsx set ft=typescriptreact + au BufNewFile,BufRead *.ts set ft=typescript endif if !has_key(s:disabled_packages, 'unison') - au! BufNewFile,BufRead *.u,*.uu set ft=unison + au BufNewFile,BufRead *.u,*.uu set ft=unison endif if !has_key(s:disabled_packages, 'v') - au! BufNewFile,BufRead *.v set ft=v + au BufNewFile,BufRead *.v set ft=v endif if !has_key(s:disabled_packages, 'vala') - au! BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala + au BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala endif if !has_key(s:disabled_packages, 'vbnet') - au! BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet + au BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet endif if !has_key(s:disabled_packages, 'vcl') - au! BufNewFile,BufRead *.vcl set ft=vcl + au BufNewFile,BufRead *.vcl set ft=vcl endif if !has_key(s:disabled_packages, 'velocity') - au! BufNewFile,BufRead *.vm set ft=velocity + au BufNewFile,BufRead *.vm set ft=velocity endif if !has_key(s:disabled_packages, 'vmasm') - au! BufNewFile,BufRead *.mar set ft=vmasm + au BufNewFile,BufRead *.mar set ft=vmasm endif if !has_key(s:disabled_packages, 'vue') - au! BufNewFile,BufRead *.vue,*.wpy set ft=vue + au BufNewFile,BufRead *.vue,*.wpy set ft=vue endif if !has_key(s:disabled_packages, 'xdc') - au! BufNewFile,BufRead *.xdc set ft=xdc + au BufNewFile,BufRead *.xdc set ft=xdc endif if !has_key(s:disabled_packages, 'xsl') - au! BufNewFile,BufRead *.xsl,*.xslt set ft=xsl + au BufNewFile,BufRead *.xsl,*.xslt set ft=xsl endif if !has_key(s:disabled_packages, 'ansible') - au! BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible + au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible') au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible') endif if !has_key(s:disabled_packages, 'helm') - au! BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm + au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm endif if !has_key(s:disabled_packages, 'help') - au! BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help + au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help endif if !has_key(s:disabled_packages, 'zephir') - au! BufNewFile,BufRead *.zep set ft=zephir + au BufNewFile,BufRead *.zep set ft=zephir endif if !has_key(s:disabled_packages, 'zig') - au! BufNewFile,BufRead *.zig,*.zir set ft=zig - au! BufNewFile,BufRead *.zir set ft=zir + au BufNewFile,BufRead *.zig,*.zir set ft=zig + au BufNewFile,BufRead *.zir set ft=zir endif if !has_key(s:disabled_packages, 'trasys') @@ -954,31 +963,31 @@ if !has_key(s:disabled_packages, 'trasys') endif if !has_key(s:disabled_packages, 'basic') - au! BufNewFile,BufRead *.basic set ft=basic + au BufNewFile,BufRead *.basic set ft=basic endif if !has_key(s:disabled_packages, 'visual-basic') au! BufNewFile,BufRead *.bas call polyglot#detect#Bas() - au! BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb + au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb endif if !has_key(s:disabled_packages, 'dosini') - au! BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini + au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini') au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini') endif if !has_key(s:disabled_packages, 'odin') - au! BufNewFile,BufRead *.odin set ft=odin + au BufNewFile,BufRead *.odin set ft=odin endif if !has_key(s:disabled_packages, 'bzl') - au! BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl + au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl endif if !has_key(s:disabled_packages, 'prolog') au! BufNewFile,BufRead *.pl call polyglot#detect#Pl() - au! BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog + au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog endif if !has_key(s:disabled_packages, 'tads') @@ -986,11 +995,11 @@ if !has_key(s:disabled_packages, 'tads') endif if !has_key(s:disabled_packages, 'gitignore') - au! BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore + au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore endif if !has_key(s:disabled_packages, 'sql') - au! BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql + au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql endif " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE @@ -1201,6 +1210,6 @@ if exists('g:polyglot_disabled') let g:polyglot_disabled = s:new_polyglot_disabled endif -" restore Vi compatibility settings +" Restore 'cpoptions' let &cpo = s:cpo_save - +unlet s:cpo_save diff --git a/scripts/build b/scripts/build index a2f43fb2..303f4641 100755 --- a/scripts/build +++ b/scripts/build @@ -395,7 +395,7 @@ def rule_to_code(rule) if rule.has_key?("filetype") if rule.has_key?("fallback") return <<~EOS - set ft=#{rule["filetype"]} | au! BufWritePost <buffer> ++once call polyglot#detect##{camelize(rule["extensions"].first)}() + set ft=#{rule["filetype"]} | au BufWritePost <buffer> ++once call polyglot#detect##{camelize(rule["extensions"].first)}() return EOS end @@ -564,7 +564,7 @@ def generate_ftdetect(packages, heuristics) end if set_globs.size > 0 - autocommands << " au! BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n" + autocommands << " au BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n" end end @@ -583,13 +583,13 @@ def generate_ftdetect(packages, heuristics) show_warnings(all_filetypes, expected_filetypes) - ftdetect = File.read('ftdetect/polyglot.vim') + ftdetect = File.read('filetype.vim') starting = '" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE' ending = '" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE' File.write( - 'ftdetect/polyglot.vim', + 'filetype.vim', ftdetect.gsub(/(?<=#{starting}\n)(.*)(?=#{ending})/m) { output } ) diff --git a/tests/extensions.vim b/tests/extensions.vim index 6492e1ac..f6606532 100644 --- a/tests/extensions.vim +++ b/tests/extensions.vim @@ -30,6 +30,7 @@ call TestExtension("sh", "bash3", "#! /bin/bash2.3") call TestExtension("sh", "bash4", "#!/usr/bin/env bash") call TestExtension("sh", "bash6", "#!/usr/bin/env -i -=split-string foo=bar bash -l foo") call TestExtension("sh", "bash1", "#!/bin/bash") +" This is defined only by vim-native scripts.vim for now call TestExtension("sh", "bash7", ":") " Vim help file |