IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4729: HEEx and Surface templates do not need a separate filetype (#18065)

Browse Source 
Problem:    HEEx and Surface templates do not need a separate filetype.
Solution:   Use Eelixir for the similar filetypes. (Aaron Tinio, closes vim/vim#10124)
fa76a24109
This commit is contained in:
Christian Clason 2022-04-10 13:53:33 +02:00 committed by GitHub
parent b531e4ea33
commit b438bb4343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/filetype.vim
View File

@ -412,9 +412,9 @@ au BufNewFile,BufRead *Eterm/*.cfg setf eterm
" Elixir or Euphoria " Elixir or Euphoria
au BufNewFile,BufRead *.ex call dist#ft#ExCheck() au BufNewFile,BufRead *.ex call dist#ft#ExCheck()
" Elixir " Elixir, also used for HEEx and Surface
au BufRead,BufNewFile mix.lock,*.exs setf elixir au BufRead,BufNewFile mix.lock,*.exs setf elixir
au BufRead,BufNewFile *.eex,*.leex setf eelixir au BufRead,BufNewFile *.eex,*.heex,*.leex,*.sface setf eelixir
" Elvish " Elvish
au BufRead,BufNewFile *.elv setf elvish au BufRead,BufNewFile *.elv setf elvish
@ -793,9 +793,6 @@ au BufRead,BufNewFile *.hcl setf hcl
" Hercules " Hercules
au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum setf hercules au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum setf hercules
" HEEx
au BufRead,BufNewFile *.heex setf heex
" HEX (Intel) " HEX (Intel)
au BufNewFile,BufRead *.hex,*.h32 setf hex au BufNewFile,BufRead *.hex,*.h32 setf hex
@ -1901,9 +1898,6 @@ au BufNewFile,BufRead */etc/sudoers,sudoers.tmp setf sudoers
" SVG (Scalable Vector Graphics) " SVG (Scalable Vector Graphics)
au BufNewFile,BufRead *.svg setf svg au BufNewFile,BufRead *.svg setf svg
" Surface
au BufRead,BufNewFile *.sface setf surface
" Tads (or Nroff or Perl test file) " Tads (or Nroff or Perl test file)
au BufNewFile,BufRead *.t au BufNewFile,BufRead *.t
\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif \ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif

4
runtime/lua/vim/filetype.lua
View File

@ -173,7 +173,9 @@ local extension = {
lid = "dylanlid", lid = "dylanlid",
ecd = "ecd", ecd = "ecd",
eex = "eelixir", eex = "eelixir",
heex = "eelixir",
leex = "eelixir", leex = "eelixir",
sface = "eelixir",
exs = "elixir", exs = "elixir",
elm = "elm", elm = "elm",
elv = "elvish", elv = "elvish",
@ -267,7 +269,6 @@ local extension = {
ev = "hercules", ev = "hercules",
vc = "hercules", vc = "hercules",
hcl = "hcl", hcl = "hcl",
heex = "heex",
hex = "hex", hex = "hex",
["h32"] = "hex", ["h32"] = "hex",
hjson = "hjson", hjson = "hjson",
@ -644,7 +645,6 @@ local extension = {
mata = "stata", mata = "stata",
ado = "stata", ado = "stata",
stp = "stp", stp = "stp",
sface = "surface",
svelte = "svelte", svelte = "svelte",
svg = "svg", svg = "svg",
swift = "swift", swift = "swift",

4
src/nvim/testdir/test_filetype.vim
View File

@ -166,7 +166,7 @@ let s:filename_checks = {
\ 'edif': ['file.edf', 'file.edif', 'file.edo'], \ 'edif': ['file.edf', 'file.edif', 'file.edo'],
\ 'elinks': ['elinks.conf'], \ 'elinks': ['elinks.conf'],
\ 'elixir': ['file.ex', 'file.exs', 'mix.lock'], \ 'elixir': ['file.ex', 'file.exs', 'mix.lock'],
\ 'eelixir': ['file.eex', 'file.leex'], \ 'eelixir': ['file.eex', 'file.heex', 'file.leex', 'file.sface'],
\ 'elm': ['file.elm'], \ 'elm': ['file.elm'],
\ 'elmfilt': ['filter-rules'], \ 'elmfilt': ['filter-rules'],
\ 'elvish': ['file.elv'], \ 'elvish': ['file.elv'],
@ -237,7 +237,6 @@ let s:filename_checks = {
\ 'hb': ['file.hb'], \ 'hb': ['file.hb'],
\ 'hcl': ['file.hcl'], \ 'hcl': ['file.hcl'],
\ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'], \ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'],
\ 'heex': ['file.heex'],
\ 'hex': ['file.hex', 'file.h32'], \ 'hex': ['file.hex', 'file.h32'],
\ 'hgcommit': ['hg-editor-file.txt'], \ 'hgcommit': ['hg-editor-file.txt'],
\ 'hjson': ['file.hjson'], \ 'hjson': ['file.hjson'],
@ -516,7 +515,6 @@ let s:filename_checks = {
\ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'], \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'],
\ 'stp': ['file.stp'], \ 'stp': ['file.stp'],
\ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'], \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'],
\ 'surface': ['file.sface'],
\ 'svg': ['file.svg'], \ 'svg': ['file.svg'],
\ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'], \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
\ 'swift': ['file.swift'], \ 'swift': ['file.swift'],