development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-29 16:01:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix loading tree sitter wasm (#225144)

Browse source
This commit is contained in:
Alex Ross 2024-08-08 19:02:32 +02:00 committed by GitHub
parent b1a6f7e780
commit c7cf0f18ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts
View file

@ -5,7 +5,7 @@
import { TreeSitterTokenizationRegistry } from 'vs/editor/common/languages';
import type { Parser } from '@vscode/tree-sitter-wasm';
import { AppResourcePath, FileAccess, nodeModulesPath } from 'vs/base/common/network';
import { AppResourcePath, FileAccess, nodeModulesAsarUnpackedPath, nodeModulesPath } from 'vs/base/common/network';
import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
import { IModelService } from 'vs/editor/common/services/model';
import { Disposable, DisposableMap, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
@ -19,11 +19,18 @@ import { setTimeout0 } from 'vs/base/common/platform';
import { importAMDNodeModule } from 'vs/amdX';
import { Event } from 'vs/base/common/event';
import { cancelOnDispose } from 'vs/base/common/cancellation';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { canASAR } from 'vs/base/common/amd';
const EDITOR_EXPERIMENTAL_PREFER_TREESITTER = 'editor.experimental.preferTreeSitter';
const EDITOR_TREESITTER_TELEMETRY = 'editor.experimental.treeSitterTelemetry';
const moduleLocationTreeSitter: AppResourcePath = `${nodeModulesPath}/@vscode/tree-sitter-wasm/wasm`;
const moduleLocationTreeSitterWasm: AppResourcePath = `${moduleLocationTreeSitter}/tree-sitter.wasm`;
const MODULE_LOCATION_SUBPATH = `@vscode/tree-sitter-wasm/wasm`;
const FILENAME_TREESITTER_WASM = `tree-sitter.wasm`;
function getModuleLocation(environmentService: IEnvironmentService): AppResourcePath {
return `${(canASAR && environmentService.isBuilt) ? nodeModulesAsarUnpackedPath : nodeModulesPath}/${MODULE_LOCATION_SUBPATH}`;
}
export class TextModelTreeSitter extends Disposable {
private _treeSitterTree: TreeSitterTree | undefined;
@ -196,7 +203,8 @@ export class TreeSitterLanguages extends Disposable {
private _languages: Map<string, Parser.Language> = new Map();
constructor(private readonly _treeSitterImporter: TreeSitterImporter,
private readonly _fileService: IFileService
private readonly _fileService: IFileService,
private readonly _environmentService: IEnvironmentService
) {
super();
}
@ -230,7 +238,7 @@ export class TreeSitterLanguages extends Disposable {
if (!grammarName) {
return undefined;
}
return moduleLocationTreeSitter;
return getModuleLocation(this._environmentService);
}
}
@ -265,9 +273,10 @@ export class TreeSitterTextModelService extends Disposable implements ITreeSitte
@ITelemetryService private readonly _telemetryService: ITelemetryService,
@ILogService private readonly _logService: ILogService,
@IConfigurationService private readonly _configurationService: IConfigurationService,
@IEnvironmentService private readonly _environmentService: IEnvironmentService
) {
super();
this._treeSitterParser = this._register(new TreeSitterLanguages(this._treeSitterImporter, fileService));
this._treeSitterParser = this._register(new TreeSitterLanguages(this._treeSitterImporter, fileService, this._environmentService));
this._register(this._configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(EDITOR_EXPERIMENTAL_PREFER_TREESITTER)) {
this._supportedLanguagesChanged();
@ -278,9 +287,10 @@ export class TreeSitterTextModelService extends Disposable implements ITreeSitte
private async _doInitParser() {
const Parser = await this._treeSitterImporter.getParserClass();
const environmentService = this._environmentService;
await Parser.init({
locateFile(_file: string, _folder: string) {
return FileAccess.asBrowserUri(moduleLocationTreeSitterWasm).toString(true);
return FileAccess.asBrowserUri(`${getModuleLocation(environmentService)}/${FILENAME_TREESITTER_WASM}`).toString(true);
}
});
return true;

2
src/vs/editor/test/browser/services/treeSitterParserService.test.ts
View file

@ -134,7 +134,7 @@ suite('TreeSitterParserService', function () {
}
}
const treeSitterParser: TreeSitterLanguages = store.add(new MockTreeSitterParser(treeSitterImporter, {} as any));
const treeSitterParser: TreeSitterLanguages = store.add(new MockTreeSitterParser(treeSitterImporter, {} as any, { isBuilt: false } as any));
const textModel = store.add(createTextModel('console.log("Hello, world!");', 'javascript'));
const textModelTreeSitter = store.add(new TextModelTreeSitter(textModel, treeSitterParser, treeSitterImporter, logService, telemetryService));
textModel.setLanguage('typescript');