Skip to content

Change treeSitter to cache the Language objects it loads from wasm #1672

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
merged 1 commit into from
Jul 5, 2024
Merged

Change treeSitter to cache the Language objects it loads from wasm #1672

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
33 changes: 23 additions & 10 deletions core/util/treeSitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,25 +93,27 @@ export async function getParserForFile(filepath: string) {
}
}

// Loading the wasm files to create a Language object is an expensive operation and with
// sufficient number of files can result in errors, instead keep a map of language name
// to Language object
const nameToLanguage = new Map<string, Language>();

export async function getLanguageForFile(
filepath: string,
): Promise<Language | undefined> {
try {
await Parser.init();
const extension = path.extname(filepath).slice(1);

if (!supportedLanguages[extension]) {
const languageName = supportedLanguages[extension];
if (!languageName) {
return undefined;
}

const wasmPath = path.join(
__dirname,
...(process.env.NODE_ENV === "test"
? ["node_modules", "tree-sitter-wasms", "out"]
: ["tree-sitter-wasms"]),
`tree-sitter-${supportedLanguages[extension]}.wasm`,
);
const language = await Parser.Language.load(wasmPath);
let language = nameToLanguage.get(languageName);
if (!language) {
language = await loadLanguageForFileExt(extension);
nameToLanguage.set(languageName, language);
}
return language;
} catch (e) {
console.error("Unable to load language for file", filepath, e);
Expand Down Expand Up @@ -149,3 +151,14 @@ export async function getQueryForFile(
const query = language.query(querySource);
return query;
}

async function loadLanguageForFileExt(fileExtension: string): Promise<Language> {
const wasmPath = path.join(
__dirname,
...(process.env.NODE_ENV === "test"
? ["node_modules", "tree-sitter-wasms", "out"]
: ["tree-sitter-wasms"]),
`tree-sitter-${supportedLanguages[fileExtension]}.wasm`,
);
return await Parser.Language.load(wasmPath);
}
Loading