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

Bump tree sitter #403

Merged
merged 2 commits into from Jul 1, 2022
Merged

Bump tree sitter #403

merged 2 commits into from Jul 1, 2022

Conversation

mauricioszabo
Copy link

@mauricioszabo mauricioszabo commented Jun 26, 2022

Please, merge after this PR otherwise grammars will break: #399

This PR bumps tree-sitter to a recent version. It also uses "NPM's tree sitter", not an Atom/git specific one.

I know this code works with Electron 12. Unfortunately, ./script/bootstrap and friends do not work on my machine, so I have no way of testing if the "current way" of building Atom also works...

Also, this PR is basically #386, but splitted into bumping tree-sitter. I'll open another bumping Electron (but it's also dependent on this one, unfortunately)

@aminya aminya changed the base branch from master to merge-languages June 30, 2022 07:28
@aminya
Copy link
Member

aminya commented Jun 30, 2022

Changed the target branch so we have some buffer to fix the tests before the final merge.

@aminya aminya marked this pull request as ready for review June 30, 2022 08:28
@aminya
Copy link
Member

aminya commented Jun 30, 2022

I cannot push to this branch. Could you enable push access? We need #4ffbf92aa

@icecream17
Copy link

Btw, you might've not seen this note from my pr:

I've added these repos to packages but I'm not actually updating the package.json for these packages:

  • language-c
  • language-css
  • language-go
  • language-javascript

I could update package and package-lock (if access is given)

@mauricioszabo
Copy link
Author

mauricioszabo commented Jun 30, 2022

I cannot push to this branch. Could you enable push access

You meant, my branch on my repo, @aminya? If so, I just gave you access.

@aminya
Copy link
Member

aminya commented Jun 30, 2022

@icecream17 What about merging it to our branch and then applying the changes on the repo we have access to?

@aminya aminya merged commit 18ea144 into atom-community:merge-languages Jul 1, 2022
@aminya aminya deleted the bump-tree-sitter branch July 1, 2022 21:55
@aminya
Copy link
Member

aminya commented Jul 1, 2022

I made a new PR based on our branch:
Here you go: #416

icecream17 added a commit to icecream17/atom that referenced this pull request Jul 3, 2022
... previously v19 tree-sitter language packages.

Continuation of atom-community#399
(atom-community@477b075)
but where the packages that would've broke Atom
are now updated

Another link:
atom-community#403 (comment)
icecream17 added a commit that referenced this pull request Jul 3, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
aminya pushed a commit that referenced this pull request Jul 3, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
aminya pushed a commit that referenced this pull request Jul 9, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
aminya pushed a commit that referenced this pull request Jul 9, 2022
... previously v19 tree-sitter language packages.

Continuation of #399
(477b075)
but where the packages that would've broke Atom are now updated

Another link:
#403 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants