vscode-languageclient and vscode-languageserver update

.github/workflows/main.yml

@@ -48,4 +48,4 @@ jobs:
       - name: Test
         shell: bash
         run: |
-          npm run test:ci
+          npm run test:ci:tags

README.md

@@ -75,7 +75,7 @@ These are the current versions of packages from this repository and their alignm
 - **monaco-languageclient**: `11.0.0-next.0` (release date: unreleased)
 - **@typefox/monaco-editor-react**: `8.0.0-next.0` (release date: unreleased)
 - Aligned with:
-  - **@codingame/monaco-vscode-[editor]-api**: `34.0.1`
+  - **@codingame/monaco-vscode-[editor]-api**: `34.1.3`
   - **vscode**: `1.124.0`
   - **monaco-editor**: `0.55.1`
 - **vscode-ws-jsonrpc**: `4.0.0-next.0` (release date: unreleased)

package.json

@@ -41,8 +41,11 @@
     "reset:repo": "git clean -f -d -x --exclude=.chrome",
     "test": "vitest --config vitest.config.ts run",
     "test:watch": "vitest --config vitest.config.ts",
+    "test:tags:vscode": "vitest --config vitest.config.ts --tags-filter=vscode run",
+    "test:tags:main": "vitest --config vitest.config.ts --tags-filter=main run",
+    "test:tags": "npm run test:tags:vscode && npm run test:tags:main",
     "test:ci": "npm run test:install && npm run test",
-    "test:ci:watch": "npm run test:install && npm run test:watch",
+    "test:ci:tags": "npm run test:install && npm run test:tags",
     "test:coverage": "vitest --config vitest.config.ts run --coverage",
     "test:debug": "npm run test:playwright -- --inspect-brk=20222 --browser --no-file-parallelism",
     "test:install": "playwright install chromium",
@@ -63,7 +66,7 @@
     "@vitest/browser": "~4.1.9",
     "@vitest/browser-playwright": "~4.1.9",
     "@vitest/coverage-v8": "~4.1.9",
-    "knip": "~6.23.0",
+    "knip": "~6.24.0",
     "minimatch": "~10.2.5",
     "oxfmt": "~0.57.0",
     "oxlint": "~1.72.0",
@@ -78,8 +81,8 @@
     "dompurify": "~3.4.11",
     "esbuild": "~0.28.1",
     "minimatch": "~10.2.5",
-    "vscode-jsonrpc": "~9.0.1",
-    "vscode-languageserver-protocol": "~3.18.2"
+    "vscode-languageclient": "~10.1.0",
+    "vscode-languageserver": "~10.1.0"
   },
   "engines": {
     "node": ">=22",

packages/client/package.json

@@ -111,7 +111,7 @@
     "@codingame/monaco-vscode-views-service-override": "^34.1.3",
     "@codingame/monaco-vscode-workbench-service-override": "^34.1.3",
     "vscode": "npm:@codingame/monaco-vscode-extension-api@^34.1.3",
-    "vscode-languageclient": "~10.0.1",
+    "vscode-languageclient": "~10.1.0",
     "vscode-languageserver-protocol": "~3.18.2",
     "vscode-ws-jsonrpc": "~4.0.0-next.0"
   },

packages/client/test/common/logging.test.ts

@@ -7,7 +7,7 @@ import { LogLevel } from '@codingame/monaco-vscode-api';
 import { ConsoleLogger } from '@codingame/monaco-vscode-log-service-override';
 import { describe, expect, test } from 'vitest';
 
