Use native tree-sitter bindings instead of web-tree-sitter #7

Merged

marfavi merged 16 commits from tree-sitter-native into tree-sitter 2026-10-02 10:37:11 +02:00

Conversation 0 Commits 16 Files changed 28 +6618 -4084

marfavi commented 2026-10-01 12:37:55 +02:00

Owner

• Copy link
• Copy Markdown

fixes #4

fixes #4

marfavi added 2 commits 2026-10-01 12:37:55 +02:00

Use native tree-sitter bindings instead of web-tree-sitter ... 2f7aad876e

- Load the tree-sitter-crocq grammar as a native ESM addon and drop the committed .wasm and the web-tree-sitter dependency.
- Import the AST node type from tree-sitter in annotations, diagnostics and util.
- Build the grammar with node-gyp and ship a Node-API prebuild (npm run prebuild:native) so the packaged extension needs no C++ toolchain.
- CI: install the native toolchain before npm ci, cache both lockfiles, and generate prebuilds.
- Pin tree-sitter to ^0.25.1 (grammar ABI 15) and keep tree-sitter-c dev-only.

Merge remote-tracking branch 'origin/tree-sitter' into tree-sitter-native ... 2da993a1a2

# Conflicts:
#	extension/src/parser.ts

marfavi changed title from Tree sitter native to WIP: Tree sitter native 2026-10-01 12:53:10 +02:00

marfavi added 1 commit 2026-10-01 12:56:40 +02:00

Add grammar testing; Split CI workflows for extension and grammar testing c3734210fd

marfavi added 4 commits 2026-10-01 13:23:40 +02:00

Give each CI workflow its own concurrency group ... f05ba8a57f

- github.workflow is not part of the Forgejo context, so both workflows evaluated to the same group and could cancel each other; the groups are now named explicitly
- the grammar workflow is no longer expected to fail: the corpus suite passes

Fix crocq annotation parsing for one-line annotations ... 8ee832c675

- clause_contents no longer swallows the closing */ (tree-sitter regexes have no lookahead, so a * is accepted only when not followed by /)
- clause_contents accepts backslashes, so Verifiable C separating conjunctions parse as clause contents
- invalid_clause no longer requires a trailing newline
- comment parses the empty comment
- consecutive annotations stay separate nodes, so the expectation of that corpus case is corrected and the stale FIXME notes are dropped
- regenerate src/parser.c and src/grammar.json (array.h is churn from the pinned tree-sitter CLI)

Type-check the grammar package and add a generate script ... 4a77728511

- tsconfig.json checks grammar.js with the tree-sitter CLI DSL globals; they are listed explicitly because a types reference cannot resolve the tree-sitter-cli/dsl subpath
- declare the untyped tree-sitter-c/grammar.js module, which ships no declarations (TS7016)
- add npm run generate

Add refresh:grammar and make the native prebuild step idempotent ... 50fad86509

- npm run refresh:grammar re-copies ../tree-sitter-crocq and rebuilds its prebuild; because .npmrc sets install-links=true npm copies the file: dependency, so npm install alone will not replace the snapshot
- prebuild:native now rebuilds only while the grammar sources are present, so packaging can run it more than once
- document the grammar edit workflow and the split CI workflows in the README

marfavi added 1 commit 2026-10-01 13:28:31 +02:00

Merge remote-tracking branch 'origin/tree-sitter' into tree-sitter-native ... 9280eadd8a

- hover.ts: keep the new development-mode gate, adapted to the native tree-sitter node types (the node is non-null, so the redundant check is dropped to satisfy the type-aware lint rules)
- corpus: keep the corrected test names; those cases pass now, so the FIXME notes and the issue link they point at are obsolete

marfavi added 1 commit 2026-10-01 13:31:58 +02:00

Minor formatting c87d05634c

marfavi added 1 commit 2026-10-01 13:33:45 +02:00

Remove changelog 408913841c

marfavi referenced this pull request 2026-10-01 13:38:10 +02:00

tree-sitter tests not passing #4

marfavi added 1 commit 2026-10-01 13:41:33 +02:00

Nitpick a comment 306fb3c13b

marfavi added 1 commit 2026-10-01 13:51:24 +02:00

Simplify extension/package.json slightly ddfbf50682

marfavi added 3 commits 2026-10-01 15:13:37 +02:00

Ignore WASM 59453248cb

Fix logic error in sumarray.c 5fa2d115ce

Fix grammar for comments and add test cases 5c34e69c24

marfavi added 1 commit 2026-10-02 10:31:03 +02:00

Make test rebuild the grammar e0fbbaf102

marfavi changed title from WIP: Tree sitter native to Tree sitter native 2026-10-02 10:34:27 +02:00

marfavi changed title from Tree sitter native to Use native tree-sitter bindings instead of web-tree-sitter 2026-10-02 10:36:47 +02:00

marfavi merged commit 139132cb49 into tree-sitter 2026-10-02 10:37:11 +02:00

marfavi deleted branch tree-sitter-native 2026-10-02 10:37:12 +02:00

marfavi referenced this pull request from a commit 2026-10-02 10:37:12 +02:00

Use native tree-sitter bindings instead of web-tree-sitter (#7)

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

blocked

should wait for another issue to be addressed

  

bug

  

priority!

  

quick-pick

No labels

blocked

bug

priority!

quick-pick

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

code2rocq/crocq!7

No description provided.