diff options
| -rw-r--r-- | runtime/filetype.vim | 1 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index e72d6fc0c0..5fee083977 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -817,6 +817,7 @@ au BufNewFile,BufRead *.t.html setf tilde " HTML (.shtml and .stm for server side) au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm call dist#ft#FThtml() +au BufNewFile,BufRead *.cshtml setf html " HTML with Ruby - eRuby au BufNewFile,BufRead *.erb,*.rhtml setf eruby diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 420d343a8a..1297ef6241 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -142,6 +142,7 @@ local extension = { cs = "cs", csc = "csc", csdl = "csdl", + cshtml = "html", fdr = "csp", csp = "csp", css = "css", diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 7a52d0a044..6872eb3bb7 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -258,6 +258,7 @@ let s:filename_checks = { \ 'rnoweb': ['file.rnw', 'file.snw'], \ 'rrst': ['file.rrst', 'file.srst'], \ 'template': ['file.tmpl'], + \ 'html': ['file.html', 'file.htm', 'file.cshtml'], \ 'htmlm4': ['file.html.m4'], \ 'httest': ['file.htt', 'file.htb'], \ 'ibasic': ['file.iba', 'file.ibi'], |