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.

Sign up for GitHub

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

Jump to bottom

➡️ Migrate all language packages + Bump Tree Sitter #416

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

➡️ Migrate all language packages + Bump Tree Sitter #416

wants to merge 8 commits into from

Conversation

aminya
Copy link
Member

@aminya aminya commented Jul 1, 2022 •
edited
Loading

Continuation of #403 and #399. Please read the descriptions of those PRs first.

@aminya aminya mentioned this pull request Jul 1, 2022
Merged
aminya
aminya commented Jul 2, 2022
View reviewed changes
Copy link
Member Author

@aminya aminya left a comment

Choose a reason for hiding this comment

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

Autocomplete seems broken

@mauricioszabo
Copy link

Autocomplete seems broken

Can you give an example? I'm using these modifications for a whole week now, and did not find any issues (well, I am using the version that I bumped Electron too, but I'm not sure if this could change things this much)

@aminya
Copy link
Member Author

aminya commented Jul 3, 2022 •
edited
Loading

Autocomplete seems broken

Can you give an example? I'm using these modifications for a whole week now, and did not find any issues (well, I am using the version that I bumped Electron too, but I'm not sure if this could change things this much)

See the failing tests. HTML, Java, and Ruby have changed. Tree-sitter is the grammar of Atom, and changing it is actually a big deal.

@aminya
Copy link
Member Author

aminya commented Jul 3, 2022

Cherry-picked #417. We should fix the failing tests (there are a lot) before we can merge this.

@DeeDeeG DeeDeeG mentioned this pull request Jul 8, 2022
Merged
icecream17 and others added 8 commits July 9, 2022 16:45
@icecream17 @aminya
➡️ Migrate all language packages
75622ef 
To make #386 reviewable,
that pr will be separated into many simpler prs. This is one of them.

This first commit does the following:
- update package.json
- update package-lock.json using `./script/build` which also seems to update `apm/package-lock.json`
- update packages/README.md
- clone all language packages. Specifically:
    - `mkdir packages/language-<all of them>`
    - `cd packages/about`
    - For all languages:
        - `cd ../language-<>`
        - `git clone language-<>`
        - Move all files except `.git` from `language-<>/language-<>`
          to `language-<>`
        - delete `language-<>/language-<>`

Since at first I accidentally updated `dependencies` then
`packageDependencies`, it appears that since the versions of language-c,
language-css, language-go, language-javascript, and language-sass don't
match, `dependencies` was reset for those versions.

[Those repos just happen to be precisely the ones that have tree-sitter v19](https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md), (sans language-sass),
which [currently breaks atom](atom#22129). So even though their repos are now
in `packages`, **I've decided to not use them**.

This is done by updating `packageDependencies` only for non-breaking
languages.
@icecream17 @aminya
lint
574789d
@mauricioszabo @aminya
Bumped all languages to recent tree-sitter
5767f92
@mauricioszabo @aminya
Bump Atom's tree-sitter
7352ae1
@aminya
fix: fix the tree-sitter in package-lock.json
c41dd0e
@icecream17 @aminya
Update package/package-lock (2) for the...
08a9d37 
... 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)
@DeeDeeG @aminya
deps: Refresh lockfiles in packages/ dir
b81b52f
@DeeDeeG @aminya
deps: Use updated parser package for language-java
4383804
@aminya aminya force-pushed the merge-languages branch from c99a1cf to 4383804 Compare July 9, 2022 23:46
aminya
aminya commented Jul 10, 2022
View reviewed changes
Copy link
Member Author

@aminya aminya left a comment

Choose a reason for hiding this comment

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

We should update node-abi in all the packages

@icecream17 icecream17 mentioned this pull request Jul 10, 2022
Merged
2 tasks
@DeeDeeG
Copy link
Member

DeeDeeG commented Jul 11, 2022 •
edited
Loading

By the way, tree-sitter-typescript v19.x or newer doesn't build on Windows, in my testing.

tree-sitter/tree-sitter-typescript#146 (comment)
^ Related comment that explains when the build failure started, I think?

@aminya aminya mentioned this pull request Jul 18, 2022
Closed
aminya
aminya commented Jul 18, 2022
View reviewed changes
packages/language-typescript/package.json
"url": "https://github.com/atom/language-typescript/issues"
},
"dependencies": {
"tree-sitter-typescript": "0.20.1"
Copy link
Member Author

Choose a reason for hiding this comment

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

Suggested change
"tree-sitter-typescript": "0.20.1"
"tree-sitter-typescript": "github:tree-sitter/tree-sitter-typescript#master"

aminya
aminya commented Jul 18, 2022
View reviewed changes
Copy link
Member Author

@aminya aminya left a comment •
edited
Loading

Choose a reason for hiding this comment

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

There is a list of working tree-sitter packages here:

https://github.com/cursorless-dev/vscode-parse-tree/blob/4936a9c78b4e5aa3ad99816dfa751b00c5d9abd9/package.json#L78-L103

We should update all the outdated dependencies with these. This will probably fix the build issues.

@ghost
Copy link

ghost commented Jul 18, 2022

There is a list of working tree-sitter packages here:

https://github.com/cursorless-dev/vscode-parse-tree/blob/4936a9c78b4e5aa3ad99816dfa751b00c5d9abd9/package.json#L78-L103

We should update all the outdated dependencies with these. This will probably fix the build issues.

It references "vscode" in the github repository name. Those are not for Atom.

@aminya
Copy link
Member Author

aminya commented Jul 18, 2022

It references "vscode" in the github repository name. Those are not for Atom.

Tree-sitter is editor agnostic.

@ghost
Copy link

ghost commented Jul 19, 2022 •
edited by ghost
Loading

It references "vscode" in the github repository name. Those are not for Atom.

Tree-sitter is editor agnostic.

@aminya I made this fork specifically for Atom Community https://github.com/stechness/atomcommunity-parse-tree.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
high-priority Modernization
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aminya @mauricioszabo @DeeDeeG @icecream17