@volar/monaco 2.4.0-alpha.6 → 2.4.0-alpha.7

package/README.md

@@ -35,7 +35,7 @@ self.onmessage = () => {
 			languagePlugins: [
 				// ...
 			],
-			servicePlugins: [
+			languageServicePlugins: [
 				// ...
 			],
 		});
@@ -76,7 +76,7 @@ self.onmessage = () => {
 			languagePlugins: [
 				// ...
 			],
-			servicePlugins: [
+			languageServicePlugins: [
 				// ...
 +				createTypeScriptService(ts),
 			],
@@ -118,7 +118,7 @@ self.onmessage = () => {
 			languagePlugins: [
 				// ...
 			],
-			servicePlugins: [
+			languageServicePlugins: [
 				// ...
 				createTypeScriptService(ts),
 			],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "2.4.0-alpha.6",
+	"version": "2.4.0-alpha.7",
 	"license": "MIT",
 	"type": "module",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.4.0-alpha.6",
-		"@volar/typescript": "2.4.0-alpha.6",
+		"@volar/language-service": "2.4.0-alpha.7",
+		"@volar/typescript": "2.4.0-alpha.7",
 		"monaco-languageserver-types": "^0.3.4",
 		"monaco-types": "^0.1.0",
 		"vscode-uri": "^3.0.8"
@@ -22,5 +22,5 @@
 	"devDependencies": {
 		"monaco-editor-core": "latest"
 	},
-	"gitHead": "7e6c0b8fb66d09037b3540bbac2c4d976b1110ce"
+	"gitHead": "890a891306835b992269ef1225f71a42f53d83e8"
 }

package/worker.d.ts

@@ -4,11 +4,11 @@ import type * as ts from 'typescript';
 import { URI } from 'vscode-uri';
 export * from '@volar/language-service';
 export * from './lib/ata.js';
-export declare function createSimpleWorkerService<T = {}>({ env, workerContext, languagePlugins, servicePlugins, extraApis, setup, }: {
+export declare function createSimpleWorkerService<T = {}>({ env, workerContext, languagePlugins, languageServicePlugins, extraApis, setup, }: {
     env: LanguageServiceEnvironment;
     workerContext: monaco.worker.IWorkerContext<any>;
-    languagePlugins?: LanguagePlugin<URI>[];
-    servicePlugins?: LanguageServicePlugin[];
+    languagePlugins: LanguagePlugin<URI>[];
+    languageServicePlugins: LanguageServicePlugin[];
     extraApis?: T;
     setup?(options: {
         language: Language<URI>;
@@ -78,7 +78,7 @@ export declare function createSimpleWorkerService<T = {}>({ env, workerContext,
     resolveInlayHint: (item: import("@volar/language-service").InlayHint, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").InlayHint>;
     resolveWorkspaceSymbol: (symbol: import("@volar/language-service").WorkspaceSymbol, token?: import("@volar/language-service").CancellationToken) => Promise<import("@volar/language-service").WorkspaceSymbol>;
 } & T;
-export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts, compilerOptions, env, uriConverter, workerContext, languagePlugins, servicePlugins, extraApis, setup, }: {
+export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts, compilerOptions, env, uriConverter, workerContext, languagePlugins, languageServicePlugins, extraApis, setup, }: {
     typescript: typeof import('typescript');
     compilerOptions: ts.CompilerOptions;
     env: LanguageServiceEnvironment;
@@ -87,8 +87,8 @@ export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts,
         asFileName(uri: URI): string;
     };
     workerContext: monaco.worker.IWorkerContext<any>;
-    languagePlugins?: LanguagePlugin<URI>[];
-    servicePlugins?: LanguageServicePlugin[];
+    languagePlugins: LanguagePlugin<URI>[];
+    languageServicePlugins: LanguageServicePlugin[];
     extraApis?: T;
     setup?(options: {
         language: Language<URI>;

package/worker.js

@@ -4,7 +4,7 @@ import { URI } from 'vscode-uri';
 export * from '@volar/language-service';
 export * from './lib/ata.js';
 const fsFileSnapshots = createUriMap();
-export function createSimpleWorkerService({ env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, setup, }) {
+export function createSimpleWorkerService({ env, workerContext, languagePlugins, languageServicePlugins, extraApis = {}, setup, }) {
     const snapshots = new Map();
     const language = createLanguage(languagePlugins, createUriMap(false), uri => {
         const model = workerContext.getMirrorModels().find(model => model.uri.toString() === uri.toString());
@@ -28,9 +28,9 @@ export function createSimpleWorkerService({ env, workerContext, languagePlugins
     });
     const project = {};
     setup?.({ language, project });
-    return createWorkerService(language, servicePlugins, env, project, extraApis);
+    return createWorkerService(language, languageServicePlugins, env, project, extraApis);
 }
-export function createTypeScriptWorkerService({ typescript: ts, compilerOptions, env, uriConverter, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, setup, }) {
+export function createTypeScriptWorkerService({ typescript: ts, compilerOptions, env, uriConverter, workerContext, languagePlugins, languageServicePlugins, extraApis = {}, setup, }) {
     let projectVersion = 0;
     const modelSnapshot = new WeakMap();
     const modelVersions = new Map();
@@ -107,7 +107,7 @@ export function createTypeScriptWorkerService({ typescript: ts, compilerOptions,
         },
     };
     setup?.({ language, project });
-    return createWorkerService(language, servicePlugins, env, project, extraApis);
+    return createWorkerService(language, languageServicePlugins, env, project, extraApis);
     function getModelSnapshot(uri) {
         const model = workerContext.getMirrorModels().find(model => model.uri.toString() === uri.toString());
         if (model) {