Add extensions to vlang

5 files changed, 12 insertions, 8 deletions

diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index aab55ef0..e2e37100 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -214,12 +214,12 @@ let s:globs = {
   \ 'typescript': '*.ts',
   \ 'typescriptreact': '*.tsx',
   \ 'unison': '*.u,*.uu',
-  \ 'v': '*.v',
   \ 'vala': '*.vala,*.vapi,*.valadoc',
   \ 'vb': '*.bas,*.cls,*.frm,*.frx,*.vba,*.vbs,*.dsm,*.ctl,*.sba',
   \ 'vbnet': '*.vb,*.vbhtml',
   \ 'vcl': '*.vcl',
   \ 'velocity': '*.vm',
+  \ 'vlang': '*.v,*.vv,*.vsh',
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index dc39341d..de6e5919 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -233,7 +233,7 @@ if !has_key(s:disabled_packages, 'vala')
 endif
 
 if !has_key(s:disabled_packages, 'v')
-  au BufNewFile,BufRead *.v setf v
+  au BufNewFile,BufRead *.v,*.vsh,*.vv setf vlang
 endif
 
 if !has_key(s:disabled_packages, 'unison')
diff --git a/packages.yaml b/packages.yaml
index 9245307a..ec657901 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1688,8 +1688,11 @@ filetypes:
 name: v
 remote: ollykel/v-vim
 filetypes:
-- name: v
+- name: vlang
   linguist: V
+  extra_extensions:
+  - vv
+  - vsh
 ---
 name: vala
 remote: arrufat/vala.vim
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 8ec3bb73..4a510beb 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -74,13 +74,14 @@ highlight def link svelteRepeat Repeat
 " Vim and it is enabled for the Svelte plugin.
 function! s:enabled(language)
   " Check whether a syntax file for {language} exists
-  if empty(globpath(&runtimepath, 'syntax/' . a:language . '.vim'))
+  let s:syntax_name = get(a:language, 'as', a:language.name)
+  if empty(globpath(&runtimepath, 'syntax/' . s:syntax_name . '.vim'))
     return 0
   endif
 
   " If g:svelte_preprocessors is set, check for it there, otherwise return 0.
   if exists('g:svelte_preprocessors') && type(g:svelte_preprocessors) == v:t_list
-    return index(g:svelte_preprocessors, a:language) != -1
+    return index(g:svelte_preprocessors, a:language.name) != -1
   else
     return 0
   endif
@@ -96,7 +97,7 @@ let s:languages = [
       \ ]
 
 " Add global tag definitions to our defaults.
-if exists('g:svelte_preprocessor_tags') && type('g:svelte_preprocessor_tags') == v:t_list
+if exists('g:svelte_preprocessor_tags') && type(g:svelte_preprocessor_tags) == v:t_list
   let s:languages += g:svelte_preprocessor_tags
 endif
 
@@ -104,7 +105,7 @@ for s:language in s:languages
   let s:attr = '\(lang\|type\)=\("\|''\)[^\2]*' . s:language.name . '[^\2]*\2'
   let s:start = '<' . s:language.tag . '\>\_[^>]*' . s:attr . '\_[^>]*>'
 
-  if s:enabled(s:language.name)
+  if s:enabled(s:language)
     execute 'syntax include @' . s:language.name . ' syntax/' . get(s:language, 'as', s:language.name) . '.vim'
     unlet! b:current_syntax
 
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 39caa48a..1a2b725c 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -214,7 +214,7 @@ call TestFiletype('xml.twig')
 call TestFiletype('typescript')
 call TestFiletype('typescriptreact')
 call TestFiletype('unison')
-call TestFiletype('v')
+call TestFiletype('vlang')
 call TestFiletype('vala')
 call TestFiletype('vbnet')
 call TestFiletype('vcl')