diff --git a/after/syntax/css.vim b/after/syntax/css.vim new file mode 100644 index 0000000..df4fe48 --- /dev/null +++ b/after/syntax/css.vim @@ -0,0 +1 @@ +setlocal iskeyword+=- diff --git a/after/syntax/css/css3-animations.vim b/after/syntax/css/css3-animations.vim index 84bec4b..4394dde 100644 --- a/after/syntax/css/css3-animations.vim +++ b/after/syntax/css/css3-animations.vim @@ -1,3 +1,3 @@ " TODO: create cssAnimationsProp group and cssAnimationsAttr group -syn match cssFontProp contained "\" +syn match cssFontProp contained "\<\(-webkit-\)\=animation\(-\(delay\|direction\|duration\|iteration-count\|name\|play-state\|timing-function\)\)\=\>" syn keyword cssFontAttr contained IDENT running paused diff --git a/after/syntax/css/css3-background.vim b/after/syntax/css/css3-background.vim index fb4cde0..4a7851c 100644 --- a/after/syntax/css/css3-background.vim +++ b/after/syntax/css/css3-background.vim @@ -1,6 +1,6 @@ " TODO: create cssBackgroundProp group and cssBackgroundAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=background-\(origin\|clip\|size\)\>" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=border-image\(-\(source\|slice\|width\|outset\|repeat\)\)\=\>" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=border-\(\(top-right\|bottom-right\|bottom-left\|top-left\)-\)\=radius\>" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=box-\(decoration-break\|shadow\)\>" syn keyword cssFontAttr contained stretch round fill alice clone diff --git a/after/syntax/css/css3-flexbox.vim b/after/syntax/css/css3-flexbox.vim index 277d041..f68c195 100644 --- a/after/syntax/css/css3-flexbox.vim +++ b/after/syntax/css/css3-flexbox.vim @@ -1,4 +1,6 @@ " TODO: create cssFlexBoxProp group and cssFlexBoxAttr group -syn match cssFontProp contained "\" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=box-\(align\|direction\|flex\|flex-group\|lines\|ordinal-group\|orient\|pack\)\>" syn keyword cssFontAttr contained stretch single multiple syn match cssFontAttr contained "\<\(inline\|box\)-axis\>" +syn match cssRenderProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=\(box\|flexbox\)\>" +syn match cssRenderAttr contained "\" diff --git a/after/syntax/css/css3-functions.vim b/after/syntax/css/css3-functions.vim index dec1599..25b78ff 100644 --- a/after/syntax/css/css3-functions.vim +++ b/after/syntax/css/css3-functions.vim @@ -1 +1,3 @@ -syn region cssFunction contained matchgroup=cssFunctionName start="\<\(calc\|\(linear\|radial\)-gradient\)\s*(" end=")" oneline keepend +syn region cssFunction contained matchgroup=cssFunctionName start="\<\(calc\|rgba\|hsla\)\s*(" end=")" oneline keepend +syn region cssFunction contained matchgroup=cssFunctionName contains=cssFunction start="\<\(from\|to\|color-stop\)\s*(" end=")" oneline +syn region cssFunction contained matchgroup=cssFunctionName contains=cssFunction start="\<\(-\(webkit\|moz\|o\|ms\)-\)\=\(repeating-\)\=\(linear-\|radial-\)\=gradient\s*(" end=")" diff --git a/after/syntax/css/css3-marquee.vim b/after/syntax/css/css3-marquee.vim index 42a5ce8..73d7e29 100644 --- a/after/syntax/css/css3-marquee.vim +++ b/after/syntax/css/css3-marquee.vim @@ -1,5 +1,5 @@ " TODO: create cssMarqueeProp group and cssMarqueeAttr group -syn match cssFontProp contained "\" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=marquee-\(direction\|play-count\|speed\|style\)\>" syn match cssFontProp contained "\" syn keyword cssFontAttr contained forward reverse infinite slow fast slide alternate syn match cssFontAttr contained "\" diff --git a/after/syntax/css/css3-multicol.vim b/after/syntax/css/css3-multicol.vim index cba9290..27f09c3 100644 --- a/after/syntax/css/css3-multicol.vim +++ b/after/syntax/css/css3-multicol.vim @@ -1,5 +1,5 @@ " TODO: create cssMulticolProp group and cssMulticolAttr group syn keyword cssFontProp contained columns -syn match cssFontProp contained "\" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\=\)\|span\|width\)\>" syn keyword cssFontAttr contained page column balance syn match cssFontAttr contained "\" diff --git a/after/syntax/css/css3-pseudo-classes.vim b/after/syntax/css/css3-pseudo-classes.vim index 832d408..981fa3d 100644 --- a/after/syntax/css/css3-pseudo-classes.vim +++ b/after/syntax/css/css3-pseudo-classes.vim @@ -3,3 +3,4 @@ syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\" syn match cssPseudoClassId contained "\" syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":nth\(-last\)\?-\(child\|of-type\)(" end=")" oneline +syn match cssPseudoClass ":[^{[:blank:]]*" contains=cssPseudoClassId,cssUnicodeEscape diff --git a/after/syntax/css/css3-transforms.vim b/after/syntax/css/css3-transforms.vim index 8a4b68a..1ceb3be 100644 --- a/after/syntax/css/css3-transforms.vim +++ b/after/syntax/css/css3-transforms.vim @@ -1,5 +1,5 @@ " TODO: create cssTransformsProp group and cssTransformsAttr group -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" -syn match cssFontProp contained "\" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=backface-visibility\>" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=perspective\(-origin\)\=\>" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=transform\(-\(origin\|style\)\)\=\>" syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|translate\(3d\|X\|Y\|Z\)\=\|scale\(3d\|X\|Y\|Z\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|perspective\)\s*(" end=")" oneline keepend diff --git a/after/syntax/css/css3-transitions.vim b/after/syntax/css/css3-transitions.vim index 835953a..bd66f4b 100644 --- a/after/syntax/css/css3-transitions.vim +++ b/after/syntax/css/css3-transitions.vim @@ -1,5 +1,5 @@ " TODO: create cssTransitionProp group and cssTransitionAttr group -syn match cssFontProp contained "\" +syn match cssFontProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=transition\(-\(delay\|duration\|property\|timing-function\)\)\=\>" syn keyword cssFontAttr contained linear syn match cssFontAttr contained "\" syn region cssFunction contained matchgroup=cssFunctionName start="\" +syn match cssUIProp contained "\<\(-\(webkit\|moz\|o\|ms\)-\)\=box-sizing\>" syn match cssUIProp contained "\"