diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-07-26 23:08:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 23:08:48 +0200 |
| commit | 7e939ddb874b66414fc09bb1b33c34838b45b184 (patch) | |
| tree | 1cfaa9bbf68cd85f0473cb76ad1dbb811e4cbf64 | |
| parent | 2a9c9371bc6d7e3c92eace673d1ed3740b12a270 (diff) | |
| download | rneovim-7e939ddb874b66414fc09bb1b33c34838b45b184.tar.gz rneovim-7e939ddb874b66414fc09bb1b33c34838b45b184.tar.bz2 rneovim-7e939ddb874b66414fc09bb1b33c34838b45b184.zip | |
vim-patch:9.0.0084: using "terraform" filetype for .tfvars file is bad (#19526)
Problem: Using "terraform" filetype for .tfvars file is bad.
Solution: use "terraform-vars", so that different completion and other
mechanisms can be used. (Radek Simko, closes vim/vim#10755)
https://github.com/vim/vim/commit/15b87b6610bfce0c6296bbbad019c944f88a74ca
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index f91d7e1929..5a5937a209 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1983,8 +1983,8 @@ au BufRead,BufNewFile *.ttl " Terminfo au BufNewFile,BufRead *.ti setf terminfo -" Terraform -au BufRead,BufNewFile *.tfvars setf terraform +" Terraform variables +au BufRead,BufNewFile *.tfvars setf terraform-vars " TeX au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl setf tex diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 8746f9e294..10eff6598c 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -969,7 +969,7 @@ local extension = { txi = 'texinfo', texinfo = 'texinfo', text = 'text', - tfvars = 'terraform', + tfvars = 'terraform-vars', tla = 'tla', tli = 'tli', toml = 'toml', diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index cf029af51e..53f8d4f3ef 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -548,7 +548,7 @@ let s:filename_checks = { \ 'template': ['file.tmpl'], \ 'teraterm': ['file.ttl'], \ 'terminfo': ['file.ti'], - \ 'terraform': ['file.tfvars'], + \ 'terraform-vars': ['file.tfvars'], \ 'tex': ['file.latex', 'file.sty', 'file.dtx', 'file.ltx', 'file.bbl'], \ 'texinfo': ['file.texinfo', 'file.texi', 'file.txi'], \ 'texmf': ['texmf.cnf'], |