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

For the merge-languages branch: Fix language-java package #441

Merged

Conversation

DeeDeeG
Copy link
Member

@DeeDeeG DeeDeeG commented Jul 8, 2022

Identify the Bug

In PR #416, the grammar file packages/language-java/grammars/tree-sitter-java.cson is out of date now that tree-sitter-java-dev package was replaced by tree-sitter-java.

Background info

@mauricioszabo pointed out in Discord that there is something wrong with the language-java package in PR #416 's branch.

I investigated and... found a different issue affecting the same package, apparently.

The parser package was updated from the tree-sitter-java-dev package to the newer tree-sitter-java package (no -dev in the name).

Description of the Change

In the grammar file packages/language-java/grammars/tree-sitter-java.cson, updated the parser: field to match the updated tree-sitter-java package, which language-java was updated to depend on in PR #416 's branch.

(Instead of the old tree-sitter-java-dev package from before.)

Alternate Designs

Possible Drawbacks

Verification Process

Prevented this error for me when I built locally:

Cannot find module 'tree-sitter-java-dev'
Require stack:
- /home/user/atom/out/atom-dev-1.63.0-dev-2d2b4ca097-amd64/resources/app.asar/node_modules/language-java/grammars/tree-sitter-java.json in /home/user/atom/out/atom-dev-1.63.0-dev-2d2b4ca097-amd64/resources/app.asar/node_modules/language-java/grammars/tree-sitter-java.json

Release Notes

N/A

@DeeDeeG
Copy link
Member Author

DeeDeeG commented Jul 8, 2022

There is a tangentially related commit on my branch that refreshes all the package-lock.json files in the packages/ dir, by running apm install.

I can remove that if preferred. It hopefully makes no difference. (I just vaguely recall we had to do this once to make the cache hash of the packages/ dir stable in CI. But the files don't seem to be changing for me when bootstrapping and building locally, so it might not be an issue this time. Edit: It was atom#21887.)

@aminya aminya merged commit c99a1cf into atom-community:merge-languages Jul 8, 2022
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