Skip to content

Commit 18c4211

Browse files
author
Adriaan Zonnenberg
committed
Deprecate g:vue_disable_pre_processors
It was superseded by g:vue_pre_processors (#133) I could add a message if g:vue_disable_pre_processors is set, asking people to update their config to the new variable, but I'd rather not interrupt people's workflows.
1 parent 6acff7e commit 18c4211

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ When checking for pre-processor languages, multiple syntax highlighting checks a
119119
let g:vue_pre_processors = ['pug', 'scss']
120120
```
121121

122-
Or alternatively, disable pre-processor languages altogether:
122+
To disable pre-processor languages altogether (only highlight HTML, JavaScript, and CSS):
123123

124124
```vim
125-
let g:vue_disable_pre_processors = 1
125+
let g:vue_pre_processors = []
126126
```

syntax/vue.vim

+15-12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if exists("b:current_syntax")
66
finish
77
endif
88

9+
" Convert deprecated variable to new one
10+
if exists('g:vue_disable_pre_processors') && g:vue_disable_pre_processors
11+
let g:vue_pre_processors = []
12+
endif
13+
914
runtime! syntax/html.vim
1015
syntax clear htmlTagName
1116
syntax match htmlTagName contained "\<[a-zA-Z0-9:-]*\>"
@@ -59,20 +64,18 @@ for item in s:language_config
5964
let s:language_dict[item.lang] = item.args
6065
endfor
6166

62-
if !exists("g:vue_disable_pre_processors") || !g:vue_disable_pre_processors
63-
if exists("g:vue_pre_processors")
64-
let pre_processors = g:vue_pre_processors
65-
else
66-
let pre_processors = map(copy(s:language_config), {k, v -> v.lang})
67-
endif
68-
69-
for language in pre_processors
70-
if has_key(s:language_dict, language)
71-
call call("s:register_language", get(s:language_dict, language))
72-
endif
73-
endfor
67+
if exists("g:vue_pre_processors")
68+
let pre_processors = g:vue_pre_processors
69+
else
70+
let pre_processors = map(copy(s:language_config), {k, v -> v.lang})
7471
endif
7572

73+
for language in pre_processors
74+
if has_key(s:language_dict, language)
75+
call call("s:register_language", get(s:language_dict, language))
76+
endif
77+
endfor
78+
7679
syn region vueSurroundingTag contained start=+<\(script\|style\|template\)+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
7780
syn keyword htmlSpecialTagName contained template
7881
syn keyword htmlArg contained scoped ts

0 commit comments

Comments
 (0)