WIP: PLAYGROUND

This means regenerating all the tree-sitter files, and adding newly
generated outputs (mostly new bindings).

The `--apply-all-captures` flag has been removed, it is now the default
(and only) matching behaviour.

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-bp"
 description = "Blueprint grammar for the tree-sitter parsing library"
-version = "0.5.0"
+version = "0.3.0"
 keywords = ["incremental", "parsing", "android", "blueprint"]
 categories = ["parsing", "text-editors"]
 repository = "https://git.belanyi.fr/ambroisie/tree-sitter-bp"

Makefile

@@ -14,5 +14,5 @@ update-tests: all
 
 .PHONY: playground
 playground:
-	nix shell pkgs#emscripten --command tree-sitter build-wasm
+	nix shell pkgs#emscripten --command tree-sitter build --wasm
 	tree-sitter playground

bindings/rust/lib.rs

@@ -35,11 +35,10 @@ pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
 
 // Uncomment these to include any queries that this grammar contains
 
-pub const FOLDS_QUERY: &'static str = include_str!("../../queries/folds.scm");
+// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
-pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
+// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
-pub const INDENTS_QUERY: &'static str = include_str!("../../queries/indents.scm");
+// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
-pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
+// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
-pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
 
 #[cfg(test)]
 mod tests {

flake.nix

@@ -61,10 +61,6 @@
             export NVIM_TREESITTER_TEXTOBJECTS='${pkgs.vimPlugins.nvim-treesitter-textobjects}'
             export NVIM_TREESITTER_PARSER='${pkgs.vimPlugins.nvim-treesitter.grammarToPlugin self.packages.${system}.tree-sitter-bp}'
 
-            # FIXME: not sure why, but I get different behaviour when left untouched
-            XDG_CONFIG_HOME=$(mktemp -d)
-            export XDG_CONFIG_HOME
-
             nvim --headless --noplugin -u ${scripts/minimal_init.lua} \
                 -c "PlenaryBustedDirectory test/ { minimal_init = '${./scripts/minimal_init.lua}' }"
           '';
@@ -78,9 +74,8 @@
           ${pkgs.jq}/bin/jq ".version = \"''${NEW_VERSION}\"" package.json > package.json.tmp
           mv package.json.tmp package.json
           ${pkgs.gnused}/bin/sed -i -e "s/version = \"[0-9.]\\+\"/version = \"''${NEW_VERSION}\"/" Cargo.toml
-          ${pkgs.gnused}/bin/sed -i -e "s/version = \"[0-9.]\\+\"/version = \"''${NEW_VERSION}\"/" pyproject.toml
 
-          git add Cargo.toml package.json pyproject.toml
+          git add Cargo.toml package.json
           echo "Release ''${NEW_VERSION}" | git commit -eF -
           git tag -a "v''${NEW_VERSION}" -m "Release ''${NEW_VERSION}"
         '';
@@ -145,9 +140,7 @@
               bump-version
               nodejs
               nvim-test-runner
-              # FIXME: waiting on #301336
+              (tree-sitter.override { webUISupport = true; })
-              # (tree-sitter.override { webUISupport = true; })
-              tree-sitter
             ];
 
             inherit (checks.pre-commit) shellHook;

grammar.js

