summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2020-08-25 14:28:44 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2020-08-25 14:28:44 +0200
commit94ababe91fe046dae624b43ed566255823474052 (patch)
tree13aea1e19dcc3e4952e0803edc5af0b7c4466c5e
parent080b8cdc603b059db2d9e6f56e3f724418f9366a (diff)
downloadvim-polyglot-94ababe91fe046dae624b43ed566255823474052.tar.gz
vim-polyglot-94ababe91fe046dae624b43ed566255823474052.zip
Fix ansible ftdetect
Diffstat (limited to '')
-rw-r--r--ftdetect/polyglot.vim6
-rw-r--r--packages.yaml6
-rw-r--r--scripts/test_extensions.vim2
3 files changed, 8 insertions, 6 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 75e8c60e..edb884a6 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1289,15 +1289,15 @@ if index(g:polyglot_disabled, 'ansible') == -1
au BufNewFile,BufRead *.asl set ft=yaml.ansible
au BufNewFile,BufRead *.dsl set ft=yaml.ansible
au BufNewFile,BufRead group_vars/* set ft=yaml.ansible
- au BufNewFile,BufRead handlers.*.ya?ml set ft=yaml.ansible
+ au BufNewFile,BufRead handlers.*.y{a,}ml set ft=yaml.ansible
au BufNewFile,BufRead host_vars/* set ft=yaml.ansible
au BufNewFile,BufRead local.y{a,}ml set ft=yaml.ansible
au BufNewFile,BufRead main.y{a,}ml set ft=yaml.ansible
au BufNewFile,BufRead playbook.y{a,}ml set ft=yaml.ansible
au BufNewFile,BufRead requirements.y{a,}ml set ft=yaml.ansible
- au BufNewFile,BufRead roles.*.ya?ml set ft=yaml.ansible
+ au BufNewFile,BufRead roles.*.y{a,}ml set ft=yaml.ansible
au BufNewFile,BufRead site.y{a,}ml set ft=yaml.ansible
- au BufNewFile,BufRead tasks.*.ya?ml set ft=yaml.ansible
+ au BufNewFile,BufRead tasks.*.y{a,}ml set ft=yaml.ansible
endif
if index(g:polyglot_disabled, 'helm') == -1
diff --git a/packages.yaml b/packages.yaml
index 2443bb73..7c6df385 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1276,11 +1276,11 @@ filetypes:
- "main.y{a,}ml"
- "local.y{a,}ml"
- "requirements.y{a,}ml"
+ - 'tasks.*.y{a,}ml'
+ - 'roles.*.y{a,}ml'
+ - 'handlers.*.y{a,}ml'
- 'group_vars/*'
- 'host_vars/*'
- - 'tasks.*.ya?ml'
- - 'roles.*.ya?ml'
- - 'handlers.*.ya?ml'
# Helm needs to be after YAML
---
name: helm
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index aea52f94..c7a22025 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -12,3 +12,5 @@ endfunction
call TestExtension('blade', 'test.blade.php', '')
call TestExtension('yaml.ansible', 'playbook.yml', '')
call TestExtension('yaml.ansible', 'host_vars/foobar', '')
+call TestExtension('yaml.ansible', 'handlers.foo.yaml', '')
+call TestExtension('yaml.ansible', 'requirements.yaml', '')