From 4b49f3ec176a9aac8bf11ccd862910c92e5ff60c Mon Sep 17 00:00:00 2001
From: yemai <node_github@163.com>
Date: Tue, 18 Jun 2019 13:12:10 +0800
Subject: [PATCH] chore: set option 'g:vim_vue_plugin_highlight_vue_attr'
 default to 0

---
 README.md           |  2 +-
 syntax/vue-html.vim | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 12f8359..144116a 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Ex:
 | `g:vim_vue_plugin_use_less`           | Enable less syntax for `<style lang="less">`.                                                          | 0 |
 | `g:vim_vue_plugin_use_sass`           | Enable sass/scss syntax for `<style lang="sass">`(or scss).                                            | 0 |
 | `g:vim_vue_plugin_has_init_indent`    | Initially indent one tab inside `style/script` tags.                                                   | 0 for `.vue`. 1 for `.wpy` |
-| `g:vim_vue_plugin_highlight_vue_attr` | Highlight vue attributes differently.                                                                   | 1 |
+| `g:vim_vue_plugin_highlight_vue_attr` | Highlight vue attributes differently.                                                                  | 0 |
 | `g:vim_vue_plugin_debug`              | Echo debug message in `messages` list. Useful to debug if unexpendted indents occur.                   | 0 |
 
 \*: Vim may be slow if the feature is enabled. Find a balance between syntax highlight and speed. By the way, custom syntax could be added in `~/.vim/syntax` or `$VIM/vimfiles/syntax`.
diff --git a/syntax/vue-html.vim b/syntax/vue-html.vim
index 2a12145..9d71b14 100644
--- a/syntax/vue-html.vim
+++ b/syntax/vue-html.vim
@@ -3,8 +3,8 @@
 " 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 = exists("g:vim_vue_plugin_highlight_vue_attr")
+      \ && g:vim_vue_plugin_highlight_vue_attr == 1
 ")}}}
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -23,7 +23,7 @@ syntax match VueKey contained '\v[v:\@][^\=]+'
 syntax region VueQuote contained 
       \ start='"' end='"' contains=VueValue
 syntax match VueValue contained '\v\"\zs[^"]*\ze\"'
-      \ contains=VueInject,javaScriptStringS,javaScriptRepeat,javaScriptOperator
+      \ contains=VueInject,javaScriptStringS,javaScriptRepeat,javaScriptOperator,javascriptNumber
 
 syntax match VueInject contained '\v\$\w*'
 
@@ -48,18 +48,22 @@ syntax match VueAttr '\v(\S)@<!wx[^\=]+(\=\"[^"]*\")?'
 syntax match VueKey contained '\vwx[^\=]+'
 syntax match VueCustomTag containedin=htmlTagN '\v<(view|text|block|image)>'
 
-syn region  javaScriptStringS	
+" JavaScript syntax for VueValue
+syntax region  javaScriptStringS	
       \ start=+'+  skip=+\\\\\|\\'+  end=+'\|$+	contained
-syn region  javaScriptStringD	
+syntax region  javaScriptStringD	
       \ start=+"+  skip=+\\\\\|\\"+  end=+"\|$+	contained
-syn keyword javaScriptRepeat in contained
-syn match javaScriptOperator '[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}' contained
+syntax match   javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" contained
+syntax keyword javaScriptRepeat in contained
+syntax match javaScriptOperator '[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}' contained
 
 highlight default link VueAttr htmlTag
 if s:highlight_vue_attr
   highlight default link VueKey Type
   highlight default link VueQuote VueAttr
-  highlight default link VueValue Function
+  highlight default link VueValue None
+  " highlight default link VueQuote String
+  " highlight default link VueValue String
 else
   highlight default link VueKey htmlArg
   highlight default link VueQuote String
@@ -71,5 +75,7 @@ highlight default link VueComponentName Statement
 highlight default link VueCustomTag Statement
 highlight default link javaScriptRepeat	Statement
 highlight default link javaScriptStringS String
+highlight default link javaScriptNumber	Constant
+
 "}}}
 " vim: fdm=marker