@@ -1,12 +1,8 @@
-function commaSeparatedOptTrailing(elem) {
+function commaSeparated(elem) {
   return seq(elem, repeat(seq(",", elem)), optional(","))
 }
 
-function commaSeparatedNoTrailing(elem) {
+function trailingCommaSeparated(elem) {
-  return seq(elem, repeat(seq(",", elem)))
-}
-
-function commaSeparatedTrailing(elem) {
   return repeat(seq(elem, ","))
 }
 
@@ -48,7 +44,7 @@ module.exports = grammar({
     _old_module: ($) => seq(
       field("type", $.identifier),
       "{",
-      optional(commaSeparatedOptTrailing(
+      optional(commaSeparated(
         alias(field("property", $._colon_property), $.property)
       )),
       "}",
@@ -57,7 +53,7 @@ module.exports = grammar({
     _new_module: ($) => seq(
       field("type", $.identifier),
       "(",
-      optional(commaSeparatedOptTrailing(
+      optional(commaSeparated(
         alias(field("property", $._equal_property), $.property)
       )),
       ")",
@@ -125,53 +121,54 @@ module.exports = grammar({
     select_expression: ($) => seq(
       "select",
       "(",
-      $.select_value,
+      choice($.select_value, $.soong_config_variable),
       ",",
       $.select_cases,
       ")",
     ),
 
-    select_value: ($) => choice(
+    select_value: ($) => seq(
-      $.condition,
+      field("type", alias(
-      seq("(", commaSeparatedOptTrailing($.condition), ")"),
+        choice("product_variable", "release_variable", "variant"),
+        $.selection_type,
+      )),
+      "(",
+      field("condition", $._string_literal),
+      ")",
     ),
 
-    condition: ($) => seq(
+    soong_config_variable: ($) => seq(
-      field("name", $.identifier),
+      field("type", alias("soong_config_variable", $.selection_type)),
       "(",
-      field("arguments", optional(commaSeparatedNoTrailing($._string_literal))),
+      field(
+        "condition",
+        seq(
+          field("namespace", $._string_literal),
+          ",",
+          field("variable", $._string_literal),
+        ),
+      ),
       ")",
     ),
 
     select_cases: ($) => seq(
       "{",
-      optional(commaSeparatedTrailing($.select_case)),
+      optional(trailingCommaSeparated($.select_case)),
+      // default *must* be the last one, enforced at parse-time...
+      optional(seq(alias($.default_case, $.select_case), ",")),
       "}",
     ),
 
     select_case: ($) => seq(
-      field("pattern", $.select_pattern),
+      field("pattern", $._string_literal),
       ":",
       field("value", $._case_value)
     ),
 
-    select_pattern: ($) => choice(
+    default_case: ($) => seq(
-      $._select_pattern,
+      field("pattern", alias("default", $.default)),
-      seq("(", commaSeparatedOptTrailing($._select_pattern), ")"),
+      ":",
-    ),
+      field("value", $._case_value),
-
-    _select_pattern: ($) => choice(
-      $._string_literal,
-      $.boolean_literal,
-      alias("any", $.any),
-      $.pattern_binding,
-      alias("default", $.default),
-    ),
-
-    pattern_binding: ($) => seq(
-      field("value", alias("any", $.any)),
-      field("operator", alias("@", $.operator)),
-      field("binding", $.identifier),
     ),
 
     _case_value: ($) => choice(
@@ -181,13 +178,13 @@ module.exports = grammar({
 
     list_expression: ($) => seq(
       "[",
-      optional(commaSeparatedOptTrailing(field("element", $._expr))),
+      optional(commaSeparated(field("element", $._expr))),
       "]",
     ),
 
     map_expression: ($) => seq(
       "{",
-      optional(commaSeparatedOptTrailing(
+      optional(commaSeparated(
         alias(field("property", $._colon_property), $.property)
       )),
       "}",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-bp",
-  "version": "0.5.0",
+  "version": "0.3.0",
   "description": "Blueprint grammar for tree-sitter",
   "main": "bindings/node",
   "types": "bindings/node",
@@ -43,11 +43,6 @@
       "file-types": [
         "bp"
       ],
-      "folds": "queries/folds.scm",
-      "highlights": "queries/highlights.scm",
-      "indents": "queries/indents.scm",
-      "injections": "queries/injections.scm",
-      "tags": "queries/tags.scm",
       "injection-regex": "bp"
     }
   ]

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-bp"
 description = "Bp grammar for tree-sitter"
-version = "0.5.0"
+version = "0.0.1"
 keywords = ["incremental", "parsing", "tree-sitter", "bp"]
 classifiers = [
   "Intended Audience :: Developers",

queries/highlights.scm

@@ -50,10 +50,8 @@
 [
  (unset)
  (default)
- (any)
 ] @variable.builtin
-(condition
+(selection_type) @function.builtin
- name: (identifier) @function.builtin)
 ; }}}
 
 ; Expressions {{{

queries/indents.scm

@@ -11,15 +11,6 @@
 (select_expression
   ")" @indent.branch)
 
-(select_value) @indent.begin
-(select_value
-  ")" @indent.branch)
-
-(select_pattern
-  "(" @indent.begin)
-(select_pattern
-  ")" @indent.branch)
-
 (select_cases) @indent.begin
 (select_cases
   "}" @indent.branch)

queries/locals.scm

@@ -9,9 +9,6 @@
 (assignment
   left: (identifier) @local.definition.var)
 
-(pattern_binding
-  binding: (identifier) @local.definition.var)
-
 (identifier) @local.reference
 
 ; vim: sw=2 foldmethod=marker

src/grammar.json

@@ -469,8 +469,17 @@
           "value": "("
         },
         {
-          "type": "SYMBOL",
+          "type": "CHOICE",
-          "name": "select_value"
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "select_value"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "soong_config_variable"
+            }
+          ]
         },
         {
           "type": "STRING",
@@ -487,73 +496,32 @@
       ]
     },
     "select_value": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "condition"
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "("
-            },
-            {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "condition"
-                },
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": ","
-                      },
-                      {
-                        "type": "SYMBOL",
-                        "name": "condition"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "STRING",
-              "value": ")"
-            }
-          ]
-        }
-      ]
-    },
-    "condition": {
       "type": "SEQ",
       "members": [
         {
           "type": "FIELD",
-          "name": "name",
+          "name": "type",
           "content": {
-            "type": "SYMBOL",
+            "type": "ALIAS",
-            "name": "identifier"
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "product_variable"
+                },
+                {
+                  "type": "STRING",
+                  "value": "release_variable"
+                },
+                {
+                  "type": "STRING",
+                  "value": "variant"
+                }
+              ]
+            },
+            "named": true,
+            "value": "selection_type"
           }
         },
         {
@@ -562,37 +530,63 @@
         },
         {
           "type": "FIELD",
-          "name": "arguments",
+          "name": "condition",
           "content": {
-            "type": "CHOICE",
+            "type": "SYMBOL",
+            "name": "_string_literal"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
+    "soong_config_variable": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "type",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "STRING",
+              "value": "soong_config_variable"
+            },
+            "named": true,
+            "value": "selection_type"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "FIELD",
+          "name": "condition",
+          "content": {
+            "type": "SEQ",
             "members": [
               {
-                "type": "SEQ",
+                "type": "FIELD",
-                "members": [
+                "name": "namespace",
-                  {
+                "content": {
-                    "type": "SYMBOL",
+                  "type": "SYMBOL",
-                    "name": "_string_literal"
+                  "name": "_string_literal"
-                  },
+                }
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "_string_literal"
-                        }
-                      ]
-                    }
-                  }
-                ]
               },
               {
-                "type": "BLANK"
+                "type": "STRING",
+                "value": ","
+              },
+              {
+                "type": "FIELD",
+                "name": "variable",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "_string_literal"
+                }
               }
             ]
           }
@@ -634,6 +628,32 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "ALIAS",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "default_case"
+                  },
+                  "named": true,
+                  "value": "select_case"
+                },
+                {
+                  "type": "STRING",
+                  "value": ","
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": "}"
@@ -648,7 +668,7 @@
           "name": "pattern",
           "content": {
             "type": "SYMBOL",
-            "name": "select_pattern"
+            "name": "_string_literal"
           }
         },
         {
@@ -665,135 +685,32 @@
         }
       ]
     },
-    "select_pattern": {
+    "default_case": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_select_pattern"
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "("
-            },
-            {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "_select_pattern"
-                },
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": ","
-                      },
-                      {
-                        "type": "SYMBOL",
-                        "name": "_select_pattern"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "STRING",
-              "value": ")"
-            }
-          ]
-        }
-      ]
-    },
-    "_select_pattern": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_string_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "boolean_literal"
-        },
-        {
-          "type": "ALIAS",
-          "content": {
-            "type": "STRING",
-            "value": "any"
-          },
-          "named": true,
-          "value": "any"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "pattern_binding"
-        },
-        {
-          "type": "ALIAS",
-          "content": {
-            "type": "STRING",
-            "value": "default"
-          },
-          "named": true,
-          "value": "default"
-        }
-      ]
-    },
-    "pattern_binding": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "FIELD",
+          "name": "pattern",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "STRING",
+              "value": "default"
+            },
+            "named": true,
+            "value": "default"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ":"
+        },
         {
           "type": "FIELD",
           "name": "value",
-          "content": {
-            "type": "ALIAS",
-            "content": {
-              "type": "STRING",
-              "value": "any"
-            },
-            "named": true,
-            "value": "any"
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "operator",
-          "content": {
-            "type": "ALIAS",
-            "content": {
-              "type": "STRING",
-              "value": "@"
-            },
-            "named": true,
-            "value": "operator"
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "binding",
           "content": {
             "type": "SYMBOL",
-            "name": "identifier"
+            "name": "_case_value"
           }
         }
       ]

src/node-types.json

@@ -177,40 +177,6 @@
     "named": true,
     "fields": {}
   },
