From 19cb6df19054f2e5eb6ed81efe28d602500629da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20K=C5=82osko?= Date: Mon, 9 Dec 2024 22:16:36 +0800 Subject: [PATCH 1/3] Move parser information to tree-sitter.json --- package.json | 11 +---------- tree-sitter.json | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 tree-sitter.json diff --git a/package.json b/package.json index 68ad871..9778e26 100644 --- a/package.json +++ b/package.json @@ -43,14 +43,5 @@ }, "peerDependencies": { "tree-sitter": "^0.21.0" - }, - "tree-sitter": [ - { - "scope": "source.elixir", - "file-types": ["ex", "exs"], - "highlights": ["queries/highlights.scm"], - "tags": ["queries/tags.scm"], - "injection-regex": "^(ex|elixir)$" - } - ] + } } diff --git a/tree-sitter.json b/tree-sitter.json new file mode 100644 index 0000000..6c894d9 --- /dev/null +++ b/tree-sitter.json @@ -0,0 +1,40 @@ +{ + "grammars": [ + { + "name": "elixir", + "camelcase": "Elixir", + "scope": "source.elixir", + "path": ".", + "file-types": ["ex", "exs"], + "highlights": "queries/highlights.scm", + "tags": "queries/tags.scm", + "injection-regex": "^(ex|elixir)$" + } + ], + "metadata": { + "version": "0.3.2", + "license": "Apache-2.0", + "description": "Elixir grammar for the tree-sitter parsing library", + "authors": [ + { + "name": "Jonatan Kłosko", + "email": "jonatanklosko@gmail.com" + }, + { + "name": "Michael Davis", + "email": "mcarsondavis@gmail.com" + } + ], + "links": { + "repository": "https://github.com/elixir-lang/tree-sitter-elixir" + } + }, + "bindings": { + "c": true, + "go": true, + "node": true, + "python": true, + "rust": true, + "swift": true + } +} From d325197221f547002e1bceb7ef9832bd0eddc059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20K=C5=82osko?= Date: Mon, 9 Dec 2024 22:33:01 +0800 Subject: [PATCH 2/3] Update tree-sitter-cli --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 77bed63..de17b31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "clang-format": "^1.8.0", "prebuildify": "^6.0.0", "prettier": "^2.3.2", - "tree-sitter-cli": "^0.23.0" + "tree-sitter-cli": "^0.24.0" }, "peerDependencies": { "tree-sitter": "^0.21.0" @@ -525,9 +525,9 @@ } }, "node_modules/tree-sitter-cli": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.23.0.tgz", - "integrity": "sha512-/DdQaPCCOrOYGp9FxGdhFUnHIrjhfbYatQXgNIcmaAOpPunpnDj2vsO/H+svsfQLaFsQ1C+BjgPhpbV28zka1w==", + "version": "0.24.4", + "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.24.4.tgz", + "integrity": "sha512-I4sdtDidnujYL0tR0Re9q0UJt5KrITf2m+GMHjT4LH6IC6kpM6eLzSR7RS36Z4t5ZQBjDHvg2QUJHAWQi3P2TA==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -947,9 +947,9 @@ } }, "tree-sitter-cli": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.23.0.tgz", - "integrity": "sha512-/DdQaPCCOrOYGp9FxGdhFUnHIrjhfbYatQXgNIcmaAOpPunpnDj2vsO/H+svsfQLaFsQ1C+BjgPhpbV28zka1w==", + "version": "0.24.4", + "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.24.4.tgz", + "integrity": "sha512-I4sdtDidnujYL0tR0Re9q0UJt5KrITf2m+GMHjT4LH6IC6kpM6eLzSR7RS36Z4t5ZQBjDHvg2QUJHAWQi3P2TA==", "dev": true }, "util-deprecate": { diff --git a/package.json b/package.json index 9778e26..1b07f2f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "clang-format": "^1.8.0", "prettier": "^2.3.2", - "tree-sitter-cli": "^0.23.0", + "tree-sitter-cli": "^0.24.0", "prebuildify": "^6.0.0" }, "peerDependencies": { From cde52a73b51f35f6987c47392f3437f11876d6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20K=C5=82osko?= Date: Mon, 9 Dec 2024 22:38:40 +0800 Subject: [PATCH 3/3] Up --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1b07f2f..dc6988b 100644 --- a/package.json +++ b/package.json @@ -24,12 +24,13 @@ "url": "https://github.com/elixir-lang/tree-sitter-elixir.git" }, "scripts": { - "build": "tree-sitter generate --no-bindings", + "build": "tree-sitter generate", "test": "tree-sitter test", "format": "prettier --trailing-comma es5 --write grammar.js && clang-format -i src/scanner.c", "format-check": "prettier --trailing-comma es5 --check grammar.js && cat src/scanner.c | clang-format src/scanner.c | diff src/scanner.c -", "install": "node-gyp-build", - "prebuildify": "prebuildify --napi --strip" + "prestart": "tree-sitter build --wasm", + "start": "tree-sitter playground" }, "dependencies": { "node-addon-api": "^7.1.0",