RC 1.2.0 (#180)

* Polish CHANGELOG

* Do version bumps everywhere

Except R, where usethis will handle it

* More contributing tweaks

* Accept `npm pkg fix` edits

* Add `publish.yaml` CI

* More contributing tweaks

Author: DavisVaughan

.github/workflows/publish.yaml

@@ -0,0 +1,32 @@
+name: Publish packages
+
+on:
+  push:
+    tags: ["*"]
+
+permissions:
+  contents: write
+  id-token: write
+  attestations: write
+
+jobs:
+  github:
+    uses: tree-sitter/workflows/.github/workflows/release.yml@main
+    with:
+      generate: false
+      attestations: true
+      abi-version: "14"
+  npm:
+    uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main
+    secrets:
+      NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
+    with:
+      generate: false
+      abi-version: "14"
+  crates:
+    uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main
+    secrets:
+      CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_REGISTRY_TOKEN}}
+    with:
+      generate: false
+      abi-version: "14"

CHANGELOG.md

@@ -2,25 +2,17 @@
 
 ## devel
 
-- `highlights.scm` now includes `!` as an `@operator`.
-
-- `tags.scm` now tags function definitions with a string name as `@definition.function` (#147, @MichaelChirico).
-
-- Binary exponents are now supported in hexadecimal constants (#159).
-
-- `NULL` is now allowed as a function call argument name (#164).
+## 1.2.0
 
 - Added `"open"` and `"close"` fields to single and double quoted `string`s (#139).
 
-- Removed an unnecessary `optional()` from `_parameter_with_default` (#161).
-
 - Fixed an issue related to closing brackets in raw strings (#162).
 
-- Changed a number of internal files to match tree-sitter v0.24.7 recommendations (#169).
+- Binary exponents are now supported in hexadecimal constants (#159).
 
-- `...` and `..1` are now supported in more places, such as `x$...` and `x@..1` (#148).
+- `NULL` is now allowed as a function call argument name (#164).
 
-- `parenthesized_expression` has been simplified to better align with R's parser. Specifically, it now expects exactly 1 required `body` expression, rather than allowing zero or more optional expressions (#144).
+- `...` and `..1` are now supported in more places, such as `x$...` and `x@..1` (#148).
 
 - `fn(a b)` is now correctly parsed as an error rather than as two sequential arguments (#140).
 
@@ -30,8 +22,18 @@
 
 - Newlines are now allowed after an `else` but before the `alternative` (#141).
 
+- `parenthesized_expression` has been simplified to better align with R's parser. Specifically, it now expects exactly 1 required `body` expression, rather than allowing zero or more optional expressions (#144).
+
+- `highlights.scm` now includes `!` as an `@operator`.
+
+- `tags.scm` now tags function definitions with a string name as `@definition.function` (#147, @MichaelChirico).
+
+- Removed an unnecessary `optional()` from `_parameter_with_default` (#161).
+
 - The internal `_hex_literal` rule was simplified slightly (#138).
 
+- Changed a number of internal files to match tree-sitter v0.24.7 recommendations (#169).
+
 ## 1.1.0
 
 - Switched to using `tree-sitter-language` in the Rust bindings to remove a dependency on a specific `tree-sitter` crate version (#133).

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 project(tree-sitter-r
-        VERSION "1.1.0"
+        VERSION "1.2.0"
         DESCRIPTION "R grammar for tree-sitter"
         HOMEPAGE_URL "https://github.com/r-lib/tree-sitter-r"
         LANGUAGES C)

CONTRIBUTING.md

@@ -4,6 +4,28 @@
 
 Unlike some other tree-sitter grammars, the R grammar's release version is not tied to the tree-sitter version. Instead, we just use standard semantic versioning. We released 1.0.0 when we merged the longstanding `next` branch into `main`, and then we froze `main-old` for people to pin to if they are slow to update.
 
+## Flow
+
+-   Create an `rc/x-y-z` branch
+
+-   Update all binding versions to the new version
+
+-   Polish CHANGELOG
+
+-   Update CHANGELOG's `## devel` to the new version, go ahead and add a new `## devel` header
+
+-   Push and open a PR
+
+-   Follow the release procedure for R, as it is manual
+
+-   Merge the PR
+
+    -   After merging, do NOT call `usethis::use_github_release()`. We are going to create our own git tag
+
+-   Create an push a git tag for the version, i.e. `git push origin tag vX.Y.Z` where the leading `v` does matter
+
+    -   This will kick off `publish.yaml` for the GitHub Release, the npm package release, and the Rust crate release
+
 ## R package
 
 <https://cran.r-project.org/web/packages/treesitter.r/index.html>
@@ -14,6 +36,7 @@ The {treesitter.r} package is relatively simple. It just provides `language()` a
 
 -   Decide if you also need to release [{treesitter}](https://github.com/DavisVaughan/r-tree-sitter).
 -   Ensure you `devtools::load_all()` twice to ensure that `bootstrap.R` runs and pulls updated files into `src/` and updates any ABI changes.
+-   Update `NEWS.md` to mention the update and point to the changelog.
 -   Run `devtools::check()` to ensure tests are still passing.
 -   Run `devtools::release()` to do a standard R package release if all looks good.
     -   Use the same version as the Rust crate and the npm package.
@@ -38,7 +61,7 @@ Davis is the main owner of the crate, but Kevin also has publish rights.
 
 -   `cargo publish --dry-run` will do a dry run before submitting
 
--   `cargo publish` to actually release
+-   The `publish.yaml` CI will actually run `cargo publish` for you. It runs <https://github.com/tree-sitter/workflows/blob/main/.github/workflows/package-crates.yml>. Note that we have a `CARGO_REGISTRY_TOKEN` token that expires after 1 year and may need to be refreshed.
 
 ## Npm package
 
@@ -65,8 +88,8 @@ We use [nvm](https://github.com/nvm-sh/nvm) for npm version management. The npm
 
 -   `npm publish --dry-run` will do a dry run
 
--   `npm publish` will actually publish
+-   The `publish.yaml` CI will actually run `npm publish` for you. It runs <https://github.com/tree-sitter/workflows/blob/main/.github/workflows/package-npm.yml>. Note that we have a `NODE_AUTH_TOKEN` token that expires after 1 year and may need to be refreshed.
 
-You may need to login to npm through the command line first, use `npm login` for that.
+    -   Note that this builds the WASM binary along with "prebuilds" for each platform, so it does more than just `npm publish`.
 
 We publish as an [unscoped public package](https://docs.npmjs.com/creating-and-publishing-unscoped-public-packages) because that seems to be what other tree-sitter grammars do as well.

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-r"
 description = "R grammar for tree-sitter"
-version = "1.1.0"
+version = "1.2.0"
 license = "MIT"
 readme = "README.md"
 keywords = ["incremental", "parsing", "tree-sitter", "r"]

Cargo.toml

@@ -4,7 +4,7 @@ endif
 
 LANGUAGE_NAME := tree-sitter-r
 HOMEPAGE_URL := https://github.com/r-lib/tree-sitter-r
-VERSION := 1.1.0
+VERSION := 1.2.0
 
 # repository
 SRC_DIR := src

Makefile

@@ -1,5 +1,7 @@
 # treesitter.r (development version)
 
+* Updated to [tree-sitter-r v1.2.0](https://github.com/r-lib/tree-sitter-r/blob/main/CHANGELOG.md) (#136).
+
 # treesitter.r 1.1.0
 
 * Updated to [tree-sitter-r v1.1.0](https://github.com/r-lib/tree-sitter-r/blob/main/CHANGELOG.md) (#136).

bindings/r/NEWS.md

@@ -1,8 +1,11 @@
 {
   "name": "tree-sitter-r",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "R grammar for tree-sitter",
-  "repository": "https://github.com/r-lib/tree-sitter-r",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/r-lib/tree-sitter-r.git"
+  },
   "license": "MIT",
   "author": {
     "name": "Davis Vaughan",