feat!: add support for Zephyr's Kconfig extensions

.github/workflows/ci.yml

@@ -43,10 +43,14 @@ jobs:
           test-go: true
           test-swift: true
       - name: Set up examples
+        if: matrix.os != 'windows-latest'
         run: |-
-          git clone https://github.com/torvalds/linux examples/linux --single-branch --depth=1 --filter=blob:none
+          git clone https://github.com/torvalds/linux            examples/linux  --single-branch --depth=1 --filter=blob:none
+          git clone https://github.com/zephyrproject-rtos/zephyr examples/zephyr --single-branch --depth=1 --filter=blob:none
+        # TODO: Fix parsing on windows, case-insensitive fs leads to folders named `kconfig` being parsed
       - name: Parse examples
         uses: tree-sitter/parse-action@v4
+        if: matrix.os != 'windows-latest'
         with:
           files: |
             examples/**/Kconfig*

grammar.js

@@ -19,6 +19,10 @@ const PREC = {
 module.exports = grammar({
   name: 'kconfig',
 
+  conflicts: $ => [
+    [$.expression, $.name],
+  ],
+
   extras: $ => [
     /\s/,
     /\\\r?\n/,
@@ -36,15 +40,12 @@ module.exports = grammar({
   word: $ => $.symbol,
 
   rules: {
-    configuration: $ => seq(
-      optional($.mainmenu),
-      repeat($._entry),
-    ),
-
-    mainmenu: $ => seq('mainmenu', field('name', $.prompt)),
+    configuration: $ => repeat($._entry),
 
     _entry: $ => choice(
+      $.mainmenu,
       $.config,
+      $.configdefault,
       $.menuconfig,
       $.choice,
       $.comment_entry,
@@ -54,35 +55,43 @@ module.exports = grammar({
       $.variable,
     ),
 
+    mainmenu: $ => seq('mainmenu', field('name', $.string)),
+
     config: $ => seq(
       'config',
-      field('name', $.symbol),
+      field('name', $.name),
       repeat1($._config_option),
     ),
 
+    configdefault: $ => seq(
+      'configdefault',
+      field('name', $.name),
+      repeat1($.default_value),
+    ),
+
     menuconfig: $ => seq(
       'menuconfig',
-      field('name', $.symbol),
+      field('name', $.name),
       repeat1($._config_option),
     ),
 
     choice: $ => seq(
       'choice',
-      optional(field('name', $.symbol)),
+      optional(field('name', $.name)),
       repeat1($._config_option),
-      repeat1($._entry),
+      repeat($._entry),
       'endchoice',
     ),
 
     comment_entry: $ => seq(
       'comment',
-      field('name', $.prompt),
+      field('name', $.string),
       repeat($._config_option),
     ),
 
     menu: $ => seq(
       'menu',
-      field('name', $.prompt),
+      field('name', $.string),
       repeat($._config_option),
       repeat($._entry),
       'endmenu',
@@ -95,12 +104,18 @@ module.exports = grammar({
       'endif',
     ),
 
-    source: $ => seq('source', $.prompt),
+    source: $ => seq(
+      choice('source', 'rsource', 'osource', 'orsource'),
+      $.string,
+    ),
 
     variable: $ => seq(
       field('left', $.symbol),
       choice('=', ':=', '+=', '?='),
-      repeat(choice(',', field('right', $.expression))),
+      choice(
+        repeat(choice(',', field('right', $.expression))),
+        $.text,
+      ),
       /\r?\n/,
     ),
 
@@ -121,14 +136,14 @@ module.exports = grammar({
 
     type_definition: $ => seq(
       choice('bool', 'tristate', 'int', 'hex', 'string'),
-      optional(choice($.prompt, $.input_prompt)),
+      optional(choice($.string, $.input_prompt)),
       optional($.conditional_clause),
       /\n/,
     ),
 
     input_prompt: $ => seq(
       'prompt',
-      $.prompt,
+      $.string,
       optional($.conditional_clause),
       /\n/,
     ),
@@ -141,7 +156,7 @@ module.exports = grammar({
     ),
 
     type_definition_default: $ => seq(
-      choice('def_bool', 'def_tristate'),
+      choice('def_bool', 'def_tristate', 'def_int', 'def_hex', 'def_string'),
       $.expression,
       optional($.conditional_clause),
       /\n/,
@@ -155,7 +170,7 @@ module.exports = grammar({
 
     reverse_dependencies: $ => seq(
       'select',
-      $.symbol,
+      $.name,
       optional($.conditional_clause),
       /\n/,
     ),
@@ -193,7 +208,8 @@ module.exports = grammar({
 
     expression: $ => choice(
       $.symbol,
-      $.prompt,
+      $.name,
+      $.string,
       $.macro_variable,
       $.unary_expression,
       $.binary_expression,
@@ -229,18 +245,42 @@ module.exports = grammar({
       repeat(choice(
         $.macro_variable,
         $.macro_content,
-        alias($.prompt, $.text),
+        alias($.string, $.text),
       )),
       ')',
     ),
     macro_content: _ => /([^\$'"\)]|(\([^\)]*\))|(\\\$)|\$[^(])+/,
 
-    prompt: _ => token(choice(
-      seq('"', repeat(choice(/[^"\\]/, /\\./)), '"'),
-      seq('\'', repeat(choice(/[^'\\]/, /\\./)), '\''),
-    )),
+    string: $ => choice(
+      seq(
+        '"',
+        repeat(choice(
+          alias(/([^"\\]|\$[^\(])+/, $.string_content),
+          /\\(.|\n)/,
+          $.macro_variable,
+        )),
+        '"',
+      ),
+      seq(
+        '\'',
+        repeat(choice(
+          alias(/([^'\\]|\$[^\(])+/, $.string_content),
+          /\\(.|\n)/,
+          $.macro_variable,
+        )),
+        '\'',
+      ),
+    ),
 
-    symbol: _ => /-?[a-zA-Z0-9_]+/,
+    symbol: _ => /-?[a-zA-Z0-9_-]+/,
+
+    text: _ => /[^\s].*/,
+
+    name: $ => prec.right(prec.dynamic(-1, repeat1(choice(
+      $.symbol,
+      $.macro_variable,
+      $.string,
+    )))),
 
     comment: _ => token(seq('#', /.*/)),
   },

queries/highlights.scm

@@ -58,23 +58,24 @@
 (symbol) @variable
 
 [
-  (prompt)
+  (string)
   (macro_content)
   (text)
 ] @string
 
-(config name: (symbol) @constant)
-(menuconfig name: (symbol) @constant)
-(choice name: (symbol) @constant)
+(config name: (name (symbol) @constant))
+(configdefault name: (name (symbol) @constant))
+(menuconfig name: (name (symbol) @constant))
+(choice name: (name (symbol) @constant))
 
 ((symbol) @constant
   (#lua-match? @constant "[A-Z0-9]+"))
 
-(mainmenu name: (prompt) @text.title)
-(comment_entry name: (prompt) @text.title)
-(menu name: (prompt) @text.title)
+(mainmenu name: (string) @text.title)
+(comment_entry name: (string) @text.title)
+(menu name: (string) @text.title)
 
-(source (prompt) @text.uri @string.special)
+(source (string) @text.uri @string.special)
 
 (comment) @comment
 

queries/locals.scm

@@ -1,6 +1,6 @@
 [
   (symbol)
-  (prompt)
+  (string)
 ] @reference
 
 [
@@ -12,6 +12,6 @@
   (if)
 ] @scope
 
-(type_definition (prompt) @definition.var)
-(type_definition (input_prompt (prompt) @definition.var))
-(type_definition_default (expression (prompt) @definition.var))
+(type_definition (string) @definition.var)
+(type_definition (input_prompt (string) @definition.var))
+(type_definition_default (expression (string) @definition.var))