From 1e3b7562c2497ec5a9adfa8a2f036cb3da46ec3a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 19 Jul 2025 15:15:04 +0200
Subject: feat(wit)!: update parser and queries

---
 runtime/queries/wit/folds.scm      |  9 ++-------
 runtime/queries/wit/highlights.scm | 23 ++++++++++++++---------
 runtime/queries/wit/injections.scm |  5 ++++-
 3 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/wit/folds.scm b/runtime/queries/wit/folds.scm
index 7f84ddd2e..d2a12f122 100644
--- a/runtime/queries/wit/folds.scm
+++ b/runtime/queries/wit/folds.scm
@@ -1,11 +1,6 @@
-[
-  (world_items)
-  (world_body)
-  (interface_items)
-  (interface_body)
-] @fold
+(body) @fold
 
-(world_items
+(body
   [
     (use_item)
     (import_item)
diff --git a/runtime/queries/wit/highlights.scm b/runtime/queries/wit/highlights.scm
index 1f4b01cce..6bccf5ba0 100644
--- a/runtime/queries/wit/highlights.scm
+++ b/runtime/queries/wit/highlights.scm
@@ -1,12 +1,10 @@
-(comment) @comment @spell
-
 (ty
   (id)) @type
 
 (package_decl
   (id) @module)
 
-(valid_semver) @string.special
+(version) @string.special
 
 (world_item
   name: (id) @module)
@@ -17,7 +15,7 @@
 (import_item
   name: (id) @module
   (extern_type
-    (interface_body)))
+    (body)))
 
 (import_item
   name: (id) @function
@@ -27,7 +25,7 @@
 (export_item
   name: (id) @module
   (extern_type
-    (interface_body)))
+    (body)))
 
 (export_item
   name: (id) @function
@@ -55,7 +53,7 @@
 (flags_items
   name: (id) @type)
 
-(flags_body
+(body
   (id) @variable.member)
 
 (variant_items
@@ -128,8 +126,6 @@
   "s64"
   "f32"
   "f64"
-  "float32" ; deprecated
-  "float64" ; deprecated
   "char"
   "bool"
   "string"
@@ -163,4 +159,13 @@
   "<"
 ] @punctuation.bracket
 
-"=" @operator
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+(line_comment
+  (doc_comment)) @comment.documentation
+
+(block_comment
+  (doc_comment)) @comment.documentation
diff --git a/runtime/queries/wit/injections.scm b/runtime/queries/wit/injections.scm
index 2f0e58eb6..3cd6aac8e 100644
--- a/runtime/queries/wit/injections.scm
+++ b/runtime/queries/wit/injections.scm
@@ -1,2 +1,5 @@
-((comment) @injection.content
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
   (#set! injection.language "comment"))
-- 
cgit v1.2.3-70-g09d2