From 36d94cecb4ede272988c67e2a11d9c912029cad3 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Sat, 11 Aug 2018 10:13:35 +0300 Subject: [PATCH 1/3] rc lisp: Fix variable highlighting Fixes #2289 --- rc/base/lisp.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak index 51ba584d..62e6e187 100644 --- a/rc/base/lisp.kak +++ b/rc/base/lisp.kak @@ -18,7 +18,7 @@ add-highlighter shared/lisp/comment region ';' '$' fill comment add-highlighter shared/lisp/code/ regex \b(nil|true|false)\b 0:value add-highlighter shared/lisp/code/ regex (((\Q***\E)|(///)|(\Q+++\E)){1,3})|(1[+-])|(<|>|<=|=|>=) 0:operator -add-highlighter shared/lisp/code/ regex \b(([':]\w+)|([*]\H+[*]))\b 0:variable +add-highlighter shared/lisp/code/ regex [':]\w+|\*\S+\* 0:variable add-highlighter shared/lisp/code/ regex \b(def[a-z]+|if|do|let|lambda|catch|and|assert|while|def|do|fn|finally|let|loop|new|quote|recur|set!|throw|try|var|case|if-let|if-not|when|when-first|when-let|when-not|(cond(->|->>)?))\b 0:keyword # Commands From 93e1b3c254c818779675fbe822bdc2e546ecfff1 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Mon, 13 Aug 2018 20:48:53 +0300 Subject: [PATCH 2/3] rc lisp: Extend the range of identifier characters --- rc/base/lisp.kak | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak index 62e6e187..8c6717ef 100644 --- a/rc/base/lisp.kak +++ b/rc/base/lisp.kak @@ -18,8 +18,9 @@ add-highlighter shared/lisp/comment region ';' '$' fill comment add-highlighter shared/lisp/code/ regex \b(nil|true|false)\b 0:value add-highlighter shared/lisp/code/ regex (((\Q***\E)|(///)|(\Q+++\E)){1,3})|(1[+-])|(<|>|<=|=|>=) 0:operator -add-highlighter shared/lisp/code/ regex [':]\w+|\*\S+\* 0:variable add-highlighter shared/lisp/code/ regex \b(def[a-z]+|if|do|let|lambda|catch|and|assert|while|def|do|fn|finally|let|loop|new|quote|recur|set!|throw|try|var|case|if-let|if-not|when|when-first|when-let|when-not|(cond(->|->>)?))\b 0:keyword +add-highlighter shared/lisp/code/ regex (#?(['`:]|,@?))?\b[a-zA-Z][\w!$%&*+./:<=>?@^_~-]* 0:variable +add-highlighter shared/lisp/code/ regex \*[a-zA-Z][\w!$%&*+./:<=>?@^_~-]*\* 0:variable # Commands # ‾‾‾‾‾‾‾‾ From afd44ddaea0fadf81bf7558571c7dccb2450d52f Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Mon, 13 Aug 2018 20:49:15 +0300 Subject: [PATCH 3/3] rc lisp: Highlight basic numeral forms --- rc/base/lisp.kak | 1 + 1 file changed, 1 insertion(+) diff --git a/rc/base/lisp.kak b/rc/base/lisp.kak index 8c6717ef..4e8f8068 100644 --- a/rc/base/lisp.kak +++ b/rc/base/lisp.kak @@ -21,6 +21,7 @@ add-highlighter shared/lisp/code/ regex (((\Q***\E)|(///)|(\Q+++\E)){1,3})|(1[+- add-highlighter shared/lisp/code/ regex \b(def[a-z]+|if|do|let|lambda|catch|and|assert|while|def|do|fn|finally|let|loop|new|quote|recur|set!|throw|try|var|case|if-let|if-not|when|when-first|when-let|when-not|(cond(->|->>)?))\b 0:keyword add-highlighter shared/lisp/code/ regex (#?(['`:]|,@?))?\b[a-zA-Z][\w!$%&*+./:<=>?@^_~-]* 0:variable add-highlighter shared/lisp/code/ regex \*[a-zA-Z][\w!$%&*+./:<=>?@^_~-]*\* 0:variable +add-highlighter shared/lisp/code/ regex (\b\d+)?\.\d+([eEsSfFdDlL]\d+)?\b 0:value # Commands # ‾‾‾‾‾‾‾‾