Switch ResolverService to ContributorData in tests

vsce-toolroom · Nov 13, 2024 · afa5eb3 · afa5eb3
1 parent 640675c
commit afa5eb3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/test/context/mock.ts b/test/context/mock.ts
@@ -7,11 +7,9 @@ import { MockGlobalMemento, MockMemento } from './memento';
 import { StubSecretStorage } from './secret';
 import { MockEnvironmentVariableCollection } from './variables';
 
-import { default as TextmateLanguageService } from '../../src/main';
+import { ContributorData } from '../util/common';
 
-const resolver = new TextmateLanguageService.utils.ResolverService(
-	TextmateLanguageService.utils.getOniguruma()
-);
+const contributorData = new ContributorData();
 
 export class MockExtensionContext implements vscode.ExtensionContext {
 	public readonly subscriptions: vscode.Disposable[];
@@ -56,7 +54,7 @@ export class MockExtensionContext implements vscode.ExtensionContext {
 		this.logPath = `${codeRoot}/user-data/User/logs`;
 		this.logUri = vscode.Uri.file(this.logPath);
 
-		const extension = resolver.getExtensionFromLanguageId(id);
+		const extension = contributorData.getExtensionFromLanguageId(id);
 		if (typeof extension === 'undefined') {
 			if (globalThis.languageId === id) {
 				throw new Error('Could not find extension for language ID "' + id +'"');

diff --git a/test/util/common.ts b/test/util/common.ts
@@ -34,8 +34,8 @@ export async function writeJsonFile(uri: vscode.Uri, json: PartialJsonValue): Pr
 /** `loadJsonFile` utility. */
 export const loadJsonFile = TextmateLanguageService.utils.loadJsonFile;
 
-/** `TextmateScopeSelectorMap` utility. */
-export const ResolverService = TextmateLanguageService.utils.ResolverService;
+/** `ContributorData` utility. */
+export const ContributorData = TextmateLanguageService.utils.ContributorData;
 
 /** `TextmateScopeSelector` utility. */
 export const TextmateScopeSelector = TextmateLanguageService.utils.TextmateScopeSelector;