fix(registry): loadLanguage does not await loadGrammar #538
Conversation
This file contains 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
❌ Deploy Preview for shiki-matsu failed.
|
gregermendle
commented
Nov 17, 2023
packages/shiki/src/registry.ts
Outdated
| const l = lang.embeddedLangs[i] | ||
| if (!this.getLoadedLanguages().includes(l) && this._resolver.getLangRegistration(l)) { | ||
| await this._resolver.loadGrammar(this._resolver.getLangRegistration(l).scopeName) | ||
| embeddedLanguages[this._resolver.getLangRegistration(l).scopeName] = i + 2 |
There was a problem hiding this comment.
Also, this is different than what was there. I believe the other code would return undefined if the above if statement evaluates to false. I'm not sure if that was intended or not. An easy update if that's the case.
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.
This fix ensures that
loadGrammaris awaited and preventsloadLanguagefrom throwing in registry.ts.loadLanguageis buggy #438