aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-02 19:46:21 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-08-02 19:46:34 -0400
commitd827a750f71281faa28e497ef40ada645789566f (patch)
tree905b201c4b31c1b74a1e9baf2bdda4cd607e2346
parentcdd8540a20e2dbd2288b254a412ad8fa7d4bfbc8 (diff)
downloadrneovim-d827a750f71281faa28e497ef40ada645789566f.tar.gz
rneovim-d827a750f71281faa28e497ef40ada645789566f.tar.bz2
rneovim-d827a750f71281faa28e497ef40ada645789566f.zip
vim-patch:8.1.1761: filetype "vuejs" causes problems for some users
Problem: Filetype "vuejs" causes problems for some users. Solution: Rename to "vue". https://github.com/vim/vim/commit/4248111497ab78f45d3d48576740949778a1e76b
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/nvim/testdir/test_filetype.vim1
2 files changed, 4 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6922565192..600d323bbd 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -706,6 +706,9 @@ au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm call dist#ft#FThtml()
" Vue.js Single File Component
au BufNewFile,BufRead *.vue setf vuejs
+" Vue.js Single File Component
+au BufNewFile,BufRead *.vue setf vue
+
" HTML with Ruby - eRuby
au BufNewFile,BufRead *.erb,*.rhtml setf eruby
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 779ee98316..d4167114c8 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -474,6 +474,7 @@ let s:filename_checks = {
\ 'voscm': ['file.cm'],
\ 'vrml': ['file.wrl'],
\ 'vroom': ['file.vroom'],
+ \ 'vue': ['file.vue'],
\ 'wast': ['file.wast', 'file.wat'],
\ 'webmacro': ['file.wm'],
\ 'wget': ['.wgetrc', 'wgetrc'],