Add extensions to vlang

This commit is contained in:
Adam Stankiewicz
2020-10-06 11:02:00 +02:00
parent cbc4600333
commit c6fa4d2bf5
5 changed files with 12 additions and 8 deletions

View File

@@ -214,12 +214,12 @@ let s:globs = {
\ 'typescript': '*.ts', \ 'typescript': '*.ts',
\ 'typescriptreact': '*.tsx', \ 'typescriptreact': '*.tsx',
\ 'unison': '*.u,*.uu', \ 'unison': '*.u,*.uu',
\ 'v': '*.v',
\ 'vala': '*.vala,*.vapi,*.valadoc', \ 'vala': '*.vala,*.vapi,*.valadoc',
\ 'vb': '*.bas,*.cls,*.frm,*.frx,*.vba,*.vbs,*.dsm,*.ctl,*.sba', \ 'vb': '*.bas,*.cls,*.frm,*.frx,*.vba,*.vbs,*.dsm,*.ctl,*.sba',
\ 'vbnet': '*.vb,*.vbhtml', \ 'vbnet': '*.vb,*.vbhtml',
\ 'vcl': '*.vcl', \ 'vcl': '*.vcl',
\ 'velocity': '*.vm', \ 'velocity': '*.vm',
\ 'vlang': '*.v,*.vv,*.vsh',
\ 'vmasm': '*.mar', \ 'vmasm': '*.mar',
\ 'vue': '*.vue,*.wpy', \ 'vue': '*.vue,*.wpy',
\ 'xdc': '*.xdc', \ 'xdc': '*.xdc',

View File

@@ -233,7 +233,7 @@ if !has_key(s:disabled_packages, 'vala')
endif endif
if !has_key(s:disabled_packages, 'v') if !has_key(s:disabled_packages, 'v')
au BufNewFile,BufRead *.v setf v au BufNewFile,BufRead *.v,*.vsh,*.vv setf vlang
endif endif
if !has_key(s:disabled_packages, 'unison') if !has_key(s:disabled_packages, 'unison')

View File

@@ -1688,8 +1688,11 @@ filetypes:
name: v name: v
remote: ollykel/v-vim remote: ollykel/v-vim
filetypes: filetypes:
- name: v - name: vlang
linguist: V linguist: V
extra_extensions:
- vv
- vsh
--- ---
name: vala name: vala
remote: arrufat/vala.vim remote: arrufat/vala.vim

View File

@@ -74,13 +74,14 @@ highlight def link svelteRepeat Repeat
" Vim and it is enabled for the Svelte plugin. " Vim and it is enabled for the Svelte plugin.
function! s:enabled(language) function! s:enabled(language)
" Check whether a syntax file for {language} exists " 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 return 0
endif endif
" If g:svelte_preprocessors is set, check for it there, otherwise return 0. " 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 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 else
return 0 return 0
endif endif
@@ -96,7 +97,7 @@ let s:languages = [
\ ] \ ]
" Add global tag definitions to our defaults. " 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 let s:languages += g:svelte_preprocessor_tags
endif endif
@@ -104,7 +105,7 @@ for s:language in s:languages
let s:attr = '\(lang\|type\)=\("\|''\)[^\2]*' . s:language.name . '[^\2]*\2' let s:attr = '\(lang\|type\)=\("\|''\)[^\2]*' . s:language.name . '[^\2]*\2'
let s:start = '<' . s:language.tag . '\>\_[^>]*' . s:attr . '\_[^>]*>' 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' execute 'syntax include @' . s:language.name . ' syntax/' . get(s:language, 'as', s:language.name) . '.vim'
unlet! b:current_syntax unlet! b:current_syntax

View File

@@ -214,7 +214,7 @@ call TestFiletype('xml.twig')
call TestFiletype('typescript') call TestFiletype('typescript')
call TestFiletype('typescriptreact') call TestFiletype('typescriptreact')
call TestFiletype('unison') call TestFiletype('unison')
call TestFiletype('v') call TestFiletype('vlang')
call TestFiletype('vala') call TestFiletype('vala')
call TestFiletype('vbnet') call TestFiletype('vbnet')
call TestFiletype('vcl') call TestFiletype('vcl')