From: zeertzjq Date: Sat, 28 Dec 2024 15:24:30 +0000 (+0100) Subject: patch 9.1.0968: tests: GetFileNameChecks() isn't fully sorted by filetype name X-Git-Tag: v9.1.0968^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e51043ad9f8e07d4c0a1e0056a8f8853e08f6a30;p=thirdparty%2Fvim.git patch 9.1.0968: tests: GetFileNameChecks() isn't fully sorted by filetype name Problem: tests: GetFileNameChecks() isn't fully sorted by filetype name Solution: re-sort the list closes: #16322 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 6b1f0fb8ea..5830c3dc26 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -127,11 +127,11 @@ def s:GetFilenameChecks(): dict> ave: ['file.ave'], awk: ['file.awk', 'file.gawk'], b: ['file.mch', 'file.ref', 'file.imp'], - basic: ['file.bas', 'file.bi', 'file.bm'], bash: ['.bashrc', '.bash_profile', '.bash-profile', '.bash_logout', '.bash-logout', '.bash_aliases', '.bash-aliases', '.bash_history', '.bash-history', '/tmp/bash-fc-3Ozjlw', '/tmp/bash-fc.3Ozjlw', 'PKGBUILD', 'file.bash', 'file.bats', 'file.cygport'], + basic: ['file.bas', 'file.bi', 'file.bm'], bass: ['file.bass'], bc: ['file.bc'], bdf: ['file.bdf'], @@ -158,6 +158,7 @@ def s:GetFilenameChecks(): dict> calendar: ['calendar', '/.calendar/file', '/share/calendar/any/calendar.file', '/share/calendar/calendar.file', 'any/share/calendar/any/calendar.file', 'any/share/calendar/calendar.file'], capnp: ['file.capnp'], catalog: ['catalog', 'sgml.catalogfile', 'sgml.catalog', 'sgml.catalog-file'], + cdc: ['file.cdc'], cdl: ['file.cdl'], cdrdaoconf: ['/etc/cdrdao.conf', '/etc/defaults/cdrdao', '/etc/default/cdrdao', '.cdrdao', 'any/etc/cdrdao.conf', 'any/etc/default/cdrdao', 'any/etc/defaults/cdrdao'], cdrtoc: ['file.toc'], @@ -200,8 +201,8 @@ def s:GetFilenameChecks(): dict> csdl: ['file.csdl'], csp: ['file.csp', 'file.fdr'], css: ['file.css'], - cterm: ['file.con'], csv: ['file.csv'], + cterm: ['file.con'], cucumber: ['file.feature'], cuda: ['file.cu', 'file.cuh'], cue: ['file.cue'], @@ -216,11 +217,11 @@ def s:GetFilenameChecks(): dict> dart: ['file.dart', 'file.drt'], datascript: ['file.ds'], dcd: ['file.dcd'], + deb822sources: ['/etc/apt/sources.list.d/file.sources', 'any/etc/apt/sources.list.d/file.sources'], debchangelog: ['changelog.Debian', 'changelog.dch', 'NEWS.Debian', 'NEWS.dch', '/debian/changelog'], debcontrol: ['/debian/control', 'any/debian/control', 'any/DEBIAN/control'], debcopyright: ['/debian/copyright', 'any/debian/copyright'], debsources: ['/etc/apt/sources.list', '/etc/apt/sources.list.d/file.list', 'any/etc/apt/sources.list', 'any/etc/apt/sources.list.d/file.list'], - deb822sources: ['/etc/apt/sources.list.d/file.sources', 'any/etc/apt/sources.list.d/file.sources'], def: ['file.def'], denyhosts: ['denyhosts.conf'], desc: ['file.desc'], @@ -358,9 +359,9 @@ def s:GetFilenameChecks(): dict> hostsaccess: ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'], # file.component.html should be HTML, not Angular, see #13594 html: ['file.html', 'file.htm', 'file.cshtml', 'file.component.html'], - http: ['file.http'], htmlm4: ['file.html.m4'], httest: ['file.htt', 'file.htb'], + http: ['file.http'], hurl: ['file.hurl'], hy: ['file.hy', '.hy-history'], hyprlang: ['hyprlock.conf', 'hyprland.conf', 'hypridle.conf', 'hyprpaper.conf', '/hypr/foo.conf'], @@ -391,9 +392,9 @@ def s:GetFilenameChecks(): dict> jgraph: ['file.jgr'], jinja: ['file.jinja'], jj: ['file.jjdescription'], - jq: ['file.jq'], jovial: ['file.jov', 'file.j73', 'file.jovial'], jproperties: ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'], + jq: ['file.jq'], json: ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', 'file.jupyterlab-settings', '.prettierrc', '.firebaserc', '.stylelintrc', '.lintstagedrc', 'file.slnf', 'file.sublime-project', 'file.sublime-settings', 'file.sublime-workspace', 'file.bd', 'file.bda', 'file.xci', 'flake.lock', 'pack.mcmeta', 'deno.lock'], @@ -433,13 +434,13 @@ def s:GetFilenameChecks(): dict> lilo: ['lilo.conf', 'lilo.conf-file'], lilypond: ['file.ly', 'file.ily'], limits: ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf', '/etc/limits.conf', '/etc/limits.d/file.conf', '/etc/some-limits.conf', '/etc/some-limits.d/file.conf', 'any/etc/limits', 'any/etc/limits.conf', 'any/etc/limits.d/file.conf', 'any/etc/some-limits.conf', 'any/etc/some-limits.d/file.conf'], - liquidsoap: ['file.liq'], liquid: ['file.liquid'], + liquidsoap: ['file.liq'], lisp: ['file.lsp', 'file.lisp', 'file.asd', 'file.el', '.emacs', '.sawfishrc', 'sbclrc', '.sbclrc'], lite: ['file.lite', 'file.lt'], litestep: ['/LiteStep/any/file.rc', 'any/LiteStep/any/file.rc'], - logcheck: ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'], livebook: ['file.livemd'], + logcheck: ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'], loginaccess: ['/etc/login.access', 'any/etc/login.access'], logindefs: ['/etc/login.defs', 'any/etc/login.defs'], logtalk: ['file.lgt'], @@ -511,6 +512,7 @@ def s:GetFilenameChecks(): dict> mmp: ['file.mmp'], modconf: ['/etc/modules.conf', '/etc/modules', '/etc/conf.modules', '/etc/modprobe.file', 'any/etc/conf.modules', 'any/etc/modprobe.file', 'any/etc/modules', 'any/etc/modules.conf'], modula3: ['file.m3', 'file.mg', 'file.i3', 'file.ig', 'file.lm3'], + mojo: ['file.mojo', 'file.🔥'], monk: ['file.isc', 'file.monk', 'file.ssc', 'file.tsc'], moo: ['file.moo'], moonscript: ['file.moon'], @@ -519,10 +521,9 @@ def s:GetFilenameChecks(): dict> mplayerconf: ['mplayer.conf', '/.mplayer/config', 'any/.mplayer/config'], mrxvtrc: ['mrxvtrc', '.mrxvtrc'], msidl: ['file.odl', 'file.mof'], - mss: ['file.mss'], - msql: ['file.msql'], - mojo: ['file.mojo', 'file.🔥'], msmtp: ['.msmtprc'], + msql: ['file.msql'], + mss: ['file.mss'], mupad: ['file.mu'], mush: ['file.mush'], mustache: ['file.mustache'], @@ -615,6 +616,7 @@ def s:GetFilenameChecks(): dict> promela: ['file.pml'], proto: ['file.proto'], protocols: ['/etc/protocols', 'any/etc/protocols'], + prql: ['file.prql'], ps1: ['file.ps1', 'file.psd1', 'file.psm1', 'file.pssc'], ps1xml: ['file.ps1xml'], psf: ['file.psf'], @@ -657,19 +659,20 @@ def s:GetFilenameChecks(): dict> rnc: ['file.rnc'], rng: ['file.rng'], rnoweb: ['file.rnw', 'file.snw'], - rpgle: ['file.rpgle', 'file.rpgleinc'], robot: ['file.robot', 'file.resource'], robots: ['robots.txt'], roc: ['file.roc'], ron: ['file.ron'], routeros: ['file.rsc'], rpcgen: ['file.x'], + rpgle: ['file.rpgle', 'file.rpgleinc'], rpl: ['file.rpl'], rrst: ['file.rrst', 'file.srst'], rst: ['file.rst'], rtf: ['file.rtf'], ruby: ['.irbrc', 'irbrc', '.irb_history', 'irb_history', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile', 'Vagrantfile'], rust: ['file.rs'], + sage: ['file.sage'], salt: ['file.sls'], samba: ['smb.conf'], sas: ['file.sas'], @@ -701,9 +704,7 @@ def s:GetFilenameChecks(): dict> sinda: ['file.sin', 'file.s85'], sisu: ['file.sst', 'file.ssm', 'file.ssi', 'file.-sst', 'file._sst', 'file.sst.meta', 'file.-sst.meta', 'file._sst.meta'], skill: ['file.il', 'file.ils', 'file.cdf'], - cdc: ['file.cdc'], slang: ['file.sl'], - sage: ['file.sage'], slice: ['file.ice'], slint: ['file.slint'], slpconf: ['/etc/slp.conf', 'any/etc/slp.conf'], @@ -729,7 +730,6 @@ def s:GetFilenameChecks(): dict> spyce: ['file.spy', 'file.spi'], sql: ['file.tyb', 'file.tyc', 'file.pkb', 'file.pks', '.sqlite_history'], sqlj: ['file.sqlj'], - prql: ['file.prql'], sqr: ['file.sqr', 'file.sqi'], squid: ['squid.conf'], squirrel: ['file.nut'], @@ -795,14 +795,13 @@ def s:GetFilenameChecks(): dict> 'any/etc/systemd/system/file.d/.#-file', 'any/etc/systemd/system/file.d/file.conf'], systemverilog: ['file.sv', 'file.svh'], - trace32: ['file.cmm', 'file.t32'], + tablegen: ['file.td'], tags: ['tags'], tak: ['file.tak'], tal: ['file.tal'], taskdata: ['pending.data', 'completed.data', 'undo.data'], taskedit: ['file.task'], tcl: ['file.tcl', 'file.tm', 'file.tk', 'file.itcl', 'file.itk', 'file.jacl', '.tclshrc', 'tclsh.rc', '.wishrc', '.tclsh-history', '.xsctcmdhistory', '.xsdbcmdhistory'], - tablegen: ['file.td'], teal: ['file.tl'], templ: ['file.templ'], template: ['file.tmpl'], @@ -822,6 +821,7 @@ def s:GetFilenameChecks(): dict> tmux: ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf', 'tmux.conf.local'], toml: ['file.toml', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config', '.black'], tpp: ['file.tpp'], + trace32: ['file.cmm', 'file.t32'], treetop: ['file.treetop'], trustees: ['trustees.conf'], tsalt: ['file.slt'], @@ -834,12 +834,12 @@ def s:GetFilenameChecks(): dict> 'typescript.glimmer': ['file.gts'], typescriptreact: ['file.tsx'], typespec: ['file.tsp'], - ungrammar: ['file.ungram'], uc: ['file.uc'], udevconf: ['/etc/udev/udev.conf', 'any/etc/udev/udev.conf'], udevperm: ['/etc/udev/permissions.d/file.permissions', 'any/etc/udev/permissions.d/file.permissions'], udevrules: ['/etc/udev/rules.d/file.rules', '/usr/lib/udev/rules.d/file.rules', '/lib/udev/rules.d/file.rules'], uil: ['file.uit', 'file.uil'], + ungrammar: ['file.ungram'], unison: ['file.u', 'file.uu'], updatedb: ['/etc/updatedb.conf', 'any/etc/updatedb.conf'], upstart: ['/usr/share/upstart/file.conf', '/usr/share/upstart/file.override', '/etc/init/file.conf', '/etc/init/file.override', '/.init/file.conf', '/.init/file.override', '/.config/upstart/file.conf', '/.config/upstart/file.override', 'any/.config/upstart/file.conf', 'any/.config/upstart/file.override', 'any/.init/file.conf', 'any/.init/file.override', 'any/etc/init/file.conf', 'any/etc/init/file.override', 'any/usr/share/upstart/file.conf', 'any/usr/share/upstart/file.override'], diff --git a/src/version.c b/src/version.c index 0815fc909e..e23a757f92 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 968, /**/ 967, /**/