From bb0021b1583f192796e434d624edbf775d8570d4 Mon Sep 17 00:00:00 2001 From: thacuber2a03 <70547062+thacuber2a03@users.noreply.github.com> Date: Sun, 27 Apr 2025 17:59:29 -0400 Subject: rc/filetype/moon.kak: overhaul --- rc/filetype/moon.kak | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'rc') diff --git a/rc/filetype/moon.kak b/rc/filetype/moon.kak index 43d8dd4d..04ec40b4 100644 --- a/rc/filetype/moon.kak +++ b/rc/filetype/moon.kak @@ -47,8 +47,19 @@ add-highlighter shared/moon/comment region '--' '$' fill comme add-highlighter shared/moon/double_string/base default-region fill string add-highlighter shared/moon/double_string/interpolation region -recurse \{ \Q#{ \} fill meta -add-highlighter shared/moon/code/ regex ([.\\](?=[A-Za-z]))|(\b[A-Za-z]\w*:)|(\b[A-Za-z]\w*\K!+)|(\W\K[@:][A-Za-z]\w*) 0:variable -add-highlighter shared/moon/code/ regex \b(and|break|catch|class|continue|do|else(if)?|export|extends|false|finally|for|from|if|import|in|local|nil|not|or|return|super|switch|then|true|try|unless|using|when|while|with)\b 0:keyword +add-highlighter shared/moon/code/ regex (?<=\w)\\\w+ 0:function +add-highlighter shared/moon/code/ regex (\+|-|\*|/|%|\^|==?|[~!]=|<=?|>=?|\.\.\.?|#|!) 0:operator +add-highlighter shared/moon/code/ regex [-=]> 0:function +add-highlighter shared/moon/code/ regex (?:\b\w+:) 0:variable +add-highlighter shared/moon/code/ regex (?:\W\K[@:]\w+) 0:variable +add-highlighter shared/moon/code/ regex (?:\W\K[@:]__(name|class|inherited):?) 0:meta +add-highlighter shared/moon/code/ regex \W\K@@\w+(?!:) 0:meta +add-highlighter shared/moon/code/ regex \w+\h*(?=\() 0:function +add-highlighter shared/moon/code/ regex \b(and|break|class|continue|do|else(if)?|export|extends|for|from|if|import|in|local|not|or|return|switch|then|unless|using|when|while|with)\b 0:keyword +add-highlighter shared/moon/code/ regex \b(true|false|nil|super|self)\b 0:value +add-highlighter shared/moon/code/ regex \b([0-9]+(:?\.[0-9])?(:?[eE]-?[0-9]+)?|0x[0-9a-fA-F]+)\b 0:value +add-highlighter shared/moon/code/ regex class(\h+\w+)?(?:\h+extends(\h+\w+))?\h*$ 1:type 2:attribute +add-highlighter shared/moon/code/ regex \b(_G|_ENV)\b 0:module # Commands # ‾‾‾‾‾‾‾‾ @@ -92,8 +103,6 @@ define-command -hidden moon-indent-on-char %{ try %{ execute-keys -draft x ^ \h * (else(if)?) $ ^ \h * (if|unless|when) s \A | \z ) } # align _when_ to _switch_ then indent try %{ execute-keys -draft x ^ \h * (when) $ ^ \h * (switch) s \A | \z ) ) , } - # align _catch_ and _finally_ to _try_ - try %{ execute-keys -draft x ^ \h * (catch|finally) $ ^ \h * (try) s \A | \z ) } } } -- cgit v1.2.3 From cdb6ee25d393afb042a8246cd80e73b3d5bede7e Mon Sep 17 00:00:00 2001 From: thacuber2a03 <70547062+thacuber2a03@users.noreply.github.com> Date: Sun, 27 Apr 2025 19:12:51 -0400 Subject: rc/filetype/moon.kak: extra adjustments --- rc/filetype/moon.kak | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'rc') diff --git a/rc/filetype/moon.kak b/rc/filetype/moon.kak index 04ec40b4..f3afb0a5 100644 --- a/rc/filetype/moon.kak +++ b/rc/filetype/moon.kak @@ -47,19 +47,21 @@ add-highlighter shared/moon/comment region '--' '$' fill comme add-highlighter shared/moon/double_string/base default-region fill string add-highlighter shared/moon/double_string/interpolation region -recurse \{ \Q#{ \} fill meta -add-highlighter shared/moon/code/ regex (?<=\w)\\\w+ 0:function +add-highlighter shared/moon/code/ regex \\\w+ 0:function add-highlighter shared/moon/code/ regex (\+|-|\*|/|%|\^|==?|[~!]=|<=?|>=?|\.\.\.?|#|!) 0:operator add-highlighter shared/moon/code/ regex [-=]> 0:function -add-highlighter shared/moon/code/ regex (?:\b\w+:) 0:variable -add-highlighter shared/moon/code/ regex (?:\W\K[@:]\w+) 0:variable -add-highlighter shared/moon/code/ regex (?:\W\K[@:]__(name|class|inherited):?) 0:meta -add-highlighter shared/moon/code/ regex \W\K@@\w+(?!:) 0:meta +add-highlighter shared/moon/code/ regex \b\w+: 0:variable +add-highlighter shared/moon/code/ regex (? Date: Sun, 27 Apr 2025 19:36:04 -0400 Subject: rc/filetype/moon.kak: more small changes --- rc/filetype/moon.kak | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'rc') diff --git a/rc/filetype/moon.kak b/rc/filetype/moon.kak index f3afb0a5..08b17865 100644 --- a/rc/filetype/moon.kak +++ b/rc/filetype/moon.kak @@ -48,13 +48,15 @@ add-highlighter shared/moon/double_string/base default-region fill string add-highlighter shared/moon/double_string/interpolation region -recurse \{ \Q#{ \} fill meta add-highlighter shared/moon/code/ regex \\\w+ 0:function +add-highlighter shared/moon/code/ regex [\W\)\}]\h+\K\.\w+ 0:function add-highlighter shared/moon/code/ regex (\+|-|\*|/|%|\^|==?|[~!]=|<=?|>=?|\.\.\.?|#|!) 0:operator add-highlighter shared/moon/code/ regex [-=]> 0:function add-highlighter shared/moon/code/ regex \b\w+: 0:variable -add-highlighter shared/moon/code/ regex (? 1:function add-highlighter shared/moon/code/ regex \b(and|break|class|continue|do|else(if)?|export|extends|for|from|if|import|in|local|not|or|return|switch|then|unless|using|when|while|with)\b 0:keyword add-highlighter shared/moon/code/ regex \b(true|false|nil|super|self)\b 0:value add-highlighter shared/moon/code/ regex \b([0-9]+(:?\.[0-9])?(:?[eE]-?[0-9]+)?|0x[0-9a-fA-F]+)\b 0:value -- cgit v1.2.3