@codingame/monaco-vscode-language-detection-worker-service-override 23.2.2 → 24.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-language-detection-worker-service-override",
-  "version": "23.2.2",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - language-detection-worker service-override",
   "keywords": [],
@@ -15,8 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "23.2.2",
-    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "23.2.2",
+    "@codingame/monaco-vscode-api": "24.1.0",
     "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23"
   },
   "main": "index.js",

package/vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js

@@ -18,7 +18,7 @@ import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { KeyCode, KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -76,15 +76,15 @@ let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribut
             const existing = editorModel.getLanguageId();
             if (lang && lang !== existing && skip[existing] !== lang) {
                 const detectedName = this._languageService.getLanguageName(lang) || lang;
-                let tooltip = ( localize(8352, "Accept Detected Language: {0}", detectedName));
+                let tooltip = ( localize(8478, "Accept Detected Language: {0}", detectedName));
                 const keybinding = this._keybindingService.lookupKeybinding(detectLanguageCommandId);
                 const label = keybinding?.getLabel();
                 if (label) {
                     tooltip += ` (${label})`;
                 }
                 const props = {
-                    name: ( localize(8353, "Language Detection")),
-                    ariaLabel: ( localize(8354, "Change to Detected Language: {0}", lang)),
+                    name: ( localize(8479, "Language Detection")),
+                    ariaLabel: ( localize(8480, "Change to Detected Language: {0}", lang)),
                     tooltip,
                     command: detectLanguageCommandId,
                     text: '$(lightbulb-autofix)',
@@ -116,7 +116,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: detectLanguageCommandId,
-            title: ( localize2(8355, "Detect Language from Content")),
+            title: ( localize2(8481, "Detect Language from Content")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.toNegated()), EditorContextKeys.editorTextFocus)),
             keybinding: { primary: KeyCode.KeyD | KeyMod.Alt | KeyMod.Shift, weight: KeybindingWeight.WorkbenchContrib }
@@ -134,7 +134,7 @@ registerAction2(class extends Action2 {
                 editor.getModel()?.setLanguage(lang, LanguageDetectionLanguageEventSource);
             }
             else {
-                notificationService.warn(( localize(8356, "Unable to detect editor language")));
+                notificationService.warn(( localize(8482, "Unable to detect editor language")));
             }
         }
     }

package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.d.ts

@@ -2,7 +2,7 @@ import { IWebWorkerClient, IWebWorkerServer } from "@codingame/monaco-vscode-api
 export declare abstract class LanguageDetectionWorkerHost {
     static CHANNEL_NAME: string;
     static getChannel(workerServer: IWebWorkerServer): LanguageDetectionWorkerHost;
-    static setChannel(workerClient: IWebWorkerClient<any>, obj: LanguageDetectionWorkerHost): void;
+    static setChannel(workerClient: IWebWorkerClient<unknown>, obj: LanguageDetectionWorkerHost): void;
     abstract $getIndexJsUri(): Promise<string>;
     abstract $getLanguageId(languageIdOrExt: string | undefined): Promise<string | undefined>;
     abstract $sendTelemetryEvent(languages: string[], confidences: number[], timeSpent: number): Promise<void>;

package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.d.ts

@@ -11,6 +11,7 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IWebWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service";
 export declare class LanguageDetectionService extends Disposable implements ILanguageDetectionService {
     private readonly _environmentService;
     private readonly _configurationService;
@@ -32,7 +33,7 @@ export declare class LanguageDetectionService extends Disposable implements ILan
     private historicalWorkspaceOpenedLanguageIds;
     private dirtyBiases;
     private langBiases;
-    constructor(_environmentService: IWorkbenchEnvironmentService, languageService: ILanguageService, _configurationService: IConfigurationService, _diagnosticsService: IDiagnosticsService, _workspaceContextService: IWorkspaceContextService, modelService: IModelService, _editorService: IEditorService, telemetryService: ITelemetryService, storageService: IStorageService, _logService: ILogService);
+    constructor(_environmentService: IWorkbenchEnvironmentService, languageService: ILanguageService, _configurationService: IConfigurationService, _diagnosticsService: IDiagnosticsService, _workspaceContextService: IWorkspaceContextService, modelService: IModelService, _editorService: IEditorService, telemetryService: ITelemetryService, storageService: IStorageService, _logService: ILogService, webWorkerService: IWebWorkerService);
     private resolveWorkspaceLanguageIds;
     isEnabledForLanguage(languageId: string): boolean;
     private getLanguageBiases;
@@ -43,12 +44,13 @@ export declare class LanguageDetectionWorkerClient extends Disposable {
     private readonly _modelService;
     private readonly _languageService;
     private readonly _telemetryService;
+    private readonly _webWorkerService;
     private readonly _indexJsUri;
     private readonly _modelJsonUri;
     private readonly _weightsUri;
     private readonly _regexpModelUri;
     private worker;
-    constructor(_modelService: IModelService, _languageService: ILanguageService, _telemetryService: ITelemetryService, _indexJsUri: string, _modelJsonUri: string, _weightsUri: string, _regexpModelUri: string);
+    constructor(_modelService: IModelService, _languageService: ILanguageService, _telemetryService: ITelemetryService, _webWorkerService: IWebWorkerService, _indexJsUri: string, _modelJsonUri: string, _weightsUri: string, _regexpModelUri: string);
     private _getOrCreateLanguageDetectionWorker;
     private _guessLanguageIdByUri;
     getIndexJsUri(): Promise<string>;

package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.js

@@ -19,7 +19,8 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { createWebWorker } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/webWorkerFactory';
+import { WebWorkerDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerDescriptor';
+import { IWebWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webWorker/browser/webWorkerService.service';
 import { WorkerTextModelSyncClient } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textModelSync/textModelSync.impl';
 import { LanguageDetectionWorkerHost } from './languageDetectionWorker.protocol.js';
 
@@ -34,7 +35,7 @@ let LanguageDetectionService = class LanguageDetectionService extends Disposable
     static { this.preferHistoryConfig = 'workbench.editor.preferHistoryBasedLanguageDetection'; }
     static { this.workspaceOpenedLanguagesStorageKey = 'workbench.editor.languageDetectionOpenedLanguages.workspace'; }
     static { this.globalOpenedLanguagesStorageKey = 'workbench.editor.languageDetectionOpenedLanguages.global'; }
-    constructor(_environmentService, languageService, _configurationService, _diagnosticsService, _workspaceContextService, modelService, _editorService, telemetryService, storageService, _logService) {
+    constructor(_environmentService, languageService, _configurationService, _diagnosticsService, _workspaceContextService, modelService, _editorService, telemetryService, storageService, _logService, webWorkerService) {
         super();
         this._environmentService = _environmentService;
         this._configurationService = _configurationService;
@@ -53,6 +54,7 @@ let LanguageDetectionService = class LanguageDetectionService extends Disposable
             modelService,
             languageService,
             telemetryService,
+            webWorkerService,
             ( ( FileAccess.asBrowserUri(`${moduleLocation}/dist/lib/index.js`)).toString(true)),
             ( ( FileAccess.asBrowserUri(`${moduleLocation}/model/model.json`)).toString(true)),
             ( ( FileAccess.asBrowserUri(`${moduleLocation}/model/group1-shard1of1.bin`)).toString(true)),
@@ -147,14 +149,16 @@ LanguageDetectionService = LanguageDetectionService_1 = ( __decorate([
     ( __param(6, IEditorService)),
     ( __param(7, ITelemetryService)),
     ( __param(8, IStorageService)),
-    ( __param(9, ILogService))
+    ( __param(9, ILogService)),
+    ( __param(10, IWebWorkerService))
 ], LanguageDetectionService));
 class LanguageDetectionWorkerClient extends Disposable {
-    constructor(_modelService, _languageService, _telemetryService, _indexJsUri, _modelJsonUri, _weightsUri, _regexpModelUri) {
+    constructor(_modelService, _languageService, _telemetryService, _webWorkerService, _indexJsUri, _modelJsonUri, _weightsUri, _regexpModelUri) {
         super();
         this._modelService = _modelService;
         this._languageService = _languageService;
         this._telemetryService = _telemetryService;
+        this._webWorkerService = _webWorkerService;
         this._indexJsUri = _indexJsUri;
         this._modelJsonUri = _modelJsonUri;
         this._weightsUri = _weightsUri;
@@ -162,9 +166,12 @@ class LanguageDetectionWorkerClient extends Disposable {
     }
     _getOrCreateLanguageDetectionWorker() {
         if (!this.worker) {
-            const workerClient = this._register(createWebWorker(( FileAccess.asBrowserUri(
-                'vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain.js'
-            )), 'LanguageDetectionWorker'));
+            const workerClient = this._register(this._webWorkerService.createWorkerClient(( new WebWorkerDescriptor({
+                esmModuleLocation: ( FileAccess.asBrowserUri(
+                    'vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain.js'
+                )),
+                label: 'LanguageDetectionWorker'
+            }))));
             LanguageDetectionWorkerHost.setChannel(workerClient, {
                 $getIndexJsUri: async () => this.getIndexJsUri(),
                 $getLanguageId: async (languageIdOrExt) => this.getLanguageId(languageIdOrExt),