aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-04-10 13:53:33 +0200
committerGitHub <noreply@github.com>2022-04-10 13:53:33 +0200
commitb438bb434305a89457f1c565363f07326d4c5353 (patch)
treeedf409a011048e9ecea4f1cfb526705948530c7b /runtime
parentb531e4ea337e4ed86913d59777c5b6b15059a719 (diff)
downloadrneovim-b438bb434305a89457f1c565363f07326d4c5353.tar.gz
rneovim-b438bb434305a89457f1c565363f07326d4c5353.tar.bz2
rneovim-b438bb434305a89457f1c565363f07326d4c5353.zip
vim-patch:8.2.4729: HEEx and Surface templates do not need a separate filetype (#18065)
Problem: HEEx and Surface templates do not need a separate filetype. Solution: Use Eelixir for the similar filetypes. (Aaron Tinio, closes vim/vim#10124) https://github.com/vim/vim/commit/fa76a24109f3c3287e4ee17b6270bfd5310c12f3
Diffstat (limited to 'runtime')
-rw-r--r--runtime/filetype.vim10
-rw-r--r--runtime/lua/vim/filetype.lua4
2 files changed, 4 insertions, 10 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c5690ba716..d28c13e16c 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
+" Elixir, also used for HEEx and Surface
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
au BufRead,BufNewFile *.elv setf elvish
@@ -793,9 +793,6 @@ 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
@@ -1901,9 +1898,6 @@ 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 880b99a2fa..a4d0264384 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -173,7 +173,9 @@ local extension = {
lid = "dylanlid",
ecd = "ecd",
eex = "eelixir",
+ heex = "eelixir",
leex = "eelixir",
+ sface = "eelixir",
exs = "elixir",
elm = "elm",
elv = "elvish",
@@ -267,7 +269,6 @@ local extension = {
ev = "hercules",
vc = "hercules",
hcl = "hcl",
- heex = "heex",
hex = "hex",
["h32"] = "hex",
hjson = "hjson",
@@ -644,7 +645,6 @@ local extension = {
mata = "stata",
ado = "stata",
stp = "stp",
- sface = "surface",
svelte = "svelte",
svg = "svg",
swift = "swift",