From 4d5a8e7006db5ad78b8af87ffff988727999745d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 21 Dec 2024 21:01:19 -0500
Subject: [PATCH] feat(kconfig): adapt queries to parser changes

---
 lockfile.json                  |  2 +-
 queries/kconfig/highlights.scm | 19 +++++++++++--------
 queries/kconfig/locals.scm     |  8 ++++----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a59769d3b..a599e6e6f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -396,7 +396,7 @@
     "revision": "f6d29300f9fee15dcd8c2b25ab762001d38da731"
   },
   "kconfig": {
-    "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
+    "revision": "9934ff456d867d0d0f98ef365a0de410ff4e6705"
   },
   "kdl": {
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index 307ce1a13..deb88bc00 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -70,33 +70,36 @@
 (symbol) @variable
 
 [
-  (prompt)
+  (string)
   (macro_content)
   (text)
 ] @string
 
 (config
-  name: (symbol) @constant)
+  name: (name
+    (symbol) @constant))
 
 (menuconfig
-  name: (symbol) @constant)
+  name: (name
+    (symbol) @constant))
 
 (choice
-  name: (symbol) @constant)
+  name: (name
+    (symbol) @constant))
 
 ((symbol) @constant
   (#lua-match? @constant "[A-Z0-9]+"))
 
 (mainmenu
-  name: (prompt) @markup.heading)
+  name: (string) @markup.heading)
 
 (comment_entry
-  name: (prompt) @markup.heading)
+  name: (string) @markup.heading)
 
 (menu
-  name: (prompt) @markup.heading)
+  name: (string) @markup.heading)
 
 (source
-  (prompt) @string.special.url)
+  (string) @string.special.url)
 
 (comment) @comment @spell
diff --git a/queries/kconfig/locals.scm b/queries/kconfig/locals.scm
index 1fc1b30a7..09a50fecb 100644
--- a/queries/kconfig/locals.scm
+++ b/queries/kconfig/locals.scm
@@ -1,6 +1,6 @@
 [
   (symbol)
-  (prompt)
+  (string)
 ] @local.reference
 
 [
@@ -13,12 +13,12 @@
 ] @local.scope
 
 (type_definition
-  (prompt) @local.definition.var)
+  (string) @local.definition.var)
 
 (type_definition
   (input_prompt
-    (prompt) @local.definition.var))
+    (string) @local.definition.var))
 
 (type_definition_default
   (expression
-    (prompt) @local.definition.var))
+    (string) @local.definition.var))