diff --git a/autoload/vue.vim b/autoload/vue.vim index 9ecbae0..676ffd1 100644 --- a/autoload/vue.vim +++ b/autoload/vue.vim @@ -7,3 +7,8 @@ function! vue#Log(msg) echom '['.s:name.']['.v:lnum.'] '.a:msg endif endfunction + +function! vue#GetConfig(name, default) + let name = 'g:vim_vue_plugin_'.a:name + return exists(name) ? eval(name) : a:default +endfunction diff --git a/ftplugin/vue/fold.vim b/ftplugin/vue/fold.vim index 0aa8cf6..e7ff36f 100644 --- a/ftplugin/vue/fold.vim +++ b/ftplugin/vue/fold.vim @@ -3,8 +3,7 @@ " Config {{{ " """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let s:use_foldexpr = exists("g:vim_vue_plugin_use_foldexpr") - \ && g:vim_vue_plugin_use_foldexpr == 1 +let s:use_foldexpr = vue#GetConfig("use_foldexpr", 0) "}}} if !s:use_foldexpr | finish | endif diff --git a/indent/vue.vim b/indent/vue.vim index 1afa801..8c022ba 100644 --- a/indent/vue.vim +++ b/indent/vue.vim @@ -33,18 +33,12 @@ let s:tag_end = '\v^\s*\/?\>\s*' " Config {{{ " """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let s:use_pug = exists("g:vim_vue_plugin_use_pug") - \ && g:vim_vue_plugin_use_pug == 1 -let s:use_sass = exists("g:vim_vue_plugin_use_sass") - \ && g:vim_vue_plugin_use_sass == 1 -let s:use_scss = exists("g:vim_vue_plugin_use_scss") - \ && g:vim_vue_plugin_use_scss == 1 -let s:use_stylus = exists("g:vim_vue_plugin_use_stylus") - \ && g:vim_vue_plugin_use_stylus == 1 -let s:use_coffee = exists("g:vim_vue_plugin_use_coffee") - \ && g:vim_vue_plugin_use_coffee == 1 -let s:use_typescript = exists("g:vim_vue_plugin_use_typescript") - \ && g:vim_vue_plugin_use_typescript == 1 +let s:use_pug = vue#GetConfig("use_pug", 0) +let s:use_sass = vue#GetConfig("use_sass", 0) +let s:use_scss = vue#GetConfig("use_scss", 0) +let s:use_stylus = vue#GetConfig("use_stylus", 0) +let s:use_coffee = vue#GetConfig("use_coffee", 0) +let s:use_typescript = vue#GetConfig("use_typescript", 0) let s:has_init_indent = 0 if !exists("g:vim_vue_plugin_has_init_indent") diff --git a/syntax/vue-html.vim b/syntax/vue-html.vim index e0699f3..d607ced 100644 --- a/syntax/vue-html.vim +++ b/syntax/vue-html.vim @@ -3,8 +3,7 @@ " Config {{{ " """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let s:highlight_vue_attr = exists("g:vim_vue_plugin_highlight_vue_attr") - \ && g:vim_vue_plugin_highlight_vue_attr == 1 +let s:highlight_vue_attr = vue#GetConfig("highlight_vue_attr", 0) "}}} """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" diff --git a/syntax/vue-javascript.vim b/syntax/vue-javascript.vim index 3fa7633..18db033 100644 --- a/syntax/vue-javascript.vim +++ b/syntax/vue-javascript.vim @@ -3,8 +3,7 @@ " Config {{{ " """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let s:highlight_vue_keyword = exists("g:vim_vue_plugin_highlight_vue_keyword") - \ && g:vim_vue_plugin_highlight_vue_keyword == 1 +let s:highlight_vue_keyword = vue#GetConfig("highlight_vue_keyword", 0) if !s:highlight_vue_keyword | finish | endif "}}} diff --git a/syntax/vue.vim b/syntax/vue.vim index 169100a..3952dde 100644 --- a/syntax/vue.vim +++ b/syntax/vue.vim @@ -18,22 +18,14 @@ let b:current_loading_main_syntax = 'vue' " Config {{{ " """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let s:load_full_syntax = exists("g:vim_vue_plugin_load_full_syntax") - \ && g:vim_vue_plugin_load_full_syntax == 1 -let s:use_pug = exists("g:vim_vue_plugin_use_pug") - \ && g:vim_vue_plugin_use_pug == 1 -let s:use_less = exists("g:vim_vue_plugin_use_less") - \ && g:vim_vue_plugin_use_less == 1 -let s:use_sass = exists("g:vim_vue_plugin_use_sass") - \ && g:vim_vue_plugin_use_sass == 1 -let s:use_scss = exists("g:vim_vue_plugin_use_scss") - \ && g:vim_vue_plugin_use_scss == 1 -let s:use_stylus = exists("g:vim_vue_plugin_use_stylus") - \ && g:vim_vue_plugin_use_stylus == 1 -let s:use_coffee = exists("g:vim_vue_plugin_use_coffee") - \ && g:vim_vue_plugin_use_coffee == 1 -let s:use_typescript = exists("g:vim_vue_plugin_use_typescript") - \ && g:vim_vue_plugin_use_typescript == 1 +let s:load_full_syntax = vue#GetConfig("load_full_syntax", 0) +let s:use_pug = vue#GetConfig("use_pug", 0) +let s:use_less = vue#GetConfig("use_less", 0) +let s:use_sass = vue#GetConfig("use_sass", 0) +let s:use_scss = vue#GetConfig("use_scss", 0) +let s:use_stylus = vue#GetConfig("use_stylus", 0) +let s:use_coffee = vue#GetConfig("use_coffee", 0) +let s:use_typescript = vue#GetConfig("use_typescript", 0) "}}} """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""