Skip to content
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

Make language loading more robust #2350

Merged
merged 1 commit into from
May 21, 2024
Merged

Make language loading more robust #2350

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
25 changes: 18 additions & 7 deletions packages/cursorless-engine/src/languages/LanguageDefinitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ import {
Range,
TextDocument,
getCursorlessRepoRoot,
isTesting,
showError,
} from "@cursorless/common";
import { join } from "path";
import { SyntaxNode } from "web-tree-sitter";
import { TreeSitter } from "../typings/TreeSitter";
import { ide } from "../singletons/ide.singleton";
import { LanguageDefinition } from "./LanguageDefinition";
import { toString } from "lodash";

/**
* Sentinel value to indicate that a language doesn't have
Expand Down Expand Up @@ -78,9 +81,20 @@ export class LanguageDefinitions {
({ document }) => document.languageId,
);

await Promise.all(
languageIds.map((languageId) => this.loadLanguage(languageId)),
);
try {
await Promise.all(
languageIds.map((languageId) => this.loadLanguage(languageId)),
);
} catch (err) {
showError(
ide().messages,
"Failed to load language definitions",
toString(err),
);
if (isTesting()) {
throw err;
}
}
}

public async loadLanguage(languageId: string): Promise<void> {
Expand All @@ -100,11 +114,8 @@ export class LanguageDefinitions {
}

private async reloadLanguageDefinitions(): Promise<void> {
const languageIds = Array.from(this.languageDefinitions.keys());
this.languageDefinitions.clear();
await Promise.all(
languageIds.map((languageId) => this.loadLanguage(languageId)),
);
await this.loadAllLanguages();
this.notifier.notifyListeners();
}

Expand Down
Loading