From 4b70dde72753a179333b4bba02518d234a30510e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 5 May 2024 13:51:20 -0700
Subject: feat(lalrpop): highlight touchups, folds

---
 queries/lalrpop/folds.scm      |  5 +++++
 queries/lalrpop/highlights.scm | 40 +++++++++++++++++++++++-----------------
 queries/lalrpop/injections.scm |  3 +++
 3 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 queries/lalrpop/folds.scm

diff --git a/queries/lalrpop/folds.scm b/queries/lalrpop/folds.scm
new file mode 100644
index 000000000..beeed9ba5
--- /dev/null
+++ b/queries/lalrpop/folds.scm
@@ -0,0 +1,5 @@
+[
+  (grammar_item)
+  (use)+
+  (action)
+] @fold
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index 1295f3f61..046d39790 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -1,3 +1,5 @@
+(comment) @comment @spell
+
 "grammar" @keyword
 
 [
@@ -8,6 +10,7 @@
 [
   "pub"
   "extern"
+  (mut)
 ] @keyword.modifier
 
 [
@@ -23,28 +26,25 @@
   ; =>
   "=>@L"
   "=>@R"
+  "="
+  "&"
 ] @operator
 
-(grammar_type_params
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
+(binding_symbol
+  name: (identifier) @variable.parameter)
+
+(annotation
+  "#" @punctuation.special)
 
-(symbol
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
+(grammar_parameter
+  (identifier) @variable.parameter)
 
-(binding_symbol
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
+(associated_type
+  (identifier) @type)
 
-(binding_symbol
-  name: (identifier) @variable.parameter)
+(parametrized_type
+  (path
+    (identifier) @type))
 
 (bare_symbol
   (macro
@@ -67,11 +67,17 @@
   ")"
   "["
   "]"
+  "}"
+  "{"
+  ">"
+  "<"
 ] @punctuation.bracket
 
 [
   ";"
   ":"
+  "::"
+  ","
 ] @punctuation.delimiter
 
 (lifetime
diff --git a/queries/lalrpop/injections.scm b/queries/lalrpop/injections.scm
index b0c83a11a..17d0ace48 100644
--- a/queries/lalrpop/injections.scm
+++ b/queries/lalrpop/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ([
   (normal_action)
   (failible_action)
-- 
cgit v1.2.3-70-g09d2