@volar/monaco 2.2.0-alpha.10 → 2.2.0-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "2.2.0-alpha.10",
+	"version": "2.2.0-alpha.12",
 	"license": "MIT",
 	"type": "module",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.2.0-alpha.10",
-		"@volar/typescript": "2.2.0-alpha.10",
+		"@volar/language-service": "2.2.0-alpha.12",
+		"@volar/typescript": "2.2.0-alpha.12",
 		"monaco-languageserver-types": "^0.3.3",
 		"monaco-types": "^0.1.0",
 		"vscode-uri": "^3.0.8"
@@ -22,5 +22,5 @@
 	"devDependencies": {
 		"monaco-editor-core": "latest"
 	},
-	"gitHead": "aedd2230883c457f703be93ed150917a3efde75c"
+	"gitHead": "bf61f7a5a4a51669621e951f32ddf102f03a333d"
 }

package/worker.d.ts

@@ -3,13 +3,12 @@ import type * as monaco from 'monaco-types';
 import type * as ts from 'typescript';
 export * from '@volar/language-service';
 export * from './lib/ata.js';
-export declare function createSimpleWorkerService<T = {}>({ env, workerContext, languagePlugins, servicePlugins, extraApis, getLanguageId, }: {
+export declare function createSimpleWorkerService<T = {}>({ env, workerContext, languagePlugins, servicePlugins, extraApis, }: {
     env: ServiceEnvironment;
     workerContext: monaco.worker.IWorkerContext<any>;
     languagePlugins?: LanguagePlugin[];
     servicePlugins?: LanguageServicePlugin[];
     extraApis?: T;
-    getLanguageId?: (uri: string) => string;
 }): {
     getTriggerCharacters: () => string[];
     getAutoFormatTriggerCharacters: () => string[];
@@ -68,7 +67,7 @@ export declare function createSimpleWorkerService<T = {}>({ env, workerContext,
     dispose: () => void;
     context: import("@volar/language-service").ServiceContext;
 } & T;
-export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts, compilerOptions, env, workerContext, languagePlugins, servicePlugins, extraApis, getLanguageId, }: {
+export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts, compilerOptions, env, workerContext, languagePlugins, servicePlugins, extraApis, }: {
     typescript: typeof import('typescript');
     compilerOptions: ts.CompilerOptions;
     env: ServiceEnvironment;
@@ -76,7 +75,6 @@ export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts,
     languagePlugins?: LanguagePlugin[];
     servicePlugins?: LanguageServicePlugin[];
     extraApis?: T;
-    getLanguageId?: (uri: string) => string;
 }): {
     getTriggerCharacters: () => string[];
     getAutoFormatTriggerCharacters: () => string[];

package/worker.js

@@ -1,8 +1,8 @@
-import { createLanguageService as _createLanguageService, createLanguage, resolveCommonLanguageId, } from '@volar/language-service';
+import { createLanguageService as _createLanguageService, createLanguage, } from '@volar/language-service';
 import { createTypeScriptLanguage, createSys } from '@volar/typescript';
 export * from '@volar/language-service';
 export * from './lib/ata.js';
-export function createSimpleWorkerService({ env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, getLanguageId = resolveCommonLanguageId, }) {
+export function createSimpleWorkerService({ env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, }) {
     const snapshots = new Map();
     const language = createLanguage(languagePlugins, false, uri => {
         const model = workerContext.getMirrorModels().find(model => model.uri.toString() === uri);
@@ -18,7 +18,7 @@ export function createSimpleWorkerService({ env, workerContext, languagePlugins
                 getChangeRange: () => undefined,
             };
             snapshots.set(model, [model.version, snapshot]);
-            language.scripts.set(uri, getLanguageId(uri), snapshot);
+            language.scripts.set(uri, snapshot);
         }
         else {
             language.scripts.delete(uri);
@@ -26,7 +26,7 @@ export function createSimpleWorkerService({ env, workerContext, languagePlugins
     });
     return createWorkerService(language, servicePlugins, env, extraApis);
 }
-export function createTypeScriptWorkerService({ typescript: ts, compilerOptions, env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, getLanguageId = resolveCommonLanguageId, }) {
+export function createTypeScriptWorkerService({ typescript: ts, compilerOptions, env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, }) {
     let projectVersion = 0;
     const modelSnapshot = new WeakMap();
     const modelVersions = new Map();
@@ -80,7 +80,6 @@ export function createTypeScriptWorkerService({ typescript: ts, compilerOptions,
         getCompilationSettings() {
             return compilerOptions;
         },
-        getLanguageId: id => getLanguageId(id),
         fileNameToScriptId: env.typescript.fileNameToUri,
         scriptIdToFileName: env.typescript.uriToFileName,
     };