neovim

commit 7e939ddb874b66414fc09bb1b33c34838b45b184
parent 2a9c9371bc6d7e3c92eace673d1ed3740b12a270
Author: Christian Clason <c.clason@uni-graz.at>
Date:   Tue, 26 Jul 2022 23:08:48 +0200

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
Diffstat:
M
runtime/filetype.vim
 | 
4
++--
M
runtime/lua/vim/filetype.lua
 | 
2
+-
M
src/nvim/testdir/test_filetype.vim
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git 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
@@ -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
@@ -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'],