Set indentation only locally, fixes #564

README.md

@@ -7,7 +7,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-->200<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->201<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -115,6 +115,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [fsharp](https://github.com/ionide/Ionide-vim)
 - [gdscript](https://github.com/calviken/vim-gdscript3)
 - [git](https://github.com/tpope/vim-git)
+- [gitignore](https://github.com/fszymanski/fzf-gitignore)
 - [glsl](https://github.com/tikhomirov/vim-glsl)
 - [gmpl](https://github.com/maelvalais/gmpl.vim)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)

autoload/elixir/indent.vim

@@ -276,12 +276,14 @@ function! elixir#indent#handle_inside_block(context)
   " hack - handle do: better
   let block_info = searchpairpos(start_pattern, '', end_pattern, 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip() || getline(line('.')) =~ 'do:'", max([0, a:context.lnum - g:elixir_indent_max_lookbehind]))
   let block_start_lnum = block_info[0]
+  call s:debug("block_start_lnum=" . block_start_lnum)
   let block_start_col = block_info[1]
   if block_start_lnum != 0 || block_start_col != 0
     let block_text = getline(block_start_lnum)
     let block_start_char = block_text[block_start_col - 1]
+    call s:debug("block_start_char=" . block_start_char)
 
-    let never_match = '\(a\)\@=b'
+    let never_match = ''
     let config = {
           \'f': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
           \'c': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
@@ -293,17 +295,25 @@ function! elixir#indent#handle_inside_block(context)
           \'(': {'aligned_clauses': ')', 'pattern_match_clauses': never_match}
           \}
 
+    " if `with` clause...
     if block_start_char == 'w'
       call s:debug("testing s:handle_with")
       return s:handle_with(block_start_lnum, block_start_col, a:context)
     else
       let block_config = config[block_start_char]
+      " if aligned clause (closing tag/`else` clause/etc...) then indent this
+      " at the same level as the block open tag (e.g. `if`/`case`/etc...)
       if s:starts_with(a:context, block_config.aligned_clauses)
         call s:debug("clause")
         return indent(block_start_lnum)
       else
-        let clause_lnum = searchpair(block_config.pattern_match_clauses, '', '*', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", block_start_lnum)
-        let relative_lnum = max([clause_lnum, block_start_lnum])
+        if block_config.pattern_match_clauses == never_match
+          let relative_lnum = block_start_lnum
+        else
+          let clause_lnum = searchpair(block_config.pattern_match_clauses, '', '*', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", block_start_lnum)
+          call s:debug("clause_lum=" . clause_lnum)
+          let relative_lnum = max([clause_lnum, block_start_lnum])
+        end
         call s:debug("pattern matching relative to lnum " . relative_lnum)
         return s:do_handle_pattern_match_block(relative_lnum, a:context)
       endif

autoload/fzf_gitignore.vim

@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+function! s:template_sink(templates) abort
+  try
+    let l:lines = _fzf_gitignore_create(a:templates)
+  catch /^Vim(\(let\|return\)):/
+    return
+  endtry
+
+  new
+  setlocal filetype=gitignore
+
+  call setline(1, l:lines)
+
+  $-2,$delete _
+  normal! gg
+endfunction
+
+function! fzf_gitignore#run() abort
+  try
+    let l:opts = {
+          \ 'source': _fzf_gitignore_get_all_templates(),
+          \ 'sink*': function('s:template_sink'),
+          \ 'options': '-m --prompt="Template> " --header="gitignore.io"'
+          \ }
+  catch /^Vim(\(let\|return\)):/
+    return
+  endtry
+
+  call fzf#run(fzf#wrap(l:opts))
+endfunction
+
+" vim: ts=2 et sw=2
+
+endif

autoload/polyglot.vim

@@ -405,7 +405,7 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
-func! polyglot#Observe(fn)
+func! s:Observe(fn)
   let b:polyglot_observe = a:fn
   augroup polyglot-observer
     au! CursorHold,CursorHoldI,BufWritePost <buffer>
@@ -499,7 +499,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#Observe('Shebang') | endif
+      \ call s:Observe('Shebang') | endif
 
 augroup END
 
@@ -596,7 +596,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
-        let &shiftwidth=&tabstop
+        let &l:shiftwidth=&tabstop
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
@@ -609,7 +609,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
     if minindent < 10
       setlocal expandtab
-      let &shiftwidth=minindent
+      let &l:shiftwidth=minindent
       let b:sleuth_culprit .= ':' . i
       return 1
     endif

autoload/sleuth.vim

@@ -2,7 +2,7 @@ let s:globs = {
   \ '8th': '*.8th',
   \ 'Dockerfile': '*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'Jenkinsfile': '*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*',
-  \ 'a2ps': 'a2psrc',
+  \ 'a2ps': 'a2psrc,.a2psrc',
   \ 'a65': '*.a65',
   \ 'aap': '*.aap',
   \ 'abap': '*.abap',
@@ -13,15 +13,15 @@ let s:globs = {
   \ 'ada': '*.adb,*.ads,*.ada,*.adc,*.gpr,*.ada_m',
   \ 'ahdl': '*.tdf',
   \ 'aidl': '*.aidl',
-  \ 'alsaconf': '',
+  \ 'alsaconf': '.asoundrc',
   \ 'aml': '*.aml',
   \ 'ampl': '*.run',
   \ 'ant': 'build.xml',
-  \ 'apache': 'access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
+  \ 'apache': '.htaccess,access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
   \ 'apiblueprint': '*.apib',
   \ 'applescript': '*.applescript,*.scpt',
   \ 'aptconf': 'apt.conf',
-  \ 'arch': '=tagging-method',
+  \ 'arch': '.arch-inventory,=tagging-method',
   \ 'arduino': '*.pde,*.ino',
   \ 'art': '*.art',
   \ 'asciidoc': '*.asciidoc,*.adoc,*.asc',
@@ -58,7 +58,7 @@ let s:globs = {
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
   \ 'dhall': '*.dhall',
-  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
   \ 'dsdl': '*.sdl',
   \ 'dune': 'jbuild,dune,dune-project,dune-workspace',
   \ 'ecrystal': '*.ecr',
@@ -80,9 +80,10 @@ let s:globs = {
   \ 'fsharp': '*.fs,*.fsi,*.fsx',
   \ 'gdscript3': '*.gd',
   \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
-  \ 'gitconfig': '*.gitconfig',
+  \ 'gitconfig': '*.gitconfig,.gitconfig,.gitmodules',
+  \ 'gitignore': '.gitignore',
   \ 'gitrebase': 'git-rebase-todo',
-  \ 'gitsendemail': '',
+  \ 'gitsendemail': '.gitsendemail.*',
   \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
   \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,*.gpi',
@@ -105,15 +106,15 @@ let s:globs = {
   \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2,*.njk',
-  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config',
+  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
   \ 'icalendar': '*.ics',
   \ 'idris': '*.idr,*.lidr,idris-response',
   \ 'idris2': '*.idr,*.ipkg,idris-response',
   \ 'ion': '*.ion',
   \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
-  \ 'jq': '*.jq',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,composer.lock,mcmod.info,Pipfile.lock',
+  \ 'jq': '*.jq,.jqrc,.jqrc*',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,Pipfile.lock',
   \ 'json5': '*.json5',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
   \ 'jst': '*.ejs,*.ect,*.jst',
@@ -127,7 +128,7 @@ let s:globs = {
   \ 'livescript': '*.ls,*._ls,Slakefile',
   \ 'llvm': '*.ll',
   \ 'log': '*.log,*.LOG,*_log,*_LOG',
-  \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua',
+  \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc',
   \ 'm4': '*.m4,*.at',
   \ 'mako': '*.mako,*.mao',
   \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
@@ -142,7 +143,7 @@ let s:globs = {
   \ 'nix': '*.nix',
   \ 'oasis': '_oasis',
   \ 'objc': '*.m,*.h',
-  \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo',
+  \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo,.ocamlinit',
   \ 'ocamlbuild_tags': '_tags',
   \ 'ocpbuild': '*.ocp',
   \ 'ocpbuildroot': '*.root',
@@ -152,7 +153,7 @@ let s:globs = {
   \ 'opam': '*.opam,*.opam.template,opam',
   \ 'opencl': '*.cl,*.opencl',
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile',
-  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,Phakefile',
+  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,.php,.php_cs,.php_cs.dist,Phakefile',
   \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
   \ 'pod': '*.pod',
   \ 'pony': '*.pony',
@@ -163,10 +164,10 @@ let s:globs = {
   \ 'pug': '*.jade,*.pug',
   \ 'puppet': '*.pp,Modulefile',
   \ 'purescript': '*.purs',
-  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,DEPS,SConscript,SConstruct,Snakefile,wscript',
+  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript',
   \ 'qmake': '*.pro,*.pri',
   \ 'qml': '*.qml,*.qbs',
-  \ 'r': '*.r,*.rsx,*.s,*.S,expr-dist',
+  \ 'r': '*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist',
   \ 'racket': '*.rkt,*.rktd,*.rktl,*.scrbl',
   \ 'ragel': '*.rl',
   \ 'raku': '*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6',
@@ -176,13 +177,13 @@ let s:globs = {
   \ 'requirements': '*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in}',
   \ 'rhelp': '*.rd',
   \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
-  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,Cheffile,KitchenSink,Routefile,vagrantfile,[Rr]akefile*,*_spec.rb',
+  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
   \ 'rust': '*.rs,*.rs.in',
   \ 'sbt.scala': '*.sbt',
   \ 'scala': '*.scala,*.kojo,*.sc',
   \ 'scss': '*.scss',
   \ 'sexplib': '*.sexp',
-  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.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',
   \ 'slim': '*.slim',
   \ 'slime': '*.slime',
   \ 'smt2': '*.smt2,*.smt',
@@ -199,7 +200,7 @@ let s:globs = {
   \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
   \ 'textile': '*.textile',
   \ 'thrift': '*.thrift',
-  \ 'tmux': '',
+  \ 'tmux': '.tmux.conf',
   \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
   \ 'tptp': '*.p,*.tptp,*.ax',
   \ 'trasys': '*.inp',
@@ -217,17 +218,17 @@ let s:globs = {
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.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,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.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,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
   \ 'xml.twig': '*.xml.twig',
   \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
-  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,glide.lock,yarn.lock,fish_history,fish_read_history',
+  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history',
   \ 'yaml.ansible': 'playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml',
   \ 'yaml.docker-compose': 'docker-compose*.yaml,docker-compose*.yml',
   \ 'zephir': '*.zep',
   \ 'zig': '*.zig,*.zir',
   \ 'zir': '*.zir',
-  \ 'zsh': '*.zsh',
+  \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout',
   \}
 
 func! sleuth#GlobForFiletype(type)

doc/fzf_gitignore.txt

@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+*fzf_gitignore.txt* Create useful .gitignore files for your project
+
+Author: Filip Szymański <fszymanski.pl@gmail.com>
+
+==============================================================================
+CONTENTS                                              *fzf-gitignore-contents*
+
+  1. Introduction                                |fzf-gitignore-introduction|
+  2. Configuration                               |fzf-gitignore-configuration|
+  3. Commands                                    |fzf-gitignore-commands|
+  4. Mappings                                    |fzf-gitignore-mappings|
+  5. License                                     |fzf-gitignore-license|
+  6. Bugs                                        |fzf-gitignore-bugs|
+  7. Contributing                                |fzf-gitignore-contributing|
+
+==============================================================================
+INTRODUCTION                                      *fzf-gitignore-introduction*
+
+fzf[1] interface for creating .gitignore files using the gitignore.io[2] API.
+
+Note: This plugin was inspired by helm-gitignore[3].
+
+==============================================================================
+CONFIGURATION                                    *fzf-gitignore-configuration*
+
+                                                     *g:fzf_gitignore_no_maps*
+Set this option to disable all key mappings.
+>
+  let g:fzf_gitignore_no_maps = 1
+<
+Default: Not defined (number)
+
+                                                         *g:fzf_gitignore_map*
+Set this option to change the |<Plug>(fzf-gitignore)| key mapping.
+>
+  let g:fzf_gitignore_map = '<Leader>i'
+<
+Default: '<Leader>gi' (string)
+
+==============================================================================
+COMMANDS                                              *fzf-gitignore-commands*
+
+                                                               *:FzfGitignore*
+Create .gitignore file.
+
+==============================================================================
+MAPPINGS                                              *fzf-gitignore-mappings*
+
+ -----------------------------------+----------------------------------------
+  Mapping                           | Description                            ~
+ -----------------------------------+----------------------------------------
+  <Plug>(fzf-gitignore)             | Create .gitignore file
+ -----------------------------------+----------------------------------------
+
+==============================================================================
+LICENSE                                                *fzf-gitignore-license*
+
+MIT
+
+==============================================================================
+BUGS                                                      *fzf-gitignore-bugs*
+
+If you find a bug please create an issue on GitHub.
+
+https://github.com/fszymanski/fzf-gitignore/issues
+
+==============================================================================
+CONTRIBUTING                                      *fzf-gitignore-contributing*
+
+Think you can make this plugin better? Awesome. Fork it on GitHub and create
+a pull request.
+
+https://github.com/fszymanski/fzf-gitignore
+
+==============================================================================
+
+[1] https://github.com/junegunn/fzf
+[2] https://www.gitignore.io/
+[3] https://github.com/jupl/helm-gitignore
+
+ vim: tw=78 ts=8 ft=help norl
+
+endif

ftdetect/polyglot.vim

@@ -9,7 +9,7 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
-func! polyglot#Observe(fn)
+func! s:Observe(fn)
   let b:polyglot_observe = a:fn
   augroup polyglot-observer
     au! CursorHold,CursorHoldI,BufWritePost <buffer>
@@ -2023,13 +2023,19 @@ if !has_key(s:disabled_packages, 'tads')
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
 endif
 
+if !has_key(s:disabled_packages, 'gitignore')
+  au BufNewFile,BufRead *.git/info/exclude set ft=gitignore
+  au BufNewFile,BufRead */.config/git/ignore set ft=gitignore
+  au BufNewFile,BufRead {.,}gitignore set ft=gitignore
+endif
+
 
 
 au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#Observe('Shebang') | endif
+      \ call s:Observe('Shebang') | endif
 
 augroup END
 
@@ -2126,7 +2132,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
-        let &shiftwidth=&tabstop
+        let &l:shiftwidth=&tabstop
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
@@ -2139,7 +2145,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
     if minindent < 10
       setlocal expandtab
-      let &shiftwidth=minindent
+      let &l:shiftwidth=minindent
       let b:sleuth_culprit .= ':' . i
       return 1
     endif

ftplugin/gitignore.vim

@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = 'setlocal commentstring<'
+
+" vim: ts=2 et sw=2
+
+endif

packages.yaml

@@ -1882,3 +1882,12 @@ filetypes:
 - name: tads
   extensions:
   - t
+---
+name: gitignore
+remote: fszymanski/fzf-gitignore
+filetypes:
+- name: gitignore
+  filenames:
+  - '.gitignore'
+  - '*/.config/git/ignore'
+  - '*.git/info/exclude'

polyglot.vim

@@ -77,7 +77,7 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
-func! polyglot#Observe(fn)
+func! s:Observe(fn)
   let b:polyglot_observe = a:fn
   augroup polyglot-observer
     au! CursorHold,CursorHoldI,BufWritePost <buffer>
@@ -171,7 +171,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#Observe('Shebang') | endif
+      \ call s:Observe('Shebang') | endif
 
 augroup END
 
@@ -268,7 +268,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
-        let &shiftwidth=&tabstop
+        let &l:shiftwidth=&tabstop
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
@@ -281,7 +281,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
     if minindent < 10
       setlocal expandtab
-      let &shiftwidth=minindent
+      let &l:shiftwidth=minindent
       let b:sleuth_culprit .= ':' . i
       return 1
     endif

scripts/build

@@ -697,7 +697,7 @@ def generate_plugins(packages)
   for package in packages
     for filetype in package["filetypes"]
       extensions = (filetype["extensions"] || []).map { |e| "*.#{e}" }
-      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) || e[0] == "." }
+      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) }
       patterns[filetype["name"]].concat(extensions)
       patterns[filetype["name"]].concat(files)
     end

syntax/basic/type.vim

@@ -56,6 +56,7 @@ syntax cluster typescriptPrimaryType contains=
   \ typescriptTupleType,
   \ typescriptTypeQuery,
   \ typescriptStringLiteralType,
+  \ typescriptTemplateLiteralType,
   \ typescriptReadonlyArrayKeyword,
   \ typescriptAssertType
 
@@ -64,6 +65,17 @@ syntax region  typescriptStringLiteralType contained
   \ nextgroup=typescriptUnion
   \ skipwhite skipempty
 
+syntax region  typescriptTemplateLiteralType contained
+  \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
+  \ contains=typescriptTemplateSubstitutionType
+  \ nextgroup=typescriptTypeOperator
+  \ skipwhite skipempty
+
+syntax region  typescriptTemplateSubstitutionType matchgroup=typescriptTemplateSB
+  \ start=/\${/ end=/}/
+  \ contains=@typescriptType
+  \ contained
+
 syntax region typescriptParenthesizedType matchgroup=typescriptParens
   \ start=/(/ end=/)/
   \ contains=@typescriptType
@@ -103,10 +115,12 @@ syntax region typescriptTupleType matchgroup=typescriptBraces
   \ contained skipwhite
 
 syntax cluster typescriptTypeOperator
-  \ contains=typescriptUnion,typescriptTypeBracket
+  \ contains=typescriptUnion,typescriptTypeBracket,typescriptConstraint,typescriptConditionalType
 
 syntax match typescriptUnion /|\|&/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
 
+syntax match typescriptConditionalType /?\|:/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
+
 syntax cluster typescriptFunctionType contains=typescriptGenericFunc,typescriptFuncType
 syntax region typescriptGenericFunc matchgroup=typescriptTypeBrackets
   \ start=/</ end=/>/

syntax/common.vim

@@ -71,6 +71,7 @@ if exists("did_typescript_hilink")
   HiLink typescriptString               String
   HiLink typescriptSpecial              Special
   HiLink typescriptStringLiteralType    String
+  HiLink typescriptTemplateLiteralType  String
   HiLink typescriptStringMember         String
   HiLink typescriptTemplate             String
   HiLink typescriptEventString          String

syntax/elixir.vim

@@ -20,10 +20,6 @@ syn keyword elixirTodo FIXME NOTE TODO OPTIMIZE XXX HACK contained
 
 syn match elixirId '\<[_a-zA-Z]\w*[!?]\?\>' contains=elixirUnusedVariable
 
-syn match elixirFunctionCall '\<[a-z_]\w*[!?]\?\(\s*\.\?\s*(\|\s\+[a-zA-Z0-9@:\'\"\[]\)\@='
-syn match elixirFunctionCall '\(:\w\+\s*\.\s*\|[A-Z]\w*\s*\.\s*\)\@<=[a-z_]\w*[!?]\?'
-syn match elixirFunctionCall '\(>\s+\)\<[a-z_]\w*[!?]\?'
-
 syn match elixirKeyword '\(\.\)\@<!\<\(for\|case\|when\|with\|cond\|if\|unless\|try\|receive\|after\|raise\|rescue\|catch\|else\|quote\|unquote\|super\|unquote_splicing\)\>:\@!'
 
 syn keyword elixirInclude import require alias use
@@ -48,7 +44,7 @@ syn match   elixirOperator '\~>\|\~>>\|<\~\|<<\~\|<\~>'
 
 syn match   elixirAlias '\([a-z]\)\@<![A-Z]\w*\%(\.[A-Z]\w*\)*'
 
-syn match   elixirAtom '\(:\)\@<!:\%([a-zA-Z_]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)'
+syn match   elixirAtom '\(:\)\@<!:\%([a-zA-Z_*]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)'
 syn match   elixirAtom '\(:\)\@<!:\%(<=>\|&&\?\|%\(()\|\[\]\|{}\)\|++\?\|--\?\|||\?\|!\|//\|[%&`/|]\)'
 syn match   elixirAtom "\%([a-zA-Z_]\w*[?!]\?\):\(:\)\@!"
 

syntax/gitignore.vim

@@ -0,0 +1,33 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+if exists('b:current_syntax')
+  finish
+endif
+
+" https://git-scm.com/docs/gitignore#_pattern_format
+syntax keyword gitignoreTodo TODO FIXME XXX NOTE SEE contained
+syntax match gitignoreComment '^#.*' contains=gitignoreTodo
+syntax match gitignoreComment '\s#.*'ms=s+1 contains=gitignoreTodo
+syntax match gitignoreNegation '^!'
+syntax match gitignoreSeparator '/'
+syntax match gitignoreWildcard '\(\\\)\@<![*?]'
+syntax region gitignoreSet start='\[' skip='\\\]' end='\]'
+
+highlight default link gitignoreTodo Todo
+highlight default link gitignoreComment Comment
+highlight default link gitignoreNegation Exception
+highlight default link gitignoreSeparator Constant
+highlight default link gitignoreWildcard Special
+highlight default link gitignoreSet Character
+
+let b:current_syntax = 'gitignore'
+
+" vim: ts=2 et sw=2
+
+endif

tests/extensions.vim

@@ -368,3 +368,6 @@ call TestExtension("htmldjango", "jinja2.html", "{% for item in navigation %}{%
 call TestExtension("htmldjango", "jinja3.html", "{% block head %}")
 call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
 call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
+
+" .gitignore
+call TestExtension("gitignore", ".gitignore", "")

tests/filetypes.vim

@@ -236,3 +236,4 @@ call TestFiletype('odin')
 call TestFiletype('bzl')
 call TestFiletype('prolog')
 call TestFiletype('tads')
+call TestFiletype('gitignore')