fix(init): recover deferred syntax when tick changes during ft retry#199
Merged
barrettruth merged 2 commits intomainfrom Mar 20, 2026
Merged
fix(init): recover deferred syntax when tick changes during ft retry#199barrettruth merged 2 commits intomainfrom
barrettruth merged 2 commits intomainfrom
Conversation
Problem: when `did_filetype()` blocks filetype detection (e.g. `.sh`, `.bash`), `ensure_cache` schedules a retry via `vim.schedule` that calls `invalidate_cache` (setting `tick=-1`) then `redraw!`. The deferred syntax callback from `on_win` then sees a stale tick and aborts, leaving hunks without treesitter syntax highlighting. Solution: instead of aborting when the tick changes, fall back to the current cache's hunks that have a resolved `lang` field. This allows the deferred syntax pass to apply treesitter highlighting even after the ft retry invalidation cycle.
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
1 participant
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.
Problem
When
did_filetype()blocks filetype detection (.sh,.bash, etc.),ensure_cacheschedules a retry viavim.schedulethat callsinvalidate_cache(settingtick=-1) thenredraw!. The deferred syntax callback fromon_winthen sees a stale tick and aborts, leaving hunks without treesitter syntax highlighting permanently.Solution
Instead of aborting when the tick changes, fall back to the current cache's hunks that have a resolved
langfield. This allows the deferred syntax pass to apply treesitter highlighting even after the ft retry invalidation cycle.