Release 0.4.0

Unfortunately, the indentation feature is still a work in progress, so
we have some expected failures in our tests...

.editorconfig

@@ -0,0 +1,39 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{json,toml,yml,gyp}]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.rs]
+indent_style = space
+indent_size = 4
+
+[*.{c,cc,h}]
+indent_style = space
+indent_size = 4
+
+[*.{py,pyi}]
+indent_style = space
+indent_size = 4
+
+[*.swift]
+indent_style = space
+indent_size = 4
+
+[*.go]
+indent_style = tab
+indent_size = 8
+
+[Makefile]
+indent_style = tab
+indent_size = 8

.gitattributes

@@ -2,4 +2,6 @@
 src/grammar.json linguist-generated=true
 src/node-types.json linguist-generated=true
 src/parser.c linguist-generated=true
+src/tree_sitter/alloc.h linguist-generated=true
+src/tree_sitter/array.h linguist-generated=true
 src/tree_sitter/parser.h linguist-generated=true

Cargo.toml

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

Makefile

@@ -4,12 +4,12 @@ all:
 
 .PHONY: test
 test: all
-	tree-sitter test --apply-all-captures
+	tree-sitter test
 	nvim-test-runner
 
 .PHONY: update-tests
 update-tests: all
-	tree-sitter test -u --apply-all-captures
+	tree-sitter test -u
 	nvim-test-runner
 
 .PHONY: playground

Package.swift

@@ -0,0 +1,48 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "TreeSitterBp",
+    platforms: [.macOS(.v10_13), .iOS(.v11)],
+    products: [
+        .library(name: "TreeSitterBp", targets: ["TreeSitterBp"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "TreeSitterBp",
+                path: ".",
+                exclude: [
+                    "Cargo.toml",
+                    "Makefile",
+                    "binding.gyp",
+                    "bindings/c",
+                    "bindings/go",
+                    "bindings/node",
+                    "bindings/python",
+                    "bindings/rust",
+                    "prebuilds",
+                    "grammar.js",
+                    "package.json",
+                    "package-lock.json",
+                    "pyproject.toml",
+                    "setup.py",
+                    "test",
+                    "examples",
+                    ".editorconfig",
+                    ".github",
+                    ".gitignore",
+                    ".gitattributes",
+                    ".gitmodules",
+                ],
+                sources: [
+                    "src/parser.c",
+                    // NOTE: if your language has an external scanner, add it here.
+                ],
+                resources: [
+                    .copy("queries")
+                ],
+                publicHeadersPath: "bindings/swift",
+                cSettings: [.headerSearchPath("src")])
+    ],
+    cLanguageStandard: .c11
+)

binding.gyp

@@ -2,18 +2,20 @@
   "targets": [
     {
       "target_name": "tree_sitter_bp_binding",
+      "dependencies": [
+        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
+      ],
       "include_dirs": [
-        "<!(node -e \"require('nan')\")",
+        "src",
-        "src"
       ],
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # If your language uses an external scanner, add it here.
+        # NOTE: if your language has an external scanner, add it here.
       ],
       "cflags_c": [
-        "-std=c99",
+        "-std=c11",
-      ]
+      ],
     }
   ]
 }

bindings/c/tree-sitter-bp.h

