@codingame/monaco-vscode-language-detection-worker-service-override 15.0.2 → 16.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-language-detection-worker-service-override",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - language-detection-worker service-override",
   "keywords": [],
@@ -15,10 +15,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common": "15.0.2",
-    "@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "15.0.2",
-    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2",
+    "@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common": "16.0.0",
+    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0",
     "@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23"
   },
   "main": "index.js",
@@ -28,6 +27,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.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-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/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(7192, "Accept Detected Language: {0}", detectedName));
+                let tooltip = ( localize(7340, "Accept Detected Language: {0}", detectedName));
                 const keybinding = this._keybindingService.lookupKeybinding(detectLanguageCommandId);
                 const label = keybinding?.getLabel();
                 if (label) {
                     tooltip += ` (${label})`;
                 }
                 const props = {
-                    name: ( localize(7193, "Language Detection")),
-                    ariaLabel: ( localize(7194, "Change to Detected Language: {0}", lang)),
+                    name: ( localize(7341, "Language Detection")),
+                    ariaLabel: ( localize(7342, "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(7195, "Detect Language from Content")),
+            title: ( localize2(7343, "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(7196, "Unable to detect editor language")));
+                notificationService.warn(( localize(7344, "Unable to detect editor language")));
             }
         }
     }

package/vscode/src/vs/workbench/services/languageDetection/browser/{languageDetectionSimpleWorker.d.ts → languageDetectionWebWorker.d.ts}

@@ -1,7 +1,7 @@
-import { IRequestHandler, IWorkerServer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/worker/simpleWorker";
+import { IWebWorkerServerRequestHandler, IWebWorkerServer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/worker/webWorker";
 import { ILanguageDetectionWorker } from "./languageDetectionWorker.protocol.js";
-export declare function create(workerServer: IWorkerServer): IRequestHandler;
-export declare class LanguageDetectionSimpleWorker implements ILanguageDetectionWorker {
+export declare function create(workerServer: IWebWorkerServer): IWebWorkerServerRequestHandler;
+export declare class LanguageDetectionWorker implements ILanguageDetectionWorker {
     _requestHandlerBrand: any;
     private static readonly expectedRelativeConfidence;
     private static readonly positiveConfidenceCorrectionBucket1;
@@ -12,7 +12,7 @@ export declare class LanguageDetectionSimpleWorker implements ILanguageDetection
     private _modelOperations;
     private _loadFailed;
     private modelIdToCoreId;
-    constructor(workerServer: IWorkerServer);
+    constructor(workerServer: IWebWorkerServer);
     $detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined>;
     private getTextForDetection;
     private getModelOperations;

package/vscode/src/vs/workbench/services/languageDetection/browser/{languageDetectionSimpleWorker.js → languageDetectionWebWorker.js}

@@ -5,9 +5,9 @@ import { LanguageDetectionWorkerHost } from './languageDetectionWorker.protocol.
 import { WorkerTextModelSyncServer } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textModelSync/textModelSync.impl';
 
 function create(workerServer) {
-    return ( new LanguageDetectionSimpleWorker(workerServer));
+    return ( new LanguageDetectionWorker(workerServer));
 }
-class LanguageDetectionSimpleWorker {
+class LanguageDetectionWorker {
     static { this.expectedRelativeConfidence = 0.2; }
     static { this.positiveConfidenceCorrectionBucket1 = 0.05; }
     static { this.positiveConfidenceCorrectionBucket2 = 0.025; }
@@ -99,14 +99,14 @@ class LanguageDetectionSimpleWorker {
             case 'py':
             case 'xml':
             case 'php':
-                modelResult.confidence += LanguageDetectionSimpleWorker.positiveConfidenceCorrectionBucket1;
+                modelResult.confidence += LanguageDetectionWorker.positiveConfidenceCorrectionBucket1;
                 break;
             case 'cpp':
             case 'sh':
             case 'java':
             case 'cs':
             case 'c':
-                modelResult.confidence += LanguageDetectionSimpleWorker.positiveConfidenceCorrectionBucket2;
+                modelResult.confidence += LanguageDetectionWorker.positiveConfidenceCorrectionBucket2;
                 break;
             case 'bat':
             case 'ini':
@@ -114,7 +114,7 @@ class LanguageDetectionSimpleWorker {
             case 'sql':
             case 'csv':
             case 'toml':
-                modelResult.confidence -= LanguageDetectionSimpleWorker.negativeConfidenceCorrection;
+                modelResult.confidence -= LanguageDetectionWorker.negativeConfidenceCorrection;
                 break;
         }
         return modelResult;
@@ -141,11 +141,11 @@ class LanguageDetectionSimpleWorker {
         }
         if (!modelResults
             || modelResults.length === 0
-            || modelResults[0].confidence < LanguageDetectionSimpleWorker.expectedRelativeConfidence) {
+            || modelResults[0].confidence < LanguageDetectionWorker.expectedRelativeConfidence) {
             return;
         }
         const firstModelResult = this.adjustLanguageConfidence(modelResults[0]);
-        if (firstModelResult.confidence < LanguageDetectionSimpleWorker.expectedRelativeConfidence) {
+        if (firstModelResult.confidence < LanguageDetectionWorker.expectedRelativeConfidence) {
             return;
         }
         const possibleLanguages = [firstModelResult];
@@ -155,18 +155,18 @@ class LanguageDetectionSimpleWorker {
             }
             current = this.adjustLanguageConfidence(current);
             const currentHighest = possibleLanguages[possibleLanguages.length - 1];
-            if (currentHighest.confidence - current.confidence >= LanguageDetectionSimpleWorker.expectedRelativeConfidence) {
+            if (currentHighest.confidence - current.confidence >= LanguageDetectionWorker.expectedRelativeConfidence) {
                 while (possibleLanguages.length) {
                     yield possibleLanguages.shift();
                 }
-                if (current.confidence > LanguageDetectionSimpleWorker.expectedRelativeConfidence) {
+                if (current.confidence > LanguageDetectionWorker.expectedRelativeConfidence) {
                     possibleLanguages.push(current);
                     continue;
                 }
                 return;
             }
             else {
-                if (current.confidence > LanguageDetectionSimpleWorker.expectedRelativeConfidence) {
+                if (current.confidence > LanguageDetectionWorker.expectedRelativeConfidence) {
                     possibleLanguages.push(current);
                     continue;
                 }
@@ -176,4 +176,4 @@ class LanguageDetectionSimpleWorker {
     }
 }
 
-export { LanguageDetectionSimpleWorker, create };
+export { LanguageDetectionWorker, create };

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

@@ -0,0 +1,5 @@
+
+import { create } from './languageDetectionWebWorker.js';
+import { bootstrapWebWorker } from '@codingame/monaco-vscode-api/vscode/vs/base/common/worker/webWorkerBootstrap';
+
+bootstrapWebWorker(create);

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

@@ -1,8 +1,8 @@
-import { IWorkerClient, IWorkerServer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/worker/simpleWorker";
+import { IWebWorkerClient, IWebWorkerServer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/worker/webWorker";
 export declare abstract class LanguageDetectionWorkerHost {
     static CHANNEL_NAME: string;
-    static getChannel(workerServer: IWorkerServer): LanguageDetectionWorkerHost;
-    static setChannel(workerClient: IWorkerClient<any>, obj: LanguageDetectionWorkerHost): void;
+    static getChannel(workerServer: IWebWorkerServer): LanguageDetectionWorkerHost;
+    static setChannel(workerClient: IWebWorkerClient<any>, 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.js

@@ -19,7 +19,7 @@ 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/defaultWorkerFactory';
+import { createWebWorker } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/webWorkerFactory';
 import { WorkerTextModelSyncClient } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textModelSync/textModelSync.impl';
 import { LanguageDetectionWorkerHost } from './languageDetectionWorker.protocol.js';
 
@@ -162,7 +162,9 @@ class LanguageDetectionWorkerClient extends Disposable {
     }
     _getOrCreateLanguageDetectionWorker() {
         if (!this.worker) {
-            const workerClient = this._register(createWebWorker('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker', 'LanguageDetectionWorker'));
+            const workerClient = this._register(createWebWorker(( FileAccess.asBrowserUri(
+                'vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain.js'
+            )), 'LanguageDetectionWorker'));
             LanguageDetectionWorkerHost.setChannel(workerClient, {
                 $getIndexJsUri: async () => this.getIndexJsUri(),
                 $getLanguageId: async (languageIdOrExt) => this.getLanguageId(languageIdOrExt),

package/worker.js

@@ -1,2 +1,2 @@
 
-import './vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.js';
+import './vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain.js';

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

@@ -1,5 +0,0 @@
-
-import { create } from './languageDetectionSimpleWorker.js';
-import { bootstrapSimpleWorker } from '@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common/vscode/vs/base/common/worker/simpleWorkerBootstrap';
-
-bootstrapSimpleWorker(create);