Fix many extensions detection

2025-11-13 05:53:50 -05:00 · 2020-09-28 03:00:01 +02:00
parent 692db4dc29
commit 6a086b0c79
5 changed files with 46 additions and 23 deletions
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -152,19 +152,19 @@ let s:globs = {
  \ 'omake': '*.om,OMakefile,OMakeroot,OMakeroot.in',
  \ '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,.php,.php_cs,.php_cs.dist,Phakefile',
+  \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc,.gitolite.rc',
+  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,.php,.php_cs,.php_cs.dist,Phakefile',
  \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
  \ 'pod': '*.pod',
  \ 'pony': '*.pony',
-  \ 'prolog': '*.pl,*.pro,*.prolog,*.yap',
+  \ 'prolog': '*.pl,*.pro,*.prolog,*.yap,*.pdb',
  \ 'proto': '*.proto',
  \ 'ps1': '*.ps1,*.psd1,*.psm1,*.pssc',
  \ 'ps1xml': '*.ps1xml',
  \ '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,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript',
+  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,*.ptl,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript,.pythonrc,.pythonstartup',
  \ 'qmake': '*.pro,*.pri',
  \ 'qml': '*.qml,*.qbs',
  \ 'r': '*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist',
@@ -183,7 +183,7 @@ let s:globs = {
  \ 'scala': '*.scala,*.kojo,*.sc',
  \ 'scss': '*.scss',
  \ 'sexplib': '*.sexp',
-  \ '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',
+  \ '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,zlogin,zlogout,zprofile,zshenv,zshrc',
  \ 'slim': '*.slim',
  \ 'slime': '*.slime',
  \ 'smt2': '*.smt2,*.smt',
@@ -218,7 +218,7 @@ 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,*.fglrxrc,.classpath,.cproject,.project,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,*fglrxrc',
  \ 'xml.twig': '*.xml.twig',
  \ 'xs': '*.xs',
  \ 'xsl': '*.xslt,*.xsl',
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -367,11 +367,11 @@ if !has_key(s:disabled_packages, 'opencl')
 endif

 if !has_key(s:disabled_packages, 'perl')
-  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t,*.pod,*.mason,*.mhtml,*.comp,*.xs
+  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t,example.gitolite.rc,.gitolite.rc,*.pod,*.mason,*.mhtml,*.comp,*.xs
 endif

 if !has_key(s:disabled_packages, 'php')
-  au! BufRead,BufNewFile *.php,*.ctp
+  au! BufRead,BufNewFile *.php,*.ctp,*.phtml
 endif

 if !has_key(s:disabled_packages, 'protobuf')
@@ -383,7 +383,7 @@ if !has_key(s:disabled_packages, 'puppet')
 endif

 if !has_key(s:disabled_packages, 'python')
-  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,SConstruct
+  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,*.ptl,SConstruct,.pythonrc,.pythonstartup
 endif

 if !has_key(s:disabled_packages, 'r-lang')
@@ -502,6 +502,10 @@ if !has_key(s:disabled_packages, 'bzl')
  au! BufRead,BufNewFile *.bzl,*.bazel,*.BUILD,BUILD,WORKSPACE
 endif

+if !has_key(s:disabled_packages, 'prolog')
+  au! BufRead,BufNewFile *.pdb
+endif
+
 if !has_key(s:disabled_packages, 'tads')
  au! BufRead,BufNewFile *.t
 endif
@@ -614,7 +618,6 @@ if !has_key(s:disabled_packages, 'xml')
  au BufNewFile,BufRead *.ditaval set ft=xml
  au BufNewFile,BufRead *.dll.config set ft=xml
  au BufNewFile,BufRead *.dotsettings set ft=xml
-  au BufNewFile,BufRead *.fglrxrc set ft=xml
  au BufNewFile,BufRead *.filters set ft=xml
  au BufNewFile,BufRead *.fsproj set ft=xml
  au BufNewFile,BufRead *.fxml set ft=xml
@@ -695,6 +698,7 @@ if !has_key(s:disabled_packages, 'xml')
  au BufNewFile,BufRead */etc/blkid.tab set ft=xml
  au BufNewFile,BufRead */etc/blkid.tab.old set ft=xml
  au BufNewFile,BufRead */etc/xdg/menus/*.menu set ft=xml
+  au BufNewFile,BufRead *fglrxrc set ft=xml
  au BufNewFile,BufRead {.,}classpath set ft=xml
  au BufNewFile,BufRead {.,}cproject set ft=xml
  au BufNewFile,BufRead {.,}project set ft=xml
@@ -1456,10 +1460,12 @@ if !has_key(s:disabled_packages, 'perl')
  au BufNewFile,BufRead *.ph set ft=perl
  au BufNewFile,BufRead *.plx set ft=perl
  au BufNewFile,BufRead *.psgi set ft=perl
+  au BufNewFile,BufRead {.,}gitolite.rc set ft=perl
  au BufNewFile,BufRead Makefile.PL set ft=perl
  au BufNewFile,BufRead Rexfile set ft=perl
  au BufNewFile,BufRead ack set ft=perl
  au BufNewFile,BufRead cpanfile set ft=perl
+  au BufNewFile,BufRead example.gitolite.rc set ft=perl
  au BufNewFile,BufRead *.pod set ft=pod
  au BufNewFile,BufRead *.comp set ft=mason
  au BufNewFile,BufRead *.mason set ft=mason
@@ -1490,6 +1496,7 @@ if !has_key(s:disabled_packages, 'php')
  au BufNewFile,BufRead *.php5 set ft=php
  au BufNewFile,BufRead *.phps set ft=php
  au BufNewFile,BufRead *.phpt set ft=php
+  au BufNewFile,BufRead *.phtml set ft=php
  au BufNewFile,BufRead {.,}php set ft=php
  au BufNewFile,BufRead {.,}php_cs set ft=php
  au BufNewFile,BufRead {.,}php_cs.dist set ft=php
@@ -1546,6 +1553,7 @@ if !has_key(s:disabled_packages, 'python')
  au BufNewFile,BufRead *.gyp set ft=python
  au BufNewFile,BufRead *.gypi set ft=python
  au BufNewFile,BufRead *.lmi set ft=python
+  au BufNewFile,BufRead *.ptl set ft=python
  au BufNewFile,BufRead *.py set ft=python
  au BufNewFile,BufRead *.py3 set ft=python
  au BufNewFile,BufRead *.pyde set ft=python
@@ -1560,6 +1568,8 @@ if !has_key(s:disabled_packages, 'python')
  au BufNewFile,BufRead *.wsgi set ft=python
  au BufNewFile,BufRead *.xpy set ft=python
  au BufNewFile,BufRead {.,}gclient set ft=python
+  au BufNewFile,BufRead {.,}pythonrc set ft=python
+  au BufNewFile,BufRead {.,}pythonstartup set ft=python
  au BufNewFile,BufRead DEPS set ft=python
  au BufNewFile,BufRead SConscript set ft=python
  au BufNewFile,BufRead SConstruct set ft=python
@@ -1772,6 +1782,11 @@ if !has_key(s:disabled_packages, 'sh')
  au BufNewFile,BufRead login set ft=sh
  au BufNewFile,BufRead man set ft=sh
  au BufNewFile,BufRead profile set ft=sh
+  au BufNewFile,BufRead zlogin set ft=sh
+  au BufNewFile,BufRead zlogout set ft=sh
+  au BufNewFile,BufRead zprofile set ft=sh
+  au BufNewFile,BufRead zshenv set ft=sh
+  au BufNewFile,BufRead zshrc set ft=sh
  au BufNewFile,BufRead *.zsh set ft=zsh
  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
  au BufNewFile,BufRead {.,}zfbfmarks set ft=zsh
@@ -2037,6 +2052,7 @@ if !has_key(s:disabled_packages, 'bzl')
 endif

 if !has_key(s:disabled_packages, 'prolog')
+  au BufNewFile,BufRead *.pdb set ft=prolog
  au BufNewFile,BufRead *.pro set ft=prolog
  au BufNewFile,BufRead *.prolog set ft=prolog
  au BufNewFile,BufRead *.yap set ft=prolog
--- a/packages.yaml
+++ b/packages.yaml
@@ -1176,6 +1176,9 @@ remote: vim-perl/vim-perl
 filetypes:
 - name: perl
  linguist: Perl
+  extra_filenames:
+  - example.gitolite.rc
+  - .gitolite.rc
 - name: pod
  extensions:
  - pod
@@ -1215,6 +1218,8 @@ remote: StanAngeloff/php.vim
 filetypes:
 - name: php
  linguist: PHP
+  extra_extensions:
+  - phtml
 ---
 name: blade
 remote: jwalton512/vim-blade
@@ -1284,6 +1289,11 @@ filetypes:
  linguist: Python
  ignored_filenames:
  - 'lit.*cfg'
+  extra_extensions:
+  - ptl
+  extra_filenames:
+  - '.pythonrc'
+  - '.pythonstartup'
 ---
 name: python-indent
 remote: Vimjas/vim-python-pep8-indent
@@ -1487,13 +1497,8 @@ filetypes:
  - '.zlogin'
  - '.zprofile'
  - '.zlogout'
-  - 'zshrc'
-  - 'zshenv'
-  - 'zlogin'
-  - 'zprofile'
-  - 'zlogout'
-  extra_filenames:
  # Udev symlinks config
+  extra_filenames:
  - '*/etc/udev/cdsymlinks.conf'
 - name: zsh
  extensions:
@@ -1743,11 +1748,11 @@ filetypes:
  - tpm
  - csproj.user
  - wpl
-  - fglrxrc
  extra_filenames:
  - '*/etc/blkid.tab'
  - '*/etc/blkid.tab.old'
  - '*/etc/xdg/menus/*.menu'
+  - '*fglrxrc'
  ignored_extensions:
  - ts
  - tsx
@@ -1869,8 +1874,6 @@ filetypes:
  - '*/etc/yum.repos.d/*'
  ignored_extensions:
  - cfg
-  ignored_warnings:
-  - '*.php.ini'
 ---
 name: odin
 remote: Tetralux/odin.vim
@@ -1894,6 +1897,8 @@ glob: '**/prolog.vim'
 filetypes:
 - name: prolog
  linguist: Prolog
+  extra_extensions:
+  - pdb
 ---
 name: tads
 remote: vim/vim:runtime
--- a/scripts/build
+++ b/scripts/build
@@ -747,10 +747,7 @@ def show_warnings(all_filetypes, expected_filetypes)
  end]

  for name, e in all_expected - all_handled
-    if all_handled.include?([name, e.split('/').last.gsub('*', '')])
-      next
-    end
-    if e.include?('*') && all_handled_regexps[name].match?(e)
+    if all_handled_regexps[name].match?(e)
      next
    end
    puts "Missing for #{name}: #{e}"
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -371,3 +371,8 @@ call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")

 " .gitignore
 call TestExtension("gitignore", ".gitignore", "")
+
+" .xml
+
+call TestExtension("xml", ".fglrxrc", "")
+call TestExtension("xml", "fglrxrc", "")