From 5ec40c63b295f43e175e35ae436743eb44bd841f Mon Sep 17 00:00:00 2001
From: Caleb Heuer <ch@raiguard.me>
Date: Sat, 30 Sep 2023 11:57:30 -0600
Subject: [PATCH] Add highlighting of Lua variables, labels, and self keyword

---
 rc/filetype/lua.kak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rc/filetype/lua.kak b/rc/filetype/lua.kak
index 98354770..d08edd1f 100644
--- a/rc/filetype/lua.kak
+++ b/rc/filetype/lua.kak
@@ -46,14 +46,17 @@ add-highlighter shared/lua/double_string region '"'   (?<!\\)(?:\\\\)*" fill str
 add-highlighter shared/lua/single_string region "'"   (?<!\\)(?:\\\\)*' fill string
 add-highlighter shared/lua/comment       region '--'  $                 fill comment
 
+add-highlighter shared/lua/code/variable regex \b\w*\b 0:variable # Everything in Lua is a variable!
 add-highlighter shared/lua/code/function_declaration regex \b(?:function\h+)(?:\w+\h*\.\h*)*([a-zA-Z_]\w*)\( 1:function
 add-highlighter shared/lua/code/function_call regex \b([a-zA-Z_]\w*)\h*(?=[\(\{]) 1:function
 add-highlighter shared/lua/code/keyword regex \b(break|do|else|elseif|end|for|function|goto|if|in|local|repeat|return|then|until|while)\b 0:keyword
-add-highlighter shared/lua/code/value regex \b(false|nil|true|[0-9]+(:?\.[0-9])?(:?[eE]-?[0-9]+)?|0x[0-9a-fA-F])\b 0:value
+add-highlighter shared/lua/code/value regex \b(false|nil|true|self|[0-9]+(:?\.[0-9])?(:?[eE]-?[0-9]+)?|0x[0-9a-fA-F])\b 0:value
 add-highlighter shared/lua/code/symbolic_operator regex (\+|-|\*|/|%|\^|==?|~=|<=?|>=?|\.\.|\.\.\.|#) 0:operator
 add-highlighter shared/lua/code/keyword_operator regex \b(and|or|not)\b 0:operator
 add-highlighter shared/lua/code/module regex \b(_G|_ENV)\b 0:module
 add-highlighter shared/lua/code/attribute regex \B(<[a-zA-Z_]\w*>)\B 0:attribute
+add-highlighter shared/lua/code/label regex \s(::\w*::) 1:meta
+add-highlighter shared/lua/code/goto_label regex "\bgoto (\w*)\b" 1:meta
 
 # Commands
 # ‾‾‾‾‾‾‾‾