From 02a670a185c134fd107a384ff317fdca971de513 Mon Sep 17 00:00:00 2001
From: yemai <node_github@163.com>
Date: Wed, 3 Jul 2019 11:42:27 +0800
Subject: [PATCH] fix:  conflic between number with minus highlighting and html
 data-* attr

---
 syntax/vue-html.vim | 20 ++++++++++----------
 syntax/vue.vim      |  8 +++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/syntax/vue-html.vim b/syntax/vue-html.vim
index fc16555..052e706 100644
--- a/syntax/vue-html.vim
+++ b/syntax/vue-html.vim
@@ -52,15 +52,14 @@ syntax match VueCustomTag containedin=htmlTagN '\v<(view|text|block|image)>'
 syntax cluster simpleJavascriptExpression contains=javaScriptStringS,javaScriptStringD,javascriptNumber,javaScriptRepeat,javaScriptOperator
 
 " JavaScript syntax
-if hlexists('javaScriptStringS') == 0
-  syntax region  javaScriptStringS	
-        \ start=+'+  skip=+\\\\\|\\'+  end=+'\|$+	contained
-  syntax region  javaScriptStringD	
-        \ start=+"+  skip=+\\\\\|\\"+  end=+"\|$+	contained
-  syntax match   javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" contained
-  syntax keyword javaScriptRepeat in contained
-  syntax match javaScriptOperator '[\!\|\&\+\-\<\>\=\%\/\*\~\^]\{1}' contained
-endif
+syntax region javaScriptStringS	
+      \ start=+'+  skip=+\\\\\|\\'+  end=+'\|$+	contained
+syntax region javaScriptStringD	
+      \ start=+"+  skip=+\\\\\|\\"+  end=+"\|$+	contained
+syntax match javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" contained
+syntax match javaScriptNumber "\<-\=\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" contained
+syntax match javaScriptOperator "[-!|&+<>=%/*~^]" contained
+syntax keyword javaScriptOperator delete instanceof typeof void new in of contained
 
 highlight default link VueAttr htmlTag
 if s:highlight_vue_attr
@@ -76,9 +75,10 @@ highlight default link VueInject Constant
 highlight default link VueBrace Type
 highlight default link VueComponentName htmlTagName
 highlight default link VueCustomTag htmlTagName
-highlight default link javaScriptRepeat	Statement
 highlight default link javaScriptStringS String
+highlight default link javaScriptStringD String
 highlight default link javaScriptNumber	Constant
+highlight default link javaScriptOperator	Operator
 
 "}}}
 " vim: fdm=marker
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 361a461..9b2bc35 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -11,7 +11,6 @@ if exists("b:current_syntax") && b:current_syntax == 'vue'
   finish
 endif
 
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "
 " Config {{{
@@ -105,9 +104,9 @@ endif
 " Patch 7.4.1142
 if has("patch-7.4-1142")
   if has("win32")
-    syntax iskeyword @,48-57,_,128-167,224-235,$
+    syntax iskeyword @,48-57,_,128-167,224-235,$,-
   else
-    syntax iskeyword @,48-57,_,192-255,$
+    syntax iskeyword @,48-57,_,192-255,$,-
   endif
 endif
 
@@ -126,6 +125,9 @@ if s:use_sass || s:use_less
 endif
 "}}}
 
+" Number with minus
+syntax match javaScriptNumber "\<-\=\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" containedin=@htmlJavaScript
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "
 " Syntax highlight {{{