-describe('Logger', () => {
+describe('Logger', { tags: ['main'] }, () => {
   test('Config: None', () => {
     const logger = new ConsoleLogger();
 

packages/client/test/common/utils.test.ts

@@ -6,7 +6,7 @@
 import { describe, expect, test } from 'vitest';
 import { createUrl, type WebSocketConfigOptionsParams, type WebSocketConfigOptionsUrl } from 'monaco-languageclient/common';
 
-describe('createUrl', () => {
+describe('createUrl', { tags: ['main'] }, () => {
   test('test createUrl: ws', () => {
     const url = createUrl({
       secured: false,

packages/client/test/editorApp/config.test.ts

@@ -6,7 +6,7 @@
 import { describe, expect, test } from 'vitest';
 import { createUrl, type WebSocketConfigOptionsParams, type WebSocketConfigOptionsUrl } from 'monaco-languageclient/common';
 
-describe('createUrl', () => {
+describe.concurrent('createUrl', { concurrent: false, tags: ['main'] }, () => {
   test('test createUrl: ws', () => {
     const url = createUrl({
       secured: false,

packages/client/test/editorApp/editorApp-classic.test.ts

@@ -11,7 +11,7 @@ import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { beforeAll, describe, expect, test } from 'vitest';
 import { createDefaultMonacoVscodeApiConfig, createEditorAppConfig, createMonacoEditorDiv } from '../support/helper.js';
 
-describe('Test Test EditorApp (classic)', () => {
+describe.concurrent('Test Test EditorApp (classic)', { concurrent: false, tags: ['main'] }, () => {
   const htmlContainer = createMonacoEditorDiv();
   const apiConfig = createDefaultMonacoVscodeApiConfig('classic', htmlContainer, 'EditorService');
 

packages/client/test/editorApp/editorApp.noservices.test.ts

@@ -7,7 +7,7 @@ import { EditorApp } from 'monaco-languageclient/editorApp';
 import { describe, expect, test } from 'vitest';
 import { createEditorAppConfig, createMonacoEditorDiv } from '../support/helper.js';
 
-describe('Test EditorApp', () => {
+describe.concurrent('Test EditorApp', { concurrent: false, tags: ['main'] }, () => {
   const htmlContainer = createMonacoEditorDiv();
 
   test('Start EditorApp with no services', async () => {

packages/client/test/editorApp/editorApp.test.ts

@@ -13,7 +13,7 @@ import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { beforeAll, describe, expect, test, vi } from 'vitest';
 import { createDefaultMonacoVscodeApiConfig, createEditorAppConfig, createMonacoEditorDiv } from '../support/helper.js';
 
-describe('Test EditorApp', () => {
+describe.concurrent('Test EditorApp', { concurrent: false, tags: ['main'] }, () => {
   const htmlContainer = createMonacoEditorDiv();
   const apiConfig = createDefaultMonacoVscodeApiConfig('extended', htmlContainer, 'EditorService');
 

packages/client/test/editorApp/editorApp.wrongservices.test.ts

@@ -8,7 +8,7 @@ import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { describe, expect, test } from 'vitest';
 import { createDefaultMonacoVscodeApiConfig, createEditorAppConfig, createMonacoEditorDiv } from '../support/helper.js';
 
-describe('Test EditorApp', () => {
+describe.concurrent('Test EditorApp', { concurrent: false, tags: ['main'] }, () => {
   test('Start EditorApp with no services', async () => {
     const htmlContainer = createMonacoEditorDiv();
     const apiConfig = createDefaultMonacoVscodeApiConfig('extended', htmlContainer, 'ViewsService');

packages/client/test/fs/endpoints/emptyEndpoint.test.ts

@@ -6,7 +6,7 @@
 import { EmptyFileSystemEndpoint } from 'monaco-languageclient/fs';
 import { describe, expect, test } from 'vitest';
 
-describe('EmptyFileSystemEndpoint Tests', () => {
+describe('EmptyFileSystemEndpoint Tests', { tags: ['main'] }, () => {
   const endpoint = new EmptyFileSystemEndpoint('EMPTY');
 
   test('readFile', async () => {

packages/client/test/vscode/manager.editorservice.test.ts

@@ -9,7 +9,7 @@ import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { describe, expect, test } from 'vitest';
 import { createDefaultMonacoVscodeApiConfig } from '../support/helper.js';
 
-describe('MonacoVscodeApiWrapper Tests: Different config', () => {
+describe('MonacoVscodeApiWrapper Tests: Different config', { concurrent: false, tags: ['vscode'] }, () => {
   test('Start MonacoVscodeApiWrapper with EditorService but no htmlContainer', async () => {
     const apiConfig = createDefaultMonacoVscodeApiConfig('extended', undefined, 'EditorService');
 

packages/client/test/vscode/manager.test.ts

@@ -10,7 +10,7 @@ import { IConfigurationService, LogLevel, StandaloneServices } from '@codingame/
 import { getEnhancedMonacoEnvironment, MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { createDefaultMonacoVscodeApiConfig, createMonacoEditorDiv } from '../support/helper.js';
 
-describe('MonacoVscodeApiWrapper Tests', () => {
+describe.concurrent('MonacoVscodeApiWrapper Tests', { concurrent: false, tags: ['vscode'] }, () => {
   let apiWrapper: MonacoVscodeApiWrapper;
   const htmlContainer = createMonacoEditorDiv();
 
@@ -51,7 +51,7 @@ describe('MonacoVscodeApiWrapper Tests', () => {
     apiWrapper = new MonacoVscodeApiWrapper(apiConfig);
   });
 
-  test.sequential('test init MonacoVscodeApiWrapper and gloabl state', async () => {
+  test('test init MonacoVscodeApiWrapper and gloabl state', async () => {
     expect(typeof MonacoEnvironment === 'undefined').toBeTruthy();
 
     // call init with api config
@@ -71,7 +71,7 @@ describe('MonacoVscodeApiWrapper Tests', () => {
     expect(apiWrapper.getMonacoVscodeApiConfig().workspaceConfig?.developmentOptions?.logLevel).toBe(LogLevel.Off);
   });
 
-  test.sequential('test configureServices logLevel and developmenet info', () => {
+  test('test configureServices logLevel and developmenet info', () => {
     const apiConfig = apiWrapper.getMonacoVscodeApiConfig();
     apiConfig.logLevel = LogLevel.Info;
     apiConfig.workspaceConfig = {
@@ -85,7 +85,7 @@ describe('MonacoVscodeApiWrapper Tests', () => {
     expect(apiWrapper.getMonacoVscodeApiConfig().workspaceConfig?.developmentOptions?.logLevel).toBe(LogLevel.Info);
   });
 
-  test.sequential('test configureServices logLevel and developmenet debug', () => {
+  test('test configureServices logLevel and developmenet debug', () => {
     const apiConfig = apiWrapper.getMonacoVscodeApiConfig();
     apiConfig.logLevel = LogLevel.Debug;
     apiConfig.workspaceConfig = {
@@ -99,7 +99,7 @@ describe('MonacoVscodeApiWrapper Tests', () => {
     expect(apiWrapper.getMonacoVscodeApiConfig().workspaceConfig?.developmentOptions?.logLevel).toBe(LogLevel.Debug);
   });
 
-  test.sequential('test configureServices logLevel development mismatch', () => {
+  test('test configureServices logLevel development mismatch', () => {
     const apiConfig = apiWrapper.getMonacoVscodeApiConfig();
     apiConfig.logLevel = LogLevel.Trace;
     apiConfig.workspaceConfig = {
@@ -114,7 +114,7 @@ describe('MonacoVscodeApiWrapper Tests', () => {
     );
   });
 
-  test.sequential('test semanticHighlighting.enabled workaround', async () => {
+  test('test semanticHighlighting.enabled workaround', async () => {
     expect(apiWrapper.getMonacoVscodeApiConfig().workspaceConfig?.configurationDefaults?.['editor.semanticHighlighting.enabled']).toEqual(
       true
     );
@@ -127,7 +127,7 @@ describe('MonacoVscodeApiWrapper Tests', () => {
     expect(semHigh).toEqual(true);
   });
 
-  test.sequential('test dispose extensions and re-init', async () => {
+  test('test dispose extensions and re-init', async () => {
     expect(() => apiWrapper.dispose()).not.toThrowError();
     expect(await apiWrapper.initExtensions()).toBeUndefined();
   });

packages/client/test/vscode/manager.viewsserivce.test.ts

@@ -6,7 +6,7 @@ import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { describe, expect, test } from 'vitest';
 import { createDefaultMonacoVscodeApiConfig } from '../support/helper.js';
 
-describe('MonacoVscodeApiWrapper Tests: Different config', () => {
+describe.concurrent('MonacoVscodeApiWrapper Tests: Different config', { concurrent: false, tags: ['vscode'] }, () => {
   test('Start MonacoVscodeApiWrapper with ViewsService but no htmlContainer', async () => {
     const apiConfig = createDefaultMonacoVscodeApiConfig('extended', undefined, 'ViewsService');
 

packages/client/test/vscode/manager.workbenchserivce.test.ts

@@ -6,7 +6,7 @@ import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { describe, expect, test } from 'vitest';
 import { createDefaultMonacoVscodeApiConfig } from '../support/helper.js';
 
-describe('MonacoVscodeApiWrapper Tests: Different config', () => {
+describe.concurrent('MonacoVscodeApiWrapper Tests: Different config', { concurrent: false, tags: ['vscode'] }, () => {
   test('Start MonacoVscodeApiWrapper with WorkbenchService but no htmlContainer', async () => {
     const apiConfig = createDefaultMonacoVscodeApiConfig('extended', undefined, 'WorkbenchService');
 

packages/client/test/worker/workerFactory.test.ts

@@ -9,7 +9,7 @@ import { getEnhancedMonacoEnvironment } from 'monaco-languageclient/vscodeApiWra
 import { useWorkerFactory, Worker } from 'monaco-languageclient/workerFactory';
 import { describe, expect, test } from 'vitest';
 
-describe('WorkerFactory Tests', () => {
+describe.concurrent('WorkerFactory Tests', { concurrent: false, tags: ['vscode'] }, () => {
   test('useWorkerFactory: Nothing', () => {
     useWorkerFactory({});
 

packages/client/test/worker/workerLoaders.test.ts

@@ -11,11 +11,11 @@ import '@codingame/monaco-vscode-standalone-json-language-features';
 import '@codingame/monaco-vscode-standalone-languages';
 import '@codingame/monaco-vscode-standalone-typescript-language-features';
 import { EditorApp } from 'monaco-languageclient/editorApp';
-import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+import { getEnhancedMonacoEnvironment, MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 import { awaitWorkerPromises, configureClassicWorkerFactory, createWorkerPromises } from '../support/helper-classic.js';
 import { createDefaultMonacoVscodeApiConfig, createMonacoEditorDiv } from '../support/helper.js';
 
-describe.concurrent('Test WorkerLoaders', { concurrent: false }, () => {
+describe.concurrent('Test WorkerLoaders', { concurrent: false, tags: ['vscode'] }, () => {
   test('Test default worker application', async () => {
     const htmlContainer = createMonacoEditorDiv();
     const apiConfig = createDefaultMonacoVscodeApiConfig('extended', htmlContainer, 'EditorService');
@@ -31,12 +31,28 @@ describe.concurrent('Test WorkerLoaders', { concurrent: false }, () => {
         }
       }
     });
+
+    const editorWorkerUrl = getEnhancedMonacoEnvironment().getWorkerUrl?.('test', 'editorWorkerService');
+    const editorWorkerCheck = getEnhancedMonacoEnvironment().getWorker?.('test', 'editorWorkerService');
+    expect(editorWorkerCheck).toBeUndefined();
+    console.log(`editorWorkerUrl: ${editorWorkerUrl} worker: ${editorWorkerCheck !== undefined}\n`);
+
     // default, expect editor worker to be loaded
     createWorkerPromises(['editorWorker']);
     await editorApp.start(htmlContainer);
     expect(await awaitWorkerPromises()).toStrictEqual([undefined]);
     await editorApp.disposeModelRefs();
 
+    const tsWorkerUrl = getEnhancedMonacoEnvironment().getWorkerUrl?.('test', 'typescript');
+    const tsWorkerCheck = getEnhancedMonacoEnvironment().getWorker?.('test', 'typescript');
+    expect(tsWorkerCheck).toBeUndefined();
+    console.log(`tsWorkerUrl: ${tsWorkerUrl} worker: ${tsWorkerCheck !== undefined}\n`);
+
+    const jsonWorkerUrl = getEnhancedMonacoEnvironment().getWorkerUrl?.('test', 'json');
+    const jsonWorkerCheck = getEnhancedMonacoEnvironment().getWorker?.('test', 'json');
+    expect(jsonWorkerCheck).toBeUndefined();
+    console.log(`jsonWorkerUrl: ${jsonWorkerUrl} worker: ${jsonWorkerCheck !== undefined}\n`);
+
     // ts worker, expect ts worker and json worker to be loaded
     createWorkerPromises(['tsWorker', 'jsonWorker']);
     await editorApp.updateCodeResources({
@@ -48,6 +64,11 @@ describe.concurrent('Test WorkerLoaders', { concurrent: false }, () => {
     expect(await awaitWorkerPromises()).toStrictEqual([undefined, undefined]);
     await editorApp.disposeModelRefs();
 
+    const cssWorkerUrl = getEnhancedMonacoEnvironment().getWorkerUrl?.('test', 'css');
+    const cssWorkerCheck = getEnhancedMonacoEnvironment().getWorker?.('test', 'css');
+    expect(cssWorkerCheck).toBeUndefined();
+    console.log(`cssWorkerUrl: ${cssWorkerUrl} worker: ${cssWorkerCheck !== undefined}\n`);
+
     createWorkerPromises(['cssWorker']);
     await editorApp.updateCodeResources({
       modified: {
@@ -58,6 +79,11 @@ describe.concurrent('Test WorkerLoaders', { concurrent: false }, () => {
     expect(await awaitWorkerPromises()).toStrictEqual([undefined]);
     await editorApp.disposeModelRefs();
 
+    const htmlWorkerUrl = getEnhancedMonacoEnvironment().getWorkerUrl?.('test', 'html');
+    const htmlWorkerCheck = getEnhancedMonacoEnvironment().getWorker?.('test', 'html');
+    expect(htmlWorkerCheck).toBeUndefined();
+    console.log(`htmlWorkerUrl: ${htmlWorkerUrl} worker: ${htmlWorkerCheck !== undefined}\n`);
+
     createWorkerPromises(['htmlWorker']);
     await editorApp.updateCodeResources({
       modified: {

packages/client/test/wrapper/lcmanager.test.ts

@@ -14,7 +14,7 @@ import { beforeAll, describe, expect, test } from 'vitest';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser';
 import { createDefaultLcWorkerConfig, createMonacoEditorDiv } from '../support/helper.js';
 
-describe('Test LanguageClientWrapper', () => {
+describe('Test LanguageClientWrapper', { tags: ['main'] }, () => {
   beforeAll(async () => {
     const apiConfig: MonacoVscodeApiConfig = {
       $type: 'extended',

packages/client/test/wrapper/lcwrapper.test.ts

@@ -18,7 +18,7 @@ import {
   createUnreachableWorkerConfig
 } from '../support/helper.js';
 
-describe('Test LanguageClientWrapper', () => {
+describe('Test LanguageClientWrapper', { tags: ['main'] }, () => {
   beforeAll(async () => {
     const apiConfig: MonacoVscodeApiConfig = {
       $type: 'extended',

packages/examples/package.json

@@ -117,7 +117,7 @@
     "cors": "~2.8.6",
     "express": "~5.2.1",
     "jszip": "~3.10.1",
-    "langium": "~4.3.0",
+    "langium": "~4.3.1",
     "langium-minilogo": "~4.0.1",
     "monaco-languageclient": "~11.0.0-next.0",
     "pyright": "~1.1.411",
@@ -126,8 +126,8 @@
     "request-light": "~0.8.0",
     "vscode": "npm:@codingame/monaco-vscode-extension-api@^34.1.3",
     "vscode-json-languageservice": "~5.7.2",
-    "vscode-languageclient": "~10.0.1",
-    "vscode-languageserver": "~10.0.1",
+    "vscode-languageclient": "~10.1.0",
+    "vscode-languageserver": "~10.1.0",
     "vscode-languageserver-protocol": "~3.18.2",
     "vscode-languageserver-textdocument": "~1.0.12",
     "vscode-uri": "~3.1.0",

packages/wrapper-react/package.json

@@ -47,7 +47,7 @@
     "@codingame/monaco-vscode-log-service-override": "^34.1.3",
     "monaco-languageclient": "~11.0.0-next.0",
     "react": ">=18.0.0 || <20.0.0",
-    "vscode-languageclient": "~10.0.1"
+    "vscode-languageclient": "~10.1.0"
   },
   "devDependencies": {
     "monaco-languageclient-examples": "../examples"

packages/wrapper-react/test/index.extapi.test.tsx

@@ -12,7 +12,7 @@ import React, { useState } from 'react';
 import { beforeAll, describe, expect, test } from 'vitest';
 import { cleanHtmlBody, createDefaultEditorAppConfig, hundredMs } from './support/helper.js';
 
-describe.sequential('Test MonacoEditorReactComp: External monaco-vscode-api', () => {
+describe.concurrent('Test MonacoEditorReactComp: External monaco-vscode-api', { concurrent: false, tags: ['main'] }, () => {
   beforeAll(async () => {
     const vscodeApiConfig: MonacoVscodeApiConfig = {
       $type: 'extended',

packages/wrapper-react/test/index.lc.strictmode.test.tsx

@@ -12,7 +12,7 @@ import React, { StrictMode } from 'react';
 import { describe, expect, test } from 'vitest';
 import { cleanHtmlBody, createDefaultEditorAppConfig, createDefaultLanguageClientConfig, hundredMs } from './support/helper.js';
 
-describe.sequential('Test MonacoEditorReactComp StrictMode: Language Client ', () => {
+describe.concurrent('Test MonacoEditorReactComp StrictMode: Language Client ', { concurrent: false, tags: ['main'] }, () => {
   const vscodeApiConfig: MonacoVscodeApiConfig = {
     $type: 'extended',
     viewsConfig: {

packages/wrapper-react/test/index.lc.test.tsx

@@ -12,7 +12,7 @@ import React from 'react';
 import { describe, expect, test } from 'vitest';
 import { cleanHtmlBody, createDefaultEditorAppConfig, createDefaultLanguageClientConfig, hundredMs } from './support/helper.js';
 
-describe.sequential('Test MonacoEditorReactComp: Langugae Client', () => {
+describe.concurrent('Test MonacoEditorReactComp: Langugae Client', { concurrent: false, tags: ['main'] }, () => {
   const vscodeApiConfig: MonacoVscodeApiConfig = {
     $type: 'extended',
     viewsConfig: {

packages/wrapper-react/test/index.strictmode.test.tsx

@@ -13,7 +13,7 @@ import React, { StrictMode, useState } from 'react';
 import { describe, expect, test } from 'vitest';
 import { cleanHtmlBody, createDefaultEditorAppConfig, hundredMs } from './support/helper.js';
 
-describe.sequential('Test MonacoEditorReactComp', () => {
+describe.concurrent('Test MonacoEditorReactComp', { concurrent: false, tags: ['main'] }, () => {
   const vscodeApiConfig: MonacoVscodeApiConfig = {
     $type: 'extended',
     viewsConfig: {

packages/wrapper-react/test/index.test.tsx

@@ -12,7 +12,7 @@ import React, { useState } from 'react';
 import { describe, expect, test } from 'vitest';
 import { cleanHtmlBody, createDefaultEditorAppConfig, hundredMs } from './support/helper.js';
 
-describe.sequential('Test MonacoEditorReactComp', () => {
+describe.concurrent('Test MonacoEditorReactComp', { concurrent: false, tags: ['main'] }, () => {
   const vscodeApiConfig: MonacoVscodeApiConfig = {
     $type: 'extended',
     viewsConfig: {