From ec566bdca6dc3d41c6a7e5342fdeeef9d10dab89 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 21 Jul 2024 08:13:29 -0700 Subject: vim: #: and : notation in symbols not handled right. * genvim.txr (tl_ident): Move the pattern which matches the # and #: symbols above the more general one. Because, remember, because Vim's syntax match definitions work such that the last definition which matches wins, even if it's not the longest match. Not regenerating the txr.vim and tl.vim files; that will be done at release time. --- genvim.txr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/genvim.txr b/genvim.txr index 201d0beb..84073155 100644 --- a/genvim.txr +++ b/genvim.txr @@ -159,6 +159,7 @@ syn match txr_qat "@at" nextgroup=@{txr-qelem} contained syn match txr_dot "\." contained syn match txr_ident "[@alnum@glyph]*[@alpha@glyph^][@alnum@glyph^]*" contained syn match txr_braced_ident "\(#\?:\)\?[[@alnum@glyph^/]\+" contained +syn match tl_ident "#\?:"@(if txr-p " contained") syn match tl_ident "\(#\?:\)\?[@alnum@glyph/]\+[@alnum@glyph^/#]*"@(if txr-p " contained") syn match txr_pnum "#[xob][+\-]\?[@alnum,]\+" contains=txr_xnum,txr_bnum,txr_onum@(if txr-p " contained") syn match txr_xnum "#x[+\-]\?@hexsep" containedin=txr_pnum contained @@ -169,7 +170,6 @@ syn match txr_num "[+\-]\?@digsep\?[.]@digsep\([eE][+\-]\?[@dig]\+\)\?"@(if txr- syn match txr_num "[+\-]\?@digsep[.]\?\([eE][+\-]\?[@dig]\+\)"@(if txr-p " contained") syn match txr_badnum "[+\-]\?@digsep\?[.]@digsep\([@{alpha-noe}@glyph^/#]\|[eE][^+\-@dig]\|[eE][+/-]\?$\|[eE][+\-][^0-9]\)"@(if txr-p " contained") syn match txr_badnum "[+\-]\?@digsep[.]\?\([@{alpha-noe}@glyph^/#]\|[eE][^+\-@dig]\|[eE][+/-]\?$\|[eE][+\-][^0-9]\)"@(if txr-p " contained") -syn match tl_ident "#\?:"@(if txr-p " contained") syn match tl_splice "[ \t,]\|,[*]"@(if txr-p " contained") syn match txr_unquote "," contained -- cgit v1.2.3