-  {
-    "type": "condition",
-    "named": true,
-    "fields": {
-      "arguments": {
-        "multiple": true,
-        "required": false,
-        "types": [
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "interpreted_string_literal",
-            "named": true
-          },
-          {
-            "type": "raw_string_literal",
-            "named": true
-          }
-        ]
-      },
-      "name": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "identifier",
-            "named": true
-          }
-        ]
-      }
-    }
-  },
   {
     "type": "integer_literal",
     "named": true,
@@ -321,42 +287,6 @@
       }
     }
   },
-  {
-    "type": "pattern_binding",
-    "named": true,
-    "fields": {
-      "binding": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "identifier",
-            "named": true
-          }
-        ]
-      },
-      "operator": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "operator",
-            "named": true
-          }
-        ]
-      },
-      "value": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "any",
-            "named": true
-          }
-        ]
-      }
-    }
-  },
   {
     "type": "property",
     "named": true,
@@ -424,7 +354,15 @@
         "required": true,
         "types": [
           {
-            "type": "select_pattern",
+            "type": "default",
+            "named": true
+          },
+          {
+            "type": "interpreted_string_literal",
+            "named": true
+          },
+          {
+            "type": "raw_string_literal",
             "named": true
           }
         ]
@@ -507,40 +445,9 @@
         {
           "type": "select_value",
           "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "select_pattern",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "any",
-          "named": true
         },
         {
-          "type": "boolean_literal",
+          "type": "soong_config_variable",
-          "named": true
-        },
-        {
-          "type": "default",
-          "named": true
-        },
-        {
-          "type": "interpreted_string_literal",
-          "named": true
-        },
-        {
-          "type": "pattern_binding",
-          "named": true
-        },
-        {
-          "type": "raw_string_literal",
           "named": true
         }
       ]
