From e744ebffb44bd2f6e9db99e8cd3eacfb05dedc45 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 23 Dec 2024 12:04:02 -0500 Subject: [PATCH 1/5] Fix deprecated CI config --- .woodpecker/check.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.woodpecker/check.yml b/.woodpecker/check.yml index 4197230..a6f49d7 100644 --- a/.woodpecker/check.yml +++ b/.woodpecker/check.yml @@ -1,7 +1,7 @@ labels: backend: local -pipeline: +steps: - name: flake check image: bash commands: @@ -14,15 +14,15 @@ pipeline: - name: notify image: bash - secrets: - - source: matrix_roomid - target: room - - source: matrix_username - target: user - - source: matrix_password - target: pass - - source: matrix_homeserver - target: address + environment: + ADDRESS: + from_secret: matrix_homeserver + ROOM: + from_secret: matrix_roomid + USER: + from_secret: matrix_username + PASS: + from_secret: matrix_password commands: - nix run github:ambroisie/matrix-notifier when: From 5f5ee66aad7b3b014beaf229abfd3f853cbcf441 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 23 Dec 2024 12:04:25 -0500 Subject: [PATCH 2/5] Add explicit 'pre-commit' CI step --- .woodpecker/check.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.woodpecker/check.yml b/.woodpecker/check.yml index a6f49d7..7c4ccbe 100644 --- a/.woodpecker/check.yml +++ b/.woodpecker/check.yml @@ -2,6 +2,11 @@ labels: backend: local steps: +- name: pre-commit check + image: bash + commands: + - nix develop --command pre-commit run --all + - name: flake check image: bash commands: From 708c4d69d2c21582ec4800ebbbf43eb162945c0f Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 23 Dec 2024 12:05:10 -0500 Subject: [PATCH 3/5] Fix address of repository --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f852767..03282b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ description = "Tiger grammar for the tree-sitter parsing library" version = "0.3.0" keywords = ["incremental", "parsing", "tiger"] categories = ["parsing", "text-editors"] -repository = "https://gitea.belanyi.fr/ambroisie/tree-sitter-tiger" +repository = "https://git.belanyi.fr/ambroisie/tree-sitter-tiger" edition = "2018" license = "MIT" From d094c6291d2974c53755349164e9d8ddb5732476 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 23 Dec 2024 12:06:46 -0500 Subject: [PATCH 4/5] Capitalize language name --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65664c9..27d5efb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tree-sitter-tiger", "version": "0.3.0", - "description": "tiger grammar for tree-sitter", + "description": "Tiger grammar for tree-sitter", "main": "bindings/node", "keywords": [ "parsing", From 4a77b2d7a004587646bddc4e854779044b6db459 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 13 Mar 2025 19:58:20 +0000 Subject: [PATCH 5/5] Remove unnecessary conflicts Not sure *why* I ended up with unnecessary conflicts, let's remove them now. --- grammar.js | 2 -- src/grammar.json | 8 -------- 2 files changed, 10 deletions(-) diff --git a/grammar.js b/grammar.js index 808eb43..824e760 100644 --- a/grammar.js +++ b/grammar.js @@ -31,8 +31,6 @@ module.exports = grammar({ conflicts: ($) => [ [$._lvalue, $.array_expression], - [$._lvalue, $.record_expression], - [$._lvalue, $._type_identifier], ], externals: ($) => [ diff --git a/src/grammar.json b/src/grammar.json index a8f1897..73d51c5 100644 --- a/src/grammar.json +++ b/src/grammar.json @@ -1932,14 +1932,6 @@ [ "_lvalue", "array_expression" - ], - [ - "_lvalue", - "record_expression" - ], - [ - "_lvalue", - "_type_identifier" ] ], "precedences": [],