@@ -0,0 +1,16 @@
+#ifndef TREE_SITTER_BP_H_
+#define TREE_SITTER_BP_H_
+
+typedef struct TSLanguage TSLanguage;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const TSLanguage *tree_sitter_bp(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_BP_H_

bindings/c/tree-sitter-bp.pc.in

@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
+
+Name: tree-sitter-bp
+Description: Bp grammar for tree-sitter
+URL: @URL@
+Version: @VERSION@
+Requires: @REQUIRES@
+Libs: -L${libdir} @ADDITIONAL_LIBS@ -ltree-sitter-bp
+Cflags: -I${includedir}

bindings/go/binding.go

@@ -0,0 +1,13 @@
+package tree_sitter_bp
+
+// #cgo CFLAGS: -std=c11 -fPIC
+// #include "../../src/parser.c"
+// // NOTE: if your language has an external scanner, add it here.
+import "C"
+
+import "unsafe"
+
+// Get the tree-sitter Language for this grammar.
+func Language() unsafe.Pointer {
+	return unsafe.Pointer(C.tree_sitter_bp())
+}

bindings/go/binding_test.go

@@ -0,0 +1,15 @@
+package tree_sitter_bp_test
+
+import (
+	"testing"
+
+	tree_sitter "github.com/smacker/go-tree-sitter"
+	"git.belanyi.fr/ambroisie/tree-sitter-bp"
+)
+
+func TestCanLoadGrammar(t *testing.T) {
+	language := tree_sitter.NewLanguage(tree_sitter_bp.Language())
+	if language == nil {
+		t.Errorf("Error loading Bp grammar")
+	}
+}

bindings/go/go.mod

@@ -0,0 +1,5 @@
+module git.belanyi.fr/ambroisie/tree-sitter-bp
+
+go 1.22
+
+require github.com/smacker/go-tree-sitter v0.0.0-20230720070738-0d0a9f78d8f8

bindings/node/binding.cc

@@ -1,28 +1,20 @@
-#include "tree_sitter/parser.h"
+#include <napi.h>
-#include <node.h>
-#include "nan.h"
 
-using namespace v8;
+typedef struct TSLanguage TSLanguage;
 
-extern "C" TSLanguage * tree_sitter_bp();
+extern "C" TSLanguage *tree_sitter_bp();
 
-namespace {
+// "tree-sitter", "language" hashed with BLAKE2
+const napi_type_tag LANGUAGE_TYPE_TAG = {
+  0x8AF2E5212AD58ABF, 0xD5006CAD83ABBA16
+};
 
-NAN_METHOD(New) {}
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
-
+    exports["name"] = Napi::String::New(env, "bp");
-void Init(Local<Object> exports, Local<Object> module) {
+    auto language = Napi::External<TSLanguage>::New(env, tree_sitter_bp());
-  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+    language.TypeTag(&LANGUAGE_TYPE_TAG);
-  tpl->SetClassName(Nan::New("Language").ToLocalChecked());
+    exports["language"] = language;
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
+    return exports;
-
-  Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_bp());
-
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("bp").ToLocalChecked());
-  Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
 }
 
-NODE_MODULE(tree_sitter_bp_binding, Init)
+NODE_API_MODULE(tree_sitter_bp_binding, Init)
-
-}  // namespace

bindings/node/index.d.ts

@@ -0,0 +1,28 @@
+type BaseNode = {
+  type: string;
+  named: boolean;
+};
+
+type ChildNode = {
+  multiple: boolean;
+  required: boolean;
+  types: BaseNode[];
+};
+
+type NodeInfo =
+  | (BaseNode & {
+      subtypes: BaseNode[];
+    })
+  | (BaseNode & {
+      fields: { [name: string]: ChildNode };
+      children: ChildNode[];
+    });
+
+type Language = {
+  name: string;
+  language: unknown;
+  nodeTypeInfo: NodeInfo[];
+};
+
+declare const language: Language;
+export = language;

bindings/node/index.js

