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 Rust grammar from upstream repository #194758

Closed
wants to merge 1 commit into from

Conversation

Wilfred
Copy link

@Wilfred Wilfred commented Oct 3, 2023

PR #194614 aimed to include the commit
dustypomerleau/rust-syntax@328a682 but it looks like it actually took the prior commit.

Update the grammar to correctly reflect the upstream repo.

PR microsoft#194614 aimed to include the commit
dustypomerleau/rust-syntax@328a682
but it looks like it actually took the prior commit.

Update the grammar to correctly reflect the upstream repo.
@alexr00
Copy link
Member

alexr00 commented Oct 4, 2023

@Wilfred thanks for the PR! That the commit and the file contents don't match indicates a bigger problem. I first suspected a problem with the tooling we use to pull in grammar updates (and there is an issue where the commit doesn't match the contents), but the bigger problem is that https://github.com/dustypomerleau/rust-syntax has both a main branch and a master branch, and the main branch is set as the default branch. It looks like main and master have diverged. In VS Code, we can only pull from one branch. We were incorrectly pulling from master since main is the default branch.

I will update VS Code to pull from main, but since main and master have diverged you might want to reconcile them and/or delete master.

@alexr00 alexr00 closed this Oct 4, 2023
alexr00 added a commit that referenced this pull request Oct 4, 2023
@alexr00
Copy link
Member

alexr00 commented Oct 4, 2023

PR with the fix for VS Code is here: #194787

alexr00 added a commit that referenced this pull request Oct 4, 2023
@Wilfred Wilfred deleted the fix_rust_highlight branch October 4, 2023 14:23
@Wilfred
Copy link
Author

Wilfred commented Oct 4, 2023

@alexr00 Thanks, that's super helpful. To be clear, are you periodically pulling from the upstream repo, or should I be submitting PRs here when I merge PRs on the upstream repo?

@alexr00
Copy link
Member

alexr00 commented Oct 5, 2023

I pull changes from upstream grammar repos about once per month via a script, usually at the very beginning of our development iteration. If there's a change that you think should be pulled immediately you can @ mention me and I can pick the changes up more immediately.

Alex0007 pushed a commit to Alex0007/vscode that referenced this pull request Oct 26, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Nov 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants