Skip to content

fix: resolve async issues with language tools loading #275

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

fix: resolve async issues with language tools loading #275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/monaco/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export class WorkerHost {
}
}

let resolveLanguageToolsLoaded: () => void
let isLanguageToolsLoaded: Promise<void>
let disposeVue: undefined | (() => void)
export async function reloadLanguageTools(store: Store) {
disposeVue?.()
Expand Down Expand Up @@ -115,6 +117,7 @@ export async function reloadLanguageTools(store: Store) {
disposeAutoInsertion()
disposeProvides()
}
resolveLanguageToolsLoaded?.()
}

export interface WorkerMessage {
Expand Down Expand Up @@ -155,7 +158,17 @@ export function loadMonacoEnv(store: Store) {
languages.setLanguageConfiguration('typescript', languageConfigs.ts)
languages.setLanguageConfiguration('css', languageConfigs.css)

store.reloadLanguageTools = () => reloadLanguageTools(store)
store.reloadLanguageTools = async () => {
if (!isLanguageToolsLoaded) {
isLanguageToolsLoaded = new Promise((resolve) => {
resolveLanguageToolsLoaded = resolve
})
} else {
await isLanguageToolsLoaded
isLanguageToolsLoaded = null
}
return reloadLanguageTools(store)
}
languages.onLanguage('vue', () => store.reloadLanguageTools!())

// Support for go to definition
Expand Down