@@ -1,18 +1,6 @@
-try {
+const root = require("path").join(__dirname, "..", "..");
-  module.exports = require("../../build/Release/tree_sitter_bp_binding");
+
-} catch (error1) {
+module.exports = require("node-gyp-build")(root);
-  if (error1.code !== 'MODULE_NOT_FOUND') {
-    throw error1;
-  }
-  try {
-    module.exports = require("../../build/Debug/tree_sitter_bp_binding");
-  } catch (error2) {
-    if (error2.code !== 'MODULE_NOT_FOUND') {
-      throw error2;
-    }
-    throw error1
-  }
-}
 
 try {
   module.exports.nodeTypeInfo = require("../../src/node-types.json");

bindings/python/tree_sitter_bp/__init__.py

@@ -0,0 +1,5 @@
+"Bp grammar for tree-sitter"
+
+from ._binding import language
+
+__all__ = ["language"]

bindings/python/tree_sitter_bp/__init__.pyi

@@ -0,0 +1 @@
+def language() -> int: ...

bindings/python/tree_sitter_bp/binding.c

@@ -0,0 +1,27 @@
+#include <Python.h>
+
+typedef struct TSLanguage TSLanguage;
+
+TSLanguage *tree_sitter_bp(void);
+
+static PyObject* _binding_language(PyObject *self, PyObject *args) {
+    return PyLong_FromVoidPtr(tree_sitter_bp());
+}
+
+static PyMethodDef methods[] = {
+    {"language", _binding_language, METH_NOARGS,
+     "Get the tree-sitter language for this grammar."},
+    {NULL, NULL, 0, NULL}
+};
+
+static struct PyModuleDef module = {
+    .m_base = PyModuleDef_HEAD_INIT,
+    .m_name = "_binding",
+    .m_doc = NULL,
+    .m_size = -1,
+    .m_methods = methods
+};
+
+PyMODINIT_FUNC PyInit__binding(void) {
+    return PyModule_Create(&module);
+}

bindings/rust/lib.rs

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

bindings/swift/TreeSitterBp/bp.h

@@ -0,0 +1,16 @@
+#ifndef TREE_SITTER_BP_H_
+#define TREE_SITTER_BP_H_
+
+typedef struct TSLanguage TSLanguage;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const TSLanguage *tree_sitter_bp(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_BP_H_

flake.lock

@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712482522,
+        "lastModified": 1713687659,
-        "narHash": "sha256-Ai/xNgZpbwGcw0TSXwEPwwbPi8Iu906sB9M9z3o6UgA=",
+        "narHash": "sha256-Yd8KuOBpZ0Slau/NxFhMPJI0gBxeax0vq/FD0rqKwuQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "efe8ce06ca261f370d672def5b1e0be300c726e1",
+        "rev": "f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712055707,
+        "lastModified": 1713775815,
-        "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=",
+        "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a",
+        "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -61,6 +61,10 @@
             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}' }"
           '';
@@ -74,8 +78,9 @@
           ${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
+          git add Cargo.toml package.json pyproject.toml
           echo "Release ''${NEW_VERSION}" | git commit -eF -
           git tag -a "v''${NEW_VERSION}" -m "Release ''${NEW_VERSION}"
         '';
@@ -120,7 +125,7 @@
               tree-sitter = {
                 enable = true;
                 name = "tree-sitter tests";
-                entry = "${tree-sitter-env}/bin/tree-sitter test --apply-all-captures";
+                entry = "${tree-sitter-env}/bin/tree-sitter test";
                 pass_filenames = false;
               };
 

grammar.js

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

package.json

@@ -1,20 +1,41 @@
 {
   "name": "tree-sitter-bp",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Blueprint grammar for tree-sitter",
   "main": "bindings/node",
+  "types": "bindings/node",
   "keywords": [
     "parsing",
     "incremental"
   ],
+  "files": [
+    "grammar.js",
+    "binding.gyp",
+    "prebuilds/**",
+    "bindings/node/*",
+    "queries/*",
+    "src/**"
+  ],
   "dependencies": {
-    "nan": "^2.12.1"
+    "node-addon-api": "^7.1.0",
+    "node-gyp-build": "^4.8.0"
+  },
+  "peerDependencies": {
+    "tree-sitter": "^0.21.0"
+  },
+  "peerDependenciesMeta": {
+    "tree_sitter": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.20.6"
+    "tree-sitter-cli": "^0.20.6",
+    "prebuildify": "^6.0.0"
   },
   "scripts": {
-    "test": "tree-sitter test"
+    "test": "tree-sitter test",
+    "install": "node-gyp-build",
+    "prebuildify": "prebuildify --napi --strip"
   },
   "tree-sitter": [
     {
@@ -22,6 +43,11 @@
       "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

@@ -0,0 +1,29 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "tree-sitter-bp"
+description = "Bp grammar for tree-sitter"
+version = "0.4.0"
+keywords = ["incremental", "parsing", "tree-sitter", "bp"]
+classifiers = [
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: MIT License",
+  "Topic :: Software Development :: Compilers",
+  "Topic :: Text Processing :: Linguistic",
+  "Typing :: Typed"
+]
+requires-python = ">=3.8"
+license.text = "MIT"
+readme = "README.md"
+
+[project.urls]
+Homepage = "https://git.belanyi.fr/ambroisie/tree-sitter-bp"
+
+[project.optional-dependencies]
+core = ["tree-sitter~=0.21"]
+
+[tool.cibuildwheel]
+build = "cp38-*"
+build-frontend = "build"

queries/highlights.scm

@@ -51,7 +51,8 @@
  (unset)
  (default)
 ] @variable.builtin
-(selection_type) @function.builtin
+(condition
+ name: (identifier) @function.builtin)
 ; }}}
 
 ; Expressions {{{

queries/indents.scm

@@ -11,6 +11,15 @@
 (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)

setup.py

@@ -0,0 +1,57 @@
+from os.path import isdir, join
+from platform import system
+
+from setuptools import Extension, find_packages, setup
+from setuptools.command.build import build
+from wheel.bdist_wheel import bdist_wheel
+
+
+class Build(build):
+    def run(self):
+        if isdir("queries"):
+            dest = join(self.build_lib, "tree_sitter_bp", "queries")
+            self.copy_tree("queries", dest)
+        super().run()
+
+
+class BdistWheel(bdist_wheel):
+    def get_tag(self):
+        python, abi, platform = super().get_tag()
+        if python.startswith("cp"):
+            python, abi = "cp38", "abi3"
+        return python, abi, platform
+
+
+setup(
+    packages=find_packages("bindings/python"),
+    package_dir={"": "bindings/python"},
+    package_data={
+        "tree_sitter_bp": ["*.pyi", "py.typed"],
+        "tree_sitter_bp.queries": ["*.scm"],
+    },
+    ext_package="tree_sitter_bp",
+    ext_modules=[
+        Extension(
+            name="_binding",
+            sources=[
+                "bindings/python/tree_sitter_bp/binding.c",
+                "src/parser.c",
+                # NOTE: if your language uses an external scanner, add it here.
+            ],
+            extra_compile_args=(
+                ["-std=c11"] if system() != 'Windows' else []
+            ),
+            define_macros=[
+                ("Py_LIMITED_API", "0x03080000"),
+                ("PY_SSIZE_T_CLEAN", None)
+            ],
+            include_dirs=["src"],
+            py_limited_api=True,
+        )
+    ],
+    cmdclass={
+        "build": Build,
+        "bdist_wheel": BdistWheel
+    },
+    zip_safe=False
+)

src/grammar.json

@@ -468,19 +468,10 @@
           "type": "STRING",
           "value": "("
         },
-        {
-          "type": "CHOICE",
-          "members": [
         {
           "type": "SYMBOL",
           "name": "select_value"
         },
-            {
-              "type": "SYMBOL",
-              "name": "soong_config_variable"
-            }
-          ]
-        },
         {
           "type": "STRING",
           "value": ","
@@ -496,66 +487,73 @@
       ]
     },
     "select_value": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "FIELD",
-          "name": "type",
-          "content": {
-            "type": "ALIAS",
-            "content": {
       "type": "CHOICE",
       "members": [
         {
-                  "type": "STRING",
+          "type": "SYMBOL",
-                  "value": "product_variable"
+          "name": "condition"
         },
         {
-                  "type": "STRING",
+          "type": "SEQ",
-                  "value": "release_variable"
+          "members": [
-                },
-                {
-                  "type": "STRING",
-                  "value": "variant"
-                }
-              ]
-            },
-            "named": true,
-            "value": "selection_type"
-          }
-        },
             {
               "type": "STRING",
               "value": "("
             },
             {
-          "type": "FIELD",
+              "type": "SEQ",
-          "name": "condition",
+              "members": [
-          "content": {
+                {
                   "type": "SYMBOL",
-            "name": "_string_literal"
+                  "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": ")"
             }
           ]
+        }
+      ]
     },
-    "soong_config_variable": {
+    "condition": {
       "type": "SEQ",
       "members": [
         {
           "type": "FIELD",
-          "name": "type",
+          "name": "name",
           "content": {
-            "type": "ALIAS",
+            "type": "SYMBOL",
-            "content": {
+            "name": "identifier"
-              "type": "STRING",
-              "value": "soong_config_variable"
-            },
-            "named": true,
-            "value": "selection_type"
           }
         },
         {
@@ -564,29 +562,37 @@
         },
         {
           "type": "FIELD",
-          "name": "condition",
+          "name": "arguments",
           "content": {
+            "type": "CHOICE",
+            "members": [
+              {
                 "type": "SEQ",
                 "members": [
                   {
-                "type": "FIELD",
-                "name": "namespace",
-                "content": {
                     "type": "SYMBOL",
                     "name": "_string_literal"
-                }
                   },
+                  {
+                    "type": "REPEAT",
+                    "content": {
+                      "type": "SEQ",
+                      "members": [
                         {
                           "type": "STRING",
                           "value": ","
                         },
                         {
-                "type": "FIELD",
-                "name": "variable",
-                "content": {
                           "type": "SYMBOL",
                           "name": "_string_literal"
                         }
+                      ]
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
               }
             ]
           }
@@ -628,32 +634,6 @@
             }
           ]
         },
-        {
-          "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": "}"
@@ -668,7 +648,7 @@
           "name": "pattern",
           "content": {
             "type": "SYMBOL",
-            "name": "_string_literal"
+            "name": "select_pattern"
           }
         },
         {
@@ -685,13 +665,77 @@
         }
       ]
     },
-    "default_case": {
+    "select_pattern": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_select_pattern"
+        },
+        {
           "type": "SEQ",
           "members": [
             {
-          "type": "FIELD",
+              "type": "STRING",
-          "name": "pattern",
+              "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",
@@ -700,19 +744,6 @@
           "named": true,
           "value": "default"
         }
-        },
-        {
-          "type": "STRING",
-          "value": ":"
-        },
-        {
-          "type": "FIELD",
-          "name": "value",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_case_value"
-          }
-        }
       ]
     },
     "_case_value": {
@@ -980,4 +1011,3 @@
   "inline": [],
   "supertypes": []
 }
-

src/node-types.json

@@ -177,6 +177,40 @@
     "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,
@@ -354,15 +388,7 @@
         "required": true,
         "types": [
           {
-            "type": "default",
+            "type": "select_pattern",
-            "named": true
-          },
-          {
-            "type": "interpreted_string_literal",
-            "named": true
-          },
-          {
-            "type": "raw_string_literal",
             "named": true
           }
         ]
@@ -445,9 +471,32 @@
         {
           "type": "select_value",
           "named": true
+        }
+      ]
+    }
   },
   {
-          "type": "soong_config_variable",
+    "type": "select_pattern",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "boolean_literal",
+          "named": true
+        },
+        {
+          "type": "default",
+          "named": true
+        },
+        {
+          "type": "interpreted_string_literal",
+          "named": true
+        },
+        {
+          "type": "raw_string_literal",
           "named": true
         }
       ]