@@ -549,16 +456,85 @@
   {
     "type": "select_value",
     "named": true,
-    "fields": {},
+    "fields": {
-    "children": {
+      "condition": {
-      "multiple": true,
+        "multiple": false,
-      "required": true,
+        "required": true,
-      "types": [
+        "types": [
-        {
+          {
-          "type": "condition",
+            "type": "interpreted_string_literal",
-          "named": true
+            "named": true
-        }
+          },
-      ]
+          {
+            "type": "raw_string_literal",
+            "named": true
+          }
+        ]
+      },
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "selection_type",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
+  {
+    "type": "soong_config_variable",
+    "named": true,
+    "fields": {
+      "condition": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": ",",
+            "named": false
+          }
+        ]
+      },
+      "namespace": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "interpreted_string_literal",
+            "named": true
+          },
+          {
+            "type": "raw_string_literal",
+            "named": true
+          }
+        ]
+      },
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "selection_type",
+            "named": true
+          }
+        ]
+      },
+      "variable": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "interpreted_string_literal",
+            "named": true
+          },
+          {
+            "type": "raw_string_literal",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -628,10 +604,6 @@
     "type": "]",
     "named": false
   },
-  {
-    "type": "any",
-    "named": true
-  },
   {
     "type": "default",
     "named": true
@@ -660,6 +632,10 @@
     "type": "select",
     "named": false
   },
+  {
+    "type": "selection_type",
+    "named": true
+  },
   {
     "type": "true",
     "named": false

test/corpus/select.txt

@@ -4,7 +4,6 @@ Select
 
 foo = select(release_variable("RELEASE_TEST"), {
     "d": "d2",
-    any: unset,
     default: unset,
 })
 
@@ -16,21 +15,14 @@ foo = select(release_variable("RELEASE_TEST"), {
     (operator)
     (select_expression
       (select_value
-        (condition
+        (selection_type)
-          (identifier)
+        (interpreted_string_literal))
-          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (select_pattern
+          (default)
-            (any))
-          (unset))
-        (select_case
-          (select_pattern
-            (default))
           (unset))))))
 
 ================================================================================
@@ -40,7 +32,6 @@ Select (soong config variable)
 foo = select(soong_config_variable("my_namespace", "my_var"), {
     "foo": unset,
     "default": "bar",
-    any @ foo: unset,
 })
 
 --------------------------------------------------------------------------------
@@ -50,27 +41,17 @@ foo = select(soong_config_variable("my_namespace", "my_var"), {
     (identifier)
     (operator)
     (select_expression
-      (select_value
+      (soong_config_variable
-        (condition
+        (selection_type)
-          (identifier)
+        (interpreted_string_literal)
-          (interpreted_string_literal)
+        (interpreted_string_literal))
-          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (unset))
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
+          (interpreted_string_literal))))))
-          (interpreted_string_literal))
-        (select_case
-          (select_pattern
-            (pattern_binding
-              (any)
-              (operator)
-              (identifier)))
-          (unset))))))
 
 ================================================================================
 Select (no default)
@@ -91,25 +72,20 @@ foo = select(variant("arch"), {
     (operator)
     (select_expression
       (select_value
-        (condition
+        (selection_type)
-          (identifier)
+        (interpreted_string_literal))
-          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (interpreted_string_literal))))))
 
 ================================================================================
@@ -126,9 +102,8 @@ foo = select(variant("VARIANT"), {})
     (operator)
     (select_expression
       (select_value
-        (condition
+        (selection_type)
-          (identifier)
+        (interpreted_string_literal))
-          (interpreted_string_literal)))
       (select_cases))))
 
 ================================================================================
@@ -151,29 +126,24 @@ foo = select(variant("VARIANT"), {
     (operator)
     (select_expression
       (select_value
-        (condition
+        (selection_type)
-          (identifier)
+        (interpreted_string_literal))
-          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
+          (interpreted_string_literal))
+        (ERROR
+          (select_case
+            (default)
+            (unset)))
+        (select_case
+          (interpreted_string_literal)
           (interpreted_string_literal))
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (default))
-          (unset))
-        (select_case
-          (select_pattern
-            (interpreted_string_literal))
-          (interpreted_string_literal))
-        (select_case
-          (select_pattern
-            (interpreted_string_literal))
           (interpreted_string_literal))))))
 
 ================================================================================
@@ -193,16 +163,14 @@ foo = select(variant(), {
     (operator)
     (select_expression
       (select_value
-        (condition
+        (selection_type)
-          (identifier)))
+        (MISSING raw_string_literal))
       (select_cases
         (select_case
-          (select_pattern
+          (interpreted_string_literal)
-            (interpreted_string_literal))
           (unset))
         (select_case
-          (select_pattern
+          (default)
-            (default))
           (interpreted_string_literal))))))
 
 ================================================================================
