Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update deps, regenerate, & migrate to tree-sitter.json #49

Merged
merged 3 commits into from
Oct 12, 2024
Merged

Conversation

amaanq
Copy link
Member

@amaanq amaanq commented Oct 12, 2024

This fixes the panic with the CLI on the latest commit on tree-sitter master because the grammar.json is malformed

@amaanq amaanq merged commit 3ed23c0 into master Oct 12, 2024
1 check passed
@amaanq amaanq deleted the update branch October 12, 2024 18:41
@clason
Copy link
Contributor

clason commented Oct 13, 2024

And this also breaks the queries in nvim-treesitter...

Comment on lines +12 to +20
conflicts: ($, original) => original.filter((s) => {
if (s.length === 2) {
const [l, r] = s;
if (l.name === $.parameter_list.name && r.name === $.argument_list.name) {
return false;
}
}
return true;
}).concat([
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does that change fit into "update deps, regenerate, & migrate to tree-sitter.json"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it just removes a warning about an unnecessary conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants