fix: ensure vendored grammar is clean before fetch#14817
Merged
the-mikedavis merged 1 commit intohelix-editor:masterfrom Nov 24, 2025
Merged
fix: ensure vendored grammar is clean before fetch#14817the-mikedavis merged 1 commit intohelix-editor:masterfrom
the-mikedavis merged 1 commit intohelix-editor:masterfrom
Conversation
Contributor
Author
|
Forgot to mention, but #14814 is based off of this, and that now seems to no longer have any issues. |
f89afd3 to
7920372
Compare
7920372 to
d89fbaa
Compare
Contributor
Author
|
CI fail is due to the spurious windows one we have been having for a write test. |
the-mikedavis
approved these changes
Nov 24, 2025
Member
the-mikedavis
left a comment
There was a problem hiding this comment.
I think we saw this kind of error in the past for one grammar, but it only affected Windows. Removing the directory and checking out from scratch seems like the most straightforward thing to do here 👍
a3lem
pushed a commit
to a3lem/helix
that referenced
this pull request
Jan 11, 2026
Eucladia
pushed a commit
to Eucladia/helix
that referenced
this pull request
Jan 20, 2026
fryeb
pushed a commit
to fryeb/helix
that referenced
this pull request
Jan 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The issue came about when trying to do #14814. For some reason the state of the vendored repo was dirty and prevented any fetch:
Initially I tried to add
but this only made the CI go from all jobs erroring, to only the tests erroring, with msrv, lint, and doc jobs passing. I also tried to
--forceon fetch, but the issue remained.For resolving this, I just went about it the simplest method of just removing the directory before initializing it again, making a clean state to fetch from.
Looking at the diff, github did a pretty horrible job, but basically I reduced nesting in
fetch_grammarby utilizing early returns, and encapsulated vendored repo operations with a newVendoredGrammarwith various methods that do the same thing as before, now adding a step before fetching toreinitialize the clean repo state.