summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2020-09-29 19:35:05 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2020-09-29 19:35:05 +0200
commitb5cc8fc336ca2f06242fe2a61de881b34852c168 (patch)
tree1de3f1943fdd1ec5fce9c8987ff9f846135788b0
parent1872af2d5e596cbea44a6e5739692dbff8302af5 (diff)
downloadvim-polyglot-b5cc8fc336ca2f06242fe2a61de881b34852c168.tar.gz
vim-polyglot-b5cc8fc336ca2f06242fe2a61de881b34852c168.zip
Remove ambiguity for terraform files, #570
-rw-r--r--autoload/sleuth.vim2
-rw-r--r--ftdetect/polyglot.vim2
-rw-r--r--packages.yaml4
3 files changed, 5 insertions, 3 deletions
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index e5f2e2ed..2e08b32b 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -198,7 +198,7 @@ let s:globs = {
\ 'systemd': '*.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*.#*',
\ 'tablegen': '*.td',
\ 'tads': '*.t',
- \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
+ \ 'terraform': '*.tf,*.tfvars',
\ 'textile': '*.textile',
\ 'thrift': '*.thrift',
\ 'tmux': '.tmux*.conf',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index cdcf7dcf..b1cf745d 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1272,7 +1272,7 @@ if !has_key(s:disabled_packages, 'systemd')
endif
if !has_key(s:disabled_packages, 'terraform')
- au BufNewFile,BufRead *.hcl,*.nomad,*.tf,*.tfvars,*.workflow set ft=terraform
+ au BufNewFile,BufRead *.tf,*.tfvars set ft=terraform
endif
if !has_key(s:disabled_packages, 'textile')
diff --git a/packages.yaml b/packages.yaml
index e8a5d9b5..76da2a73 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1606,7 +1606,9 @@ name: terraform
remote: hashivim/vim-terraform
filetypes:
- name: terraform
- linguist: HCL
+ extensions:
+ - tf
+ - tfvars
---
name: textile
remote: timcharper/textile.vim