commit bd8168c7705e315827642f2976ec59e26b7fe009
author =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com> Fri Jan 28 14:15:09 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Fri Jan 28 14:15:09 2022 +0000
tree 804c303b3236ccf80ad03a3d891642cd76c8d5ee
parent fbf4f1ca159028382eaeb3bfc31bb6bb96dbb67a

patch 8.2.4238: *.tf file could be fileytpe "tf" or "terraform"

Problem:    *.tf file could be fileytpe "tf" or "terraform".
Solution:   Detect the type from the file contents. (closes #9642)

runtime/autoload/dist/ft.vim

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 6971204..86c71fa 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -862,6 +862,21 @@
     endwhile
 endfunc
 
+" Determine if a *.tf file is TF mud client or terraform
+func dist#ft#FTtf()
+  let numberOfLines = line('$')
+  for i in range(1, numberOfLines)
+    let currentLine = trim(getline(i))
+    let firstCharacter = currentLine[0]
+    if firstCharacter !=? ";" && firstCharacter !=? "/" && firstCharacter !=? ""
+      setf terraform
+      return
+    endif
+  endfor
+  setf tf
+endfunc
+
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save

runtime/filetype.vim

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index aa69c79..9847c62 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1946,10 +1946,13 @@
 au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf	setf tidy
 
 " TF mud client
-au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
+au BufNewFile,BufRead .tfrc,tfrc		setf tf
+
+" TF mud client or terraform
+au BufNewFile,BufRead *.tf			call dist#ft#FTtf()
 
 " TLA+
-au BufRead,BufNewFile *.tla			setf tla
+au BufNewFile,BufRead *.tla			setf tla
 
 " tmux configuration
 au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
@@ -1958,7 +1961,7 @@
 au BufNewFile,BufRead *.toml			setf toml
 
 " TPP - Text Presentation Program
-au BufNewFile,BufReadPost *.tpp			setf tpp
+au BufNewFile,BufRead *.tpp			setf tpp
 
 " Treetop
 au BufRead,BufNewFile *.treetop			setf treetop

src/testdir/test_filetype.vim

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 2490377..34c9020 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -771,6 +771,24 @@
   filetype off
 endfunc
 
+func Test_tf_file()
+  filetype on
+
+  call writefile([';;; TF MUD client is super duper cool'], 'Xfile.tf')
+  split Xfile.tf
+  call assert_equal('tf', &filetype)
+  bwipe!
+
+  call writefile(['provider "azurerm" {'], 'Xfile.tf')
+  split Xfile.tf
+  call assert_equal('terraform', &filetype)
+  bwipe!
+
+  call delete('Xfile.tf')
+  filetype off
+endfunc
+
+
 func Test_ts_file()
   filetype on
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 04afe95..fa2c419 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4238,
+/**/
     4237,
 /**/
     4236,