@@ -220,20 +188,14 @@ foo = select(some_unknown_type("CONDITION"), {
   (assignment
     (identifier)
     (operator)
-    (select_expression
+    (ERROR
-      (select_value
+      (identifier)
-        (condition
+      (identifier)
-          (identifier)
+      (interpreted_string_literal)
-          (interpreted_string_literal)))
+      (interpreted_string_literal)
-      (select_cases
+      (default))
-        (select_case
+    (interpreted_string_literal))
-          (select_pattern
+  (ERROR))
-            (interpreted_string_literal))
-          (interpreted_string_literal))
-        (select_case
-          (select_pattern
-            (default))
-          (interpreted_string_literal))))))
 
 ================================================================================
 Select (multiple type arguments)
@@ -252,136 +214,16 @@ foo = select(release_variable("ONE", "TWO"), {
     (operator)
     (select_expression
       (select_value
-        (condition
+        (selection_type)
-          (identifier)
+        (ERROR
+          (interpreted_string_literal))
+        (interpreted_string_literal))
+      (select_cases
+        (select_case
           (interpreted_string_literal)
-          (interpreted_string_literal)))
-      (select_cases
-        (select_case
-          (select_pattern
-            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (select_pattern
+          (default)
-            (default))
-          (interpreted_string_literal))))))
-
-================================================================================
-Select (trailing comma in arguments)
-================================================================================
-
-foo = select(some_boolean("VALUE",), {
-    true: "true",
-    false: "false",
-})
-
---------------------------------------------------------------------------------
-
-(source_file
-  (assignment
-    (identifier)
-    (operator)
-    (select_expression
-      (select_value
-        (condition
-          (identifier)
-          (interpreted_string_literal)
-          (ERROR)))
-      (select_cases
-        (select_case
-          (select_pattern
-            (boolean_literal))
-          (interpreted_string_literal))
-        (select_case
-          (select_pattern
-            (boolean_literal))
-          (interpreted_string_literal))))))
-
-================================================================================
-Select (trailing comma in values)
-================================================================================
-
-foo = select((
-    arch(),
-    os(),
-), {
-    (default, default): "true",
-})
-
---------------------------------------------------------------------------------
-
-(source_file
-  (assignment
-    (identifier)
-    (operator)
-    (select_expression
-      (select_value
-        (condition
-          (identifier))
-        (condition
-          (identifier)))
-      (select_cases
-        (select_case
-          (select_pattern
-            (default)
-            (default))
-          (interpreted_string_literal))))))
-
-================================================================================
-Select (trailing comma in pattern)
-================================================================================
-
-foo = select((arch(), os()), {
-    (default, default,): "true",
-})
-
---------------------------------------------------------------------------------
-
-(source_file
-  (assignment
-    (identifier)
-    (operator)
-    (select_expression
-      (select_value
-        (condition
-          (identifier))
-        (condition
-          (identifier)))
-      (select_cases
-        (select_case
-          (select_pattern
-            (default)
-            (default))
-          (interpreted_string_literal))))))
-
-================================================================================
-Select (boolean typed)
-================================================================================
-
-foo = select(some_boolean("IS_TRUE"), {
-    true: "true",
-    false: "false",
-})
-
---------------------------------------------------------------------------------
-
-(source_file
-  (assignment
-    (identifier)
-    (operator)
-    (select_expression
-      (select_value
-        (condition
-          (identifier)
-          (interpreted_string_literal)))
-      (select_cases
-        (select_case
-          (select_pattern
-            (boolean_literal))
-          (interpreted_string_literal))
-        (select_case
-          (select_pattern
-            (boolean_literal))
           (interpreted_string_literal))))))
 
 ================================================================================

test/highlight/builtins.bp

@@ -2,8 +2,6 @@ foo = select(soong_config_variable("my_namespace", "my_var"), {
     //       ^ function.builtin
     "foo": unset,
     //     ^ variable.builtin
-    any: unset,
-    // <- variable.builtin
     default: select(variant("VARIANT"), {}),
     // <- variable.builtin
     //              ^ function.builtin

test/highlight/select.bp

@@ -1,9 +1,6 @@
 foo = select(soong_config_variable("my_namespace", "my_var"), {
     // ^ keyword.conditional
     "foo": unset,
-    any @ foo: unset,
-    //  ^ operator
-    //    ^ variable
     default: "bar",
 })
 

test/indent/select.bp

@@ -26,35 +26,3 @@ foo = select(
         default: 0,
     }
 )
-
-foo = select((
-    arch(),
-    os(),
-), {
-    (default, default): [],
-})
-
-foo = select(
-    (arch(), os()),
-    {
-        (default, default): [],
-    }
-)
-
-// We're really getting into more and more unlikely choices here...
-foo = select(
-    (
-        arch(),
-        os(),
-    ),
-    {
-        (default, default): [],
-    }
-)
-
-foo = select((arch(), os()), {
-    (
-        default,
-        default,
-    ): [],
-})

test/indent_spec.lua

@@ -1,7 +1,6 @@
 package.path = package.path .. ";" .. vim.env.NVIM_TREESITTER .. "/?.lua"
 
 local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
 
 -- FIXME: path to root
 local runner = Runner:new(it, ".", {
@@ -20,7 +19,7 @@ describe("indent Blueprint:", function()
         })
         runner:whole_file("test/indent/", {
             expected_failures = {
-                "test/indent/select.bp",
+                -- NOTE: none for now
             },
         })
     end)
@@ -40,22 +39,9 @@ describe("indent Blueprint:", function()
         runner:new_line("test/indent/select.bp", { on_line = 1, text = 'default: "value"', indent = 4 }, "default case")
         runner:new_line("test/indent/select.bp", { on_line = 11, text = '"case": "value"', indent = 4 }, "select case, trailing")
         runner:new_line("test/indent/select.bp", { on_line = 11, text = 'default: "value"', indent = 4 }, "default case, trailing")
-        runner:new_line("test/indent/select.bp", { on_line = 11, text = '}', indent = 0 }, "select cases closing delimiter")
-        runner:new_line("test/indent/select.bp", { on_line = 27, text = ')', indent = 0 }, "select expression closing delimiter")
         runner:new_line("test/indent/select.bp", { on_line = 16, text = '"case": "value"', indent = 8 }, "select case, alternate formatting")
         runner:new_line("test/indent/select.bp", { on_line = 16, text = 'default: "value"', indent = 8 }, "default case, alternate formatting")
         runner:new_line("test/indent/select.bp", { on_line = 26, text = '"case": "value"', indent = 8 }, "select case, trailing, alternate formatting")
         runner:new_line("test/indent/select.bp", { on_line = 26, text = 'default: "value"', indent = 8 }, "default case, trailing, alternate formatting")
-        runner:new_line("test/indent/select.bp", { on_line = 26, text = '}', indent = 4 }, "select cases closing delimiter, alternate formatting")
-        runner:new_line("test/indent/select.bp", { on_line = 27, text = ')', indent = 0 }, "select expression closing delimiter, alternate formatting")
-        runner:new_line("test/indent/select.bp", { on_line = 30, text = 'device()', indent = 4 }, "multi-valued select condition, begin")
-        runner:new_line("test/indent/select.bp", { on_line = 31, text = 'device()', indent = 4 }, "multi-valued select condition, middle")
-        runner:new_line("test/indent/select.bp", { on_line = 32, text = 'device()', indent = 4 }, "multi-valued select condition, end")
-        runner:new_line("test/indent/select.bp", { on_line = 46, text = 'device()', indent = 8 }, "multi-valued select condition, begin, alternate formatting")
-        runner:new_line("test/indent/select.bp", { on_line = 47, text = 'device()', indent = 8 }, "multi-valued select condition, middle, alternate formatting")
-        runner:new_line("test/indent/select.bp", { on_line = 48, text = 'device()', indent = 8 }, "multi-valued select condition, end, alternate formatting")
-        runner:new_line("test/indent/select.bp", { on_line = 56, text = 'default,', indent = 8 }, "multi-valued select case, begin", XFAIL)
-        runner:new_line("test/indent/select.bp", { on_line = 57, text = 'default,', indent = 8 }, "multi-valued select case, middle", XFAIL)
-        runner:new_line("test/indent/select.bp", { on_line = 58, text = 'default,', indent = 8 }, "multi-valued select case, end", XFAIL)
     end)
 end)