Skip to content

Update the Language class #3941

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

Merged
DmitrySharabin merged 1 commit into from
May 25, 2025
Merged

Update the Language class #3941

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
13 changes: 11 additions & 2 deletions src/core/classes/language.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,16 @@ export default class Language extends EventTarget {
return null;
}

return this.registry.getLanguage(this.def.base.id) ?? null;
let base = this.def.base;
let language = this.registry.peek(base);
if (language) {
// Already resolved
return language;
}
else {
this.registry.add(base as LanguageProto);
return this.registry.getLanguage(base.id);
}
}

get extends () {
Expand All @@ -114,7 +123,7 @@ export default class Language extends EventTarget {
languages: this.languages,
getLanguage: (id: string) => {
let language = this.languages[id] ?? this.registry.getLanguage(id);
return language?.resolvedGrammar as Grammar;
return language?.resolvedGrammar as Grammar ?? language;
},
whenDefined: (id: string) => {
return this.registry.whenDefined(id) as unknown as Promise<Language>;
Expand Down