@@ -456,85 +505,16 @@
   {
     "type": "select_value",
     "named": true,
-    "fields": {
+    "fields": {},
-      "condition": {
+    "children": {
-        "multiple": false,
+      "multiple": true,
       "required": true,
       "types": [
         {
-            "type": "interpreted_string_literal",
+          "type": "condition",
-            "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
-          }
-        ]
-      }
     }
   },
   {
@@ -632,10 +612,6 @@
     "type": "select",
     "named": false
   },
-  {
-    "type": "selection_type",
-    "named": true
-  },
   {
     "type": "true",
     "named": false

src/tree_sitter/alloc.h

@@ -0,0 +1,54 @@
+#ifndef TREE_SITTER_ALLOC_H_
+#define TREE_SITTER_ALLOC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+// Allow clients to override allocation functions
+#ifdef TREE_SITTER_REUSE_ALLOCATOR
+
+extern void *(*ts_current_malloc)(size_t);
+extern void *(*ts_current_calloc)(size_t, size_t);
+extern void *(*ts_current_realloc)(void *, size_t);
+extern void (*ts_current_free)(void *);
+
+#ifndef ts_malloc
+#define ts_malloc  ts_current_malloc
+#endif
+#ifndef ts_calloc
+#define ts_calloc  ts_current_calloc
+#endif
+#ifndef ts_realloc
+#define ts_realloc ts_current_realloc
+#endif
+#ifndef ts_free
+#define ts_free    ts_current_free
+#endif
+
+#else
+
+#ifndef ts_malloc
+#define ts_malloc  malloc
+#endif
+#ifndef ts_calloc
+#define ts_calloc  calloc
+#endif
+#ifndef ts_realloc
+#define ts_realloc realloc
+#endif
+#ifndef ts_free
+#define ts_free    free
+#endif
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_ALLOC_H_

src/tree_sitter/array.h

@@ -0,0 +1,290 @@
+#ifndef TREE_SITTER_ARRAY_H_
+#define TREE_SITTER_ARRAY_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "./alloc.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4101)
+#elif defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
+#define Array(T)       \
+  struct {             \
+    T *contents;       \
+    uint32_t size;     \
+    uint32_t capacity; \
+  }
+
+/// Initialize an array.
+#define array_init(self) \
+  ((self)->size = 0, (self)->capacity = 0, (self)->contents = NULL)
+
+/// Create an empty array.
+#define array_new() \
+  { NULL, 0, 0 }
+
+/// Get a pointer to the element at a given `index` in the array.
+#define array_get(self, _index) \
+  (assert((uint32_t)(_index) < (self)->size), &(self)->contents[_index])
+
+/// Get a pointer to the first element in the array.
+#define array_front(self) array_get(self, 0)
+
+/// Get a pointer to the last element in the array.
+#define array_back(self) array_get(self, (self)->size - 1)
+
+/// Clear the array, setting its size to zero. Note that this does not free any
+/// memory allocated for the array's contents.
+#define array_clear(self) ((self)->size = 0)
+
+/// Reserve `new_capacity` elements of space in the array. If `new_capacity` is
+/// less than the array's current capacity, this function has no effect.
+#define array_reserve(self, new_capacity) \
+  _array__reserve((Array *)(self), array_elem_size(self), new_capacity)
+
+/// Free any memory allocated for this array. Note that this does not free any
+/// memory allocated for the array's contents.
+#define array_delete(self) _array__delete((Array *)(self))
+
+/// Push a new `element` onto the end of the array.
+#define array_push(self, element)                            \
+  (_array__grow((Array *)(self), 1, array_elem_size(self)), \
+   (self)->contents[(self)->size++] = (element))
+
+/// Increase the array's size by `count` elements.
+/// New elements are zero-initialized.
+#define array_grow_by(self, count) \
+  do { \
+    if ((count) == 0) break; \
+    _array__grow((Array *)(self), count, array_elem_size(self)); \
+    memset((self)->contents + (self)->size, 0, (count) * array_elem_size(self)); \
+    (self)->size += (count); \
+  } while (0)
+
+/// Append all elements from one array to the end of another.
+#define array_push_all(self, other)                                       \
+  array_extend((self), (other)->size, (other)->contents)
+
+/// Append `count` elements to the end of the array, reading their values from the
+/// `contents` pointer.
+#define array_extend(self, count, contents)                    \
+  _array__splice(                                               \
+    (Array *)(self), array_elem_size(self), (self)->size, \
+    0, count,  contents                                        \
+  )
+
+/// Remove `old_count` elements from the array starting at the given `index`. At
+/// the same index, insert `new_count` new elements, reading their values from the
+/// `new_contents` pointer.
+#define array_splice(self, _index, old_count, new_count, new_contents)  \
+  _array__splice(                                                       \
+    (Array *)(self), array_elem_size(self), _index,                \
+    old_count, new_count, new_contents                                 \
+  )
+
+/// Insert one `element` into the array at the given `index`.
+#define array_insert(self, _index, element) \
+  _array__splice((Array *)(self), array_elem_size(self), _index, 0, 1, &(element))
+
+/// Remove one element from the array at the given `index`.
+#define array_erase(self, _index) \
+  _array__erase((Array *)(self), array_elem_size(self), _index)
+
+/// Pop the last element off the array, returning the element by value.
+#define array_pop(self) ((self)->contents[--(self)->size])
+
+/// Assign the contents of one array to another, reallocating if necessary.
+#define array_assign(self, other) \
+  _array__assign((Array *)(self), (const Array *)(other), array_elem_size(self))
+
+/// Swap one array with another
+#define array_swap(self, other) \
+  _array__swap((Array *)(self), (Array *)(other))
+
+/// Get the size of the array contents
+#define array_elem_size(self) (sizeof *(self)->contents)
+
+/// Search a sorted array for a given `needle` value, using the given `compare`
+/// callback to determine the order.
+///
+/// If an existing element is found to be equal to `needle`, then the `index`
+/// out-parameter is set to the existing value's index, and the `exists`
+/// out-parameter is set to true. Otherwise, `index` is set to an index where
+/// `needle` should be inserted in order to preserve the sorting, and `exists`
+/// is set to false.
+#define array_search_sorted_with(self, compare, needle, _index, _exists) \
+  _array__search_sorted(self, 0, compare, , needle, _index, _exists)
+
+/// Search a sorted array for a given `needle` value, using integer comparisons
+/// of a given struct field (specified with a leading dot) to determine the order.
+///
+/// See also `array_search_sorted_with`.
+#define array_search_sorted_by(self, field, needle, _index, _exists) \
+  _array__search_sorted(self, 0, _compare_int, field, needle, _index, _exists)
+
+/// Insert a given `value` into a sorted array, using the given `compare`
+/// callback to determine the order.
+#define array_insert_sorted_with(self, compare, value) \
+  do { \
+    unsigned _index, _exists; \
+    array_search_sorted_with(self, compare, &(value), &_index, &_exists); \
+    if (!_exists) array_insert(self, _index, value); \
+  } while (0)
+
+/// Insert a given `value` into a sorted array, using integer comparisons of
+/// a given struct field (specified with a leading dot) to determine the order.
+///
+/// See also `array_search_sorted_by`.
+#define array_insert_sorted_by(self, field, value) \
+  do { \
+    unsigned _index, _exists; \
+    array_search_sorted_by(self, field, (value) field, &_index, &_exists); \
+    if (!_exists) array_insert(self, _index, value); \
+  } while (0)
+
+// Private
+
+typedef Array(void) Array;
+
+/// This is not what you're looking for, see `array_delete`.
+static inline void _array__delete(Array *self) {
+  if (self->contents) {
+    ts_free(self->contents);
+    self->contents = NULL;
+    self->size = 0;
+    self->capacity = 0;
+  }
+}
+
+/// This is not what you're looking for, see `array_erase`.
+static inline void _array__erase(Array *self, size_t element_size,
+                                uint32_t index) {
+  assert(index < self->size);
+  char *contents = (char *)self->contents;
+  memmove(contents + index * element_size, contents + (index + 1) * element_size,
+          (self->size - index - 1) * element_size);
+  self->size--;
+}
+
+/// This is not what you're looking for, see `array_reserve`.
+static inline void _array__reserve(Array *self, size_t element_size, uint32_t new_capacity) {
+  if (new_capacity > self->capacity) {
+    if (self->contents) {
+      self->contents = ts_realloc(self->contents, new_capacity * element_size);
+    } else {
+      self->contents = ts_malloc(new_capacity * element_size);
+    }
+    self->capacity = new_capacity;
+  }
+}
+
+/// This is not what you're looking for, see `array_assign`.
+static inline void _array__assign(Array *self, const Array *other, size_t element_size) {
+  _array__reserve(self, element_size, other->size);
+  self->size = other->size;
+  memcpy(self->contents, other->contents, self->size * element_size);
+}
+
+/// This is not what you're looking for, see `array_swap`.
+static inline void _array__swap(Array *self, Array *other) {
+  Array swap = *other;
+  *other = *self;
+  *self = swap;
+}
+
+/// This is not what you're looking for, see `array_push` or `array_grow_by`.
+static inline void _array__grow(Array *self, uint32_t count, size_t element_size) {
+  uint32_t new_size = self->size + count;
+  if (new_size > self->capacity) {
+    uint32_t new_capacity = self->capacity * 2;
+    if (new_capacity < 8) new_capacity = 8;
+    if (new_capacity < new_size) new_capacity = new_size;
+    _array__reserve(self, element_size, new_capacity);
+  }
+}
+
+/// This is not what you're looking for, see `array_splice`.
+static inline void _array__splice(Array *self, size_t element_size,
+                                 uint32_t index, uint32_t old_count,
+                                 uint32_t new_count, const void *elements) {
+  uint32_t new_size = self->size + new_count - old_count;
+  uint32_t old_end = index + old_count;
+  uint32_t new_end = index + new_count;
+  assert(old_end <= self->size);
+
+  _array__reserve(self, element_size, new_size);
+
+  char *contents = (char *)self->contents;
+  if (self->size > old_end) {
+    memmove(
+      contents + new_end * element_size,
+      contents + old_end * element_size,
+      (self->size - old_end) * element_size
+    );
+  }
+  if (new_count > 0) {
+    if (elements) {
+      memcpy(
+        (contents + index * element_size),
+        elements,
+        new_count * element_size
+      );
+    } else {
+      memset(
+        (contents + index * element_size),
+        0,
+        new_count * element_size
+      );
+    }
+  }
+  self->size += new_count - old_count;
+}
+
+/// A binary search routine, based on Rust's `std::slice::binary_search_by`.
+/// This is not what you're looking for, see `array_search_sorted_with` or `array_search_sorted_by`.
+#define _array__search_sorted(self, start, compare, suffix, needle, _index, _exists) \
+  do { \
+    *(_index) = start; \
+    *(_exists) = false; \
+    uint32_t size = (self)->size - *(_index); \
+    if (size == 0) break; \
+    int comparison; \
+    while (size > 1) { \
+      uint32_t half_size = size / 2; \
+      uint32_t mid_index = *(_index) + half_size; \
+      comparison = compare(&((self)->contents[mid_index] suffix), (needle)); \
+      if (comparison <= 0) *(_index) = mid_index; \
+      size -= half_size; \
+    } \
+    comparison = compare(&((self)->contents[*(_index)] suffix), (needle)); \
+    if (comparison == 0) *(_exists) = true; \
+    else if (comparison < 0) *(_index) += 1; \
+  } while (0)
+
+/// Helper macro for the `_sorted_by` routines below. This takes the left (existing)
+/// parameter by reference in order to work with the generic sorting function above.
+#define _compare_int(a, b) ((int)*(a) - (int)(b))
+
+#ifdef _MSC_VER
+#pragma warning(default : 4101)
+#elif defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TREE_SITTER_ARRAY_H_

test/corpus/select.txt

@@ -15,14 +15,17 @@ foo = select(release_variable("RELEASE_TEST"), {
     (operator)
     (select_expression
       (select_value
-        (selection_type)
+        (condition
-        (interpreted_string_literal))
+          (identifier)
+          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (default)
+          (select_pattern
+            (default))
           (unset))))))
 
 ================================================================================
@@ -41,16 +44,19 @@ foo = select(soong_config_variable("my_namespace", "my_var"), {
     (identifier)
     (operator)
     (select_expression
-      (soong_config_variable
+      (select_value
-        (selection_type)
+        (condition
+          (identifier)
           (interpreted_string_literal)
-        (interpreted_string_literal))
+          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (unset))
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))))))
 
 ================================================================================
@@ -72,20 +78,25 @@ foo = select(variant("arch"), {
     (operator)
     (select_expression
       (select_value
-        (selection_type)
+        (condition
-        (interpreted_string_literal))
+          (identifier)
+          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))))))
 
 ================================================================================
@@ -102,8 +113,9 @@ foo = select(variant("VARIANT"), {})
     (operator)
     (select_expression
       (select_value
-        (selection_type)
+        (condition
-        (interpreted_string_literal))
+          (identifier)
+          (interpreted_string_literal)))
       (select_cases))))
 
 ================================================================================
@@ -126,24 +138,29 @@ foo = select(variant("VARIANT"), {
     (operator)
     (select_expression
       (select_value
-        (selection_type)
+        (condition
-        (interpreted_string_literal))
+          (identifier)
+          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
             (interpreted_string_literal))
-        (ERROR
-          (select_case
-            (default)
-            (unset)))
-        (select_case
-          (interpreted_string_literal)
           (interpreted_string_literal))
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (default))
+          (unset))
+        (select_case
+          (select_pattern
+            (interpreted_string_literal))
+          (interpreted_string_literal))
+        (select_case
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))))))
 
 ================================================================================
@@ -163,14 +180,16 @@ foo = select(variant(), {
     (operator)
     (select_expression
       (select_value
-        (selection_type)
+        (condition
-        (MISSING raw_string_literal))
+          (identifier)))
       (select_cases
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (unset))
         (select_case
-          (default)
+          (select_pattern
+            (default))
           (interpreted_string_literal))))))
 
 ================================================================================
@@ -188,14 +207,20 @@ foo = select(some_unknown_type("CONDITION"), {
   (assignment
     (identifier)
     (operator)
-    (ERROR
+    (select_expression
+      (select_value
+        (condition
           (identifier)
-      (identifier)
+          (interpreted_string_literal)))
-      (interpreted_string_literal)
+      (select_cases
-      (interpreted_string_literal)
+        (select_case
-      (default))
+          (select_pattern
             (interpreted_string_literal))
-  (ERROR))
+          (interpreted_string_literal))
+        (select_case
+          (select_pattern
+            (default))
+          (interpreted_string_literal))))))
 
 ================================================================================
 Select (multiple type arguments)
@@ -214,16 +239,136 @@ foo = select(release_variable("ONE", "TWO"), {
     (operator)
     (select_expression
       (select_value
-        (selection_type)
+        (condition
-        (ERROR
+          (identifier)
-          (interpreted_string_literal))
+          (interpreted_string_literal)
-        (interpreted_string_literal))
+          (interpreted_string_literal)))
       (select_cases
         (select_case
-          (interpreted_string_literal)
+          (select_pattern
+            (interpreted_string_literal))
           (interpreted_string_literal))
         (select_case
+          (select_pattern
+            (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/indent/select.bp

@@ -26,3 +26,35 @@ 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,6 +1,7 @@
 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, ".", {
@@ -19,7 +20,7 @@ describe("indent Blueprint:", function()
         })
         runner:whole_file("test/indent/", {
             expected_failures = {
-                -- NOTE: none for now
+                "test/indent/select.bp",
             },
         })
     end)
@@ -39,9 +40,22 @@ 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)