diff options
| -rw-r--r-- | runtime/filetype.vim | 10 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index d28c13e16c..c5690ba716 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -412,9 +412,9 @@ au BufNewFile,BufRead *Eterm/*.cfg setf eterm " Elixir or Euphoria au BufNewFile,BufRead *.ex call dist#ft#ExCheck() -" Elixir, also used for HEEx and Surface +" Elixir au BufRead,BufNewFile mix.lock,*.exs setf elixir -au BufRead,BufNewFile *.eex,*.heex,*.leex,*.sface setf eelixir +au BufRead,BufNewFile *.eex,*.leex setf eelixir " Elvish au BufRead,BufNewFile *.elv setf elvish @@ -793,6 +793,9 @@ au BufRead,BufNewFile *.hcl setf hcl " Hercules au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum setf hercules +" HEEx +au BufRead,BufNewFile *.heex setf heex + " HEX (Intel) au BufNewFile,BufRead *.hex,*.h32 setf hex @@ -1898,6 +1901,9 @@ au BufNewFile,BufRead */etc/sudoers,sudoers.tmp setf sudoers " SVG (Scalable Vector Graphics) au BufNewFile,BufRead *.svg setf svg +" Surface +au BufRead,BufNewFile *.sface setf surface + " Tads (or Nroff or Perl test file) au BufNewFile,BufRead *.t \ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index a4d0264384..880b99a2fa 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -173,9 +173,7 @@ local extension = { lid = "dylanlid", ecd = "ecd", eex = "eelixir", - heex = "eelixir", leex = "eelixir", - sface = "eelixir", exs = "elixir", elm = "elm", elv = "elvish", @@ -269,6 +267,7 @@ local extension = { ev = "hercules", vc = "hercules", hcl = "hcl", + heex = "heex", hex = "hex", ["h32"] = "hex", hjson = "hjson", @@ -645,6 +644,7 @@ local extension = { mata = "stata", ado = "stata", stp = "stp", + sface = "surface", svelte = "svelte", svg = "svg", swift = "swift", diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index fbf02989ea..aeb6e12ead 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -166,7 +166,7 @@ let s:filename_checks = { \ 'edif': ['file.edf', 'file.edif', 'file.edo'], \ 'elinks': ['elinks.conf'], \ 'elixir': ['file.ex', 'file.exs', 'mix.lock'], - \ 'eelixir': ['file.eex', 'file.heex', 'file.leex', 'file.sface'], + \ 'eelixir': ['file.eex', 'file.leex'], \ 'elm': ['file.elm'], \ 'elmfilt': ['filter-rules'], \ 'elvish': ['file.elv'], @@ -237,6 +237,7 @@ let s:filename_checks = { \ 'hb': ['file.hb'], \ 'hcl': ['file.hcl'], \ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'], + \ 'heex': ['file.heex'], \ 'hex': ['file.hex', 'file.h32'], \ 'hgcommit': ['hg-editor-file.txt'], \ 'hjson': ['file.hjson'], @@ -515,6 +516,7 @@ let s:filename_checks = { \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'], \ 'stp': ['file.stp'], \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'], + \ 'surface': ['file.sface'], \ 'svg': ['file.svg'], \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'], \ 'swift': ['file.swift'], @@ -902,6 +904,7 @@ func Test_dat_file() call assert_equal('dat', &filetype) bwipe! call delete('datfile.DAT') + unlet g:filetype_dat filetype off endfunc @@ -1496,6 +1499,7 @@ func Test_src_file() call assert_equal('src', &filetype) bwipe! call delete('srcfile.SRC') + unlet g:filetype_src filetype off endfunc |