From: John Benediktsson Date: Mon, 8 Jun 2020 18:20:27 +0000 (-0700) Subject: misc/vim/syntax: fix private word highlights. X-Git-Tag: 0.99~3174 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=f3bd6dd1838cf903b29863e2f5beb2e34b52d0ae misc/vim/syntax: fix private word highlights. --- diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 0b325f83ec..1cec5f6887 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -114,22 +114,21 @@ syn match factorTodo /\v(TODO|FIXME|XXX):=/ contained syn cluster factorDefnContents contains=@factorCluster +syn region factorDefnDelims start=/\v<%(SYNTAX|%(MACRO|MEMO|TYPED)?:?):>/ skip=/\v/ end=/\v<\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained syn region factorDefn start=/\v<%(SYNTAX|%(MACRO|MEMO|TYPED)?:?):>/ skip=/\v/ matchgroup=factorDefnDelims end=/\v<;>/ contains=factorDefnDelims,@factorDefnContents syn region factorMethod start=/\v/ skip=/\v/ matchgroup=factorDefnDelims end=/\v<;>/ contains=factorMethodDelims,@factorDefnContents +syn region factorMethodDelims start=/\v/ skip=/\v/ end=/\v<\S+%(\_\s+%(!>.*)?)+\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained syn region factorGeneric start=/\v<%(GENERIC|MATH|PRIMITIVE):>/ skip=/\v/ end=/\v<\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip syn region factorGenericN start=/\v/ skip=/\v/ end=/\v<\S+%(\_\s+%(!>.*)?)+\d+>/ contains=@factorComment nextgroup=factorStackEffectSkip syn region factorPDefn start=/\v<%(SYNTAX|%(MACRO|MEMO|TYPED)?:?):>/ skip=/\v/ matchgroup=factorPDefnDelims end=/\v<;>/ contains=factorPDefnDelims,@factorDefnContents contained +syn region factorPDefnDelims start=/\v<%(SYNTAX|%(MACRO|MEMO|TYPED)?:?):>/ skip=/\v/ end=/\v<\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained syn region factorPMethod start=/\v/ skip=/\v/ matchgroup=factorPDefnDelims end=/\v<;>/ contains=factorPMethodDelims,@factorDefnContents contained +syn region factorPMethodDelims start=/\v/ skip=/\v/ end=/\v<\S+%(\_\s+%(!>.*)?)+\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained syn region factorPGeneric start=/\v<%(GENERIC|MATH|PRIMITIVE):>/ skip=/\v/ end=/\v<\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained syn region factorPGenericN start=/\v/ skip=/\v/ end=/\v<\S+%(\_\s+%(!>.*)?)+\d+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained -syn region factorDefnDelims start=/\v<%(SYNTAX|%(MACRO|MEMO|TYPED)?:?):>/ skip=/\v/ end=/\v<\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained -syn region factorMethodDelims start=/\v/ skip=/\v/ end=/\v<\S+%(\_\s+%(!>.*)?)+\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained -syn region factorPDefnDelims start=/\v<%(SYNTAX|%(MACRO|MEMO|TYPED)?:?):>/ skip=/\v/ end=/\v<\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained -syn region factorPMethodDelims start=/\v/ skip=/\v/ end=/\v<\S+%(\_\s+%(!>.*)?)+\S+>/ contains=@factorComment nextgroup=factorStackEffectSkip contained - -syn region None matchgroup=factorPrivate start=/\v<\/ end=/\v>/ contains=@factorDefnContents,factorPrivateDefn,factorPrivateMethod,factorPGeneric,factorPGenericN +syn region None matchgroup=factorPrivate start=/\v<\/ end=/\v>/ contains=@factorDefnContents,factorPDefn,factorPMethod,factorPGeneric,factorPGenericN syn cluster factorClusterValue contains=factorBreakpoint,factorBoolean,factorFrySpecifier,factorChar,@factorString,@factorNumber,factorBackslash,factorMBackslash,factorLiteral,factorLiteralBlock,@factorStackEffect,@factorQuotation,@factorArray syn match factorClusterValueSkip /\v%(\_\s+%(!>.*)?)*/ nextgroup=@factorClusterValue transparent contained