@codingame/monaco-vscode-language-detection-worker-service-override 11.1.2 → 12.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +2 -1
- package/index.js +18 -1
- package/package.json +19 -8
- package/vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js +28 -26
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.d.ts +21 -0
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.js +1 -0
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.d.ts +1 -0
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.js +2 -1
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.d.ts +15 -0
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.js +2 -0
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.d.ts +61 -0
- package/vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.js +10 -7
- package/worker.js +2 -1
- package/workers/languageDetection.worker.d.ts +1 -0
- package/languageDetectionWorker.js +0 -17
- package/workers/languageDetection.worker.js +0 -1
package/index.d.ts
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
|
|
2
|
+
export default function getServiceOverride(): IEditorOverrideServices;
|
package/index.js
CHANGED
|
@@ -1 +1,18 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
3
|
+
import { LanguageDetectionService } from './vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.js';
|
|
4
|
+
import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
|
|
5
|
+
import { registerAssets } from 'vscode/assets';
|
|
6
|
+
import './vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js';
|
|
7
|
+
|
|
8
|
+
registerAssets({
|
|
9
|
+
'vs/../../node_modules/@vscode/vscode-languagedetection/model/model.json': new URL('@vscode/vscode-languagedetection/model/model.json', import.meta.url).href,
|
|
10
|
+
'vs/../../node_modules/@vscode/vscode-languagedetection/model/group1-shard1of1.bin': new URL('@vscode/vscode-languagedetection/model/group1-shard1of1.bin', import.meta.url).href
|
|
11
|
+
});
|
|
12
|
+
function getServiceOverride() {
|
|
13
|
+
return {
|
|
14
|
+
[ILanguageDetectionService.toString()]: new SyncDescriptor(LanguageDetectionService, [], false)
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export { getServiceOverride as default };
|
package/package.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-language-detection-worker-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.0",
|
|
4
|
+
"private": false,
|
|
5
|
+
"description": "VSCode public API plugged on the monaco editor - language-detection-worker service-override",
|
|
4
6
|
"keywords": [],
|
|
5
7
|
"author": {
|
|
6
8
|
"name": "CodinGame",
|
|
@@ -12,8 +14,16 @@
|
|
|
12
14
|
"url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
|
|
13
15
|
},
|
|
14
16
|
"type": "module",
|
|
15
|
-
"
|
|
16
|
-
|
|
17
|
+
"dependencies": {
|
|
18
|
+
"@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common": "12.0.0",
|
|
19
|
+
"@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "12.0.0",
|
|
20
|
+
"@codingame/monaco-vscode-cb805e61-7d70-50d9-b937-bf6481ea0c17-common": "12.0.0",
|
|
21
|
+
"@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "12.0.0",
|
|
22
|
+
"@vscode/vscode-languagedetection": "12.0.0",
|
|
23
|
+
"vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
|
|
24
|
+
},
|
|
25
|
+
"peerDependencies": {},
|
|
26
|
+
"peerDependenciesMeta": {},
|
|
17
27
|
"main": "index.js",
|
|
18
28
|
"module": "index.js",
|
|
19
29
|
"types": "index.d.ts",
|
|
@@ -22,14 +32,15 @@
|
|
|
22
32
|
"default": "./index.js"
|
|
23
33
|
},
|
|
24
34
|
"./vscode/*": {
|
|
25
|
-
"default": "./vscode/src/*.js"
|
|
35
|
+
"default": "./vscode/src/*.js",
|
|
36
|
+
"types": "./vscode/src/*.d.ts"
|
|
26
37
|
},
|
|
27
38
|
"./worker": {
|
|
28
39
|
"default": "./worker.js"
|
|
40
|
+
},
|
|
41
|
+
"./*": {
|
|
42
|
+
"default": "./*.js",
|
|
43
|
+
"types": "./*.d.ts"
|
|
29
44
|
}
|
|
30
|
-
},
|
|
31
|
-
"dependencies": {
|
|
32
|
-
"vscode": "npm:@codingame/monaco-vscode-api@11.1.2",
|
|
33
|
-
"@vscode/vscode-languagedetection": "1.0.21"
|
|
34
45
|
}
|
|
35
46
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js
CHANGED
|
@@ -1,12 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
3
4
|
import { getCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
|
|
4
5
|
import { localize, localize2 } from 'vscode/vscode/vs/nls';
|
|
5
6
|
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
6
7
|
import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
7
8
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
9
|
+
import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
|
|
10
|
+
import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
|
|
8
11
|
import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
9
|
-
import { LanguageDetectionLanguageEventSource } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
|
|
12
|
+
import { LanguageDetectionLanguageEventSource } from '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
|
|
10
13
|
import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
|
|
11
14
|
import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
|
|
12
15
|
import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
|
|
@@ -14,7 +17,9 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
|
|
|
14
17
|
import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
|
|
15
18
|
import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
|
|
16
19
|
import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
|
|
17
|
-
import {
|
|
20
|
+
import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
|
|
21
|
+
import { NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
|
|
22
|
+
import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
|
|
18
23
|
import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
|
|
19
24
|
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
20
25
|
import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
|
|
@@ -31,9 +36,9 @@ let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribut
|
|
|
31
36
|
this._editorService = _editorService;
|
|
32
37
|
this._languageService = _languageService;
|
|
33
38
|
this._keybindingService = _keybindingService;
|
|
34
|
-
this._disposables = (
|
|
35
|
-
this._delayer = (
|
|
36
|
-
this._renderDisposables = (
|
|
39
|
+
this._disposables = ( new DisposableStore());
|
|
40
|
+
this._delayer = ( new ThrottledDelayer(1000));
|
|
41
|
+
this._renderDisposables = ( new DisposableStore());
|
|
37
42
|
_editorService.onDidActiveEditorChange(() => this._update(true), this, this._disposables);
|
|
38
43
|
this._update(false);
|
|
39
44
|
}
|
|
@@ -71,21 +76,21 @@ let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribut
|
|
|
71
76
|
const existing = editorModel.getLanguageId();
|
|
72
77
|
if (lang && lang !== existing && skip[existing] !== lang) {
|
|
73
78
|
const detectedName = this._languageService.getLanguageName(lang) || lang;
|
|
74
|
-
let tooltip = ( localize(
|
|
79
|
+
let tooltip = ( localize(6932, "Accept Detected Language: {0}", detectedName));
|
|
75
80
|
const keybinding = this._keybindingService.lookupKeybinding(detectLanguageCommandId);
|
|
76
81
|
const label = keybinding?.getLabel();
|
|
77
82
|
if (label) {
|
|
78
83
|
tooltip += ` (${label})`;
|
|
79
84
|
}
|
|
80
85
|
const props = {
|
|
81
|
-
name: ( localize(
|
|
82
|
-
ariaLabel: ( localize(
|
|
86
|
+
name: ( localize(6933, "Language Detection")),
|
|
87
|
+
ariaLabel: ( localize(6934, "Change to Detected Language: {0}", lang)),
|
|
83
88
|
tooltip,
|
|
84
89
|
command: detectLanguageCommandId,
|
|
85
90
|
text: '$(lightbulb-autofix)',
|
|
86
91
|
};
|
|
87
92
|
if (!this._combinedEntry) {
|
|
88
|
-
this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution_1._id,
|
|
93
|
+
this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution_1._id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.RIGHT, compact: true });
|
|
89
94
|
}
|
|
90
95
|
else {
|
|
91
96
|
this._combinedEntry.update(props);
|
|
@@ -98,26 +103,23 @@ let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribut
|
|
|
98
103
|
}
|
|
99
104
|
}
|
|
100
105
|
};
|
|
101
|
-
LanguageDetectionStatusContribution = LanguageDetectionStatusContribution_1 = (
|
|
102
|
-
(
|
|
103
|
-
(
|
|
104
|
-
(
|
|
105
|
-
(
|
|
106
|
-
(
|
|
107
|
-
(
|
|
108
|
-
], LanguageDetectionStatusContribution))
|
|
109
|
-
(
|
|
106
|
+
LanguageDetectionStatusContribution = LanguageDetectionStatusContribution_1 = ( __decorate([
|
|
107
|
+
( __param(0, ILanguageDetectionService)),
|
|
108
|
+
( __param(1, IStatusbarService)),
|
|
109
|
+
( __param(2, IConfigurationService)),
|
|
110
|
+
( __param(3, IEditorService)),
|
|
111
|
+
( __param(4, ILanguageService)),
|
|
112
|
+
( __param(5, IKeybindingService))
|
|
113
|
+
], LanguageDetectionStatusContribution));
|
|
114
|
+
( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(LanguageDetectionStatusContribution, LifecyclePhase.Restored);
|
|
110
115
|
registerAction2(class extends Action2 {
|
|
111
116
|
constructor() {
|
|
112
117
|
super({
|
|
113
118
|
id: detectLanguageCommandId,
|
|
114
|
-
title: ( localize2(
|
|
119
|
+
title: ( localize2(6935, "Detect Language from Content")),
|
|
115
120
|
f1: true,
|
|
116
|
-
precondition: (
|
|
117
|
-
|
|
118
|
-
EditorContextKeys.editorTextFocus
|
|
119
|
-
))),
|
|
120
|
-
keybinding: { primary: 34 | 512 | 1024 , weight: 200 }
|
|
121
|
+
precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.toNegated()), EditorContextKeys.editorTextFocus)),
|
|
122
|
+
keybinding: { primary: KeyCode.KeyD | KeyMod.Alt | KeyMod.Shift, weight: KeybindingWeight.WorkbenchContrib }
|
|
121
123
|
});
|
|
122
124
|
}
|
|
123
125
|
async run(accessor) {
|
|
@@ -132,7 +134,7 @@ registerAction2(class extends Action2 {
|
|
|
132
134
|
editor.getModel()?.setLanguage(lang, LanguageDetectionLanguageEventSource);
|
|
133
135
|
}
|
|
134
136
|
else {
|
|
135
|
-
notificationService.warn(( localize(
|
|
137
|
+
notificationService.warn(( localize(6936, "Unable to detect editor language")));
|
|
136
138
|
}
|
|
137
139
|
}
|
|
138
140
|
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { IRequestHandler, IWorkerServer } from "vscode/vscode/vs/base/common/worker/simpleWorker";
|
|
2
|
+
import { ILanguageDetectionWorker } from "./languageDetectionWorker.protocol.js";
|
|
3
|
+
export declare function create(workerServer: IWorkerServer): IRequestHandler;
|
|
4
|
+
export declare class LanguageDetectionSimpleWorker implements ILanguageDetectionWorker {
|
|
5
|
+
_requestHandlerBrand: any;
|
|
6
|
+
private static readonly expectedRelativeConfidence;
|
|
7
|
+
private static readonly positiveConfidenceCorrectionBucket1;
|
|
8
|
+
private static readonly positiveConfidenceCorrectionBucket2;
|
|
9
|
+
private static readonly negativeConfidenceCorrection;
|
|
10
|
+
private readonly _workerTextModelSyncServer;
|
|
11
|
+
private readonly _host;
|
|
12
|
+
private _modelOperations;
|
|
13
|
+
private _loadFailed;
|
|
14
|
+
private modelIdToCoreId;
|
|
15
|
+
constructor(workerServer: IWorkerServer);
|
|
16
|
+
$detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined>;
|
|
17
|
+
private getTextForDetection;
|
|
18
|
+
private getModelOperations;
|
|
19
|
+
private adjustLanguageConfidence;
|
|
20
|
+
private detectLanguagesImpl;
|
|
21
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
|
|
1
2
|
import { create } from './languageDetectionSimpleWorker.js';
|
|
2
|
-
import { bootstrapSimpleWorker } from 'vscode/vscode/vs/base/common/worker/simpleWorkerBootstrap';
|
|
3
|
+
import { bootstrapSimpleWorker } from '@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common/vscode/vs/base/common/worker/simpleWorkerBootstrap';
|
|
3
4
|
|
|
4
5
|
bootstrapSimpleWorker(create);
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { IWorkerClient, IWorkerServer } from "vscode/vscode/vs/base/common/worker/simpleWorker";
|
|
2
|
+
export declare abstract class LanguageDetectionWorkerHost {
|
|
3
|
+
static CHANNEL_NAME: string;
|
|
4
|
+
static getChannel(workerServer: IWorkerServer): LanguageDetectionWorkerHost;
|
|
5
|
+
static setChannel(workerClient: IWorkerClient<any>, obj: LanguageDetectionWorkerHost): void;
|
|
6
|
+
abstract $getIndexJsUri(): Promise<string>;
|
|
7
|
+
abstract $getLanguageId(languageIdOrExt: string | undefined): Promise<string | undefined>;
|
|
8
|
+
abstract $sendTelemetryEvent(languages: string[], confidences: number[], timeSpent: number): Promise<void>;
|
|
9
|
+
abstract $getRegexpModelUri(): Promise<string>;
|
|
10
|
+
abstract $getModelJsonUri(): Promise<string>;
|
|
11
|
+
abstract $getWeightsUri(): Promise<string>;
|
|
12
|
+
}
|
|
13
|
+
export interface ILanguageDetectionWorker {
|
|
14
|
+
$detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined>;
|
|
15
|
+
}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
|
|
2
|
+
import { ILanguageDetectionService } from "vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service";
|
|
3
|
+
import { IWorkbenchEnvironmentService } from "vscode/vscode/vs/workbench/services/environment/common/environmentService.service";
|
|
4
|
+
import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
|
|
5
|
+
import { ILanguageService } from "vscode/vscode/vs/editor/common/languages/language";
|
|
6
|
+
import { URI } from "vscode/vscode/vs/base/common/uri";
|
|
7
|
+
import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
|
|
8
|
+
import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
|
|
9
|
+
import { IDiagnosticsService } from "vscode/vscode/vs/platform/diagnostics/common/diagnostics.service";
|
|
10
|
+
import { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
|
|
11
|
+
import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
|
|
12
|
+
import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
|
|
13
|
+
import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
|
|
14
|
+
export declare class LanguageDetectionService extends Disposable implements ILanguageDetectionService {
|
|
15
|
+
private readonly _environmentService;
|
|
16
|
+
private readonly _configurationService;
|
|
17
|
+
private readonly _diagnosticsService;
|
|
18
|
+
private readonly _workspaceContextService;
|
|
19
|
+
private readonly _editorService;
|
|
20
|
+
private readonly _logService;
|
|
21
|
+
static readonly enablementSettingKey = "workbench.editor.languageDetection";
|
|
22
|
+
static readonly historyBasedEnablementConfig = "workbench.editor.historyBasedLanguageDetection";
|
|
23
|
+
static readonly preferHistoryConfig = "workbench.editor.preferHistoryBasedLanguageDetection";
|
|
24
|
+
static readonly workspaceOpenedLanguagesStorageKey = "workbench.editor.languageDetectionOpenedLanguages.workspace";
|
|
25
|
+
static readonly globalOpenedLanguagesStorageKey = "workbench.editor.languageDetectionOpenedLanguages.global";
|
|
26
|
+
_serviceBrand: undefined;
|
|
27
|
+
private _languageDetectionWorkerClient;
|
|
28
|
+
private hasResolvedWorkspaceLanguageIds;
|
|
29
|
+
private workspaceLanguageIds;
|
|
30
|
+
private sessionOpenedLanguageIds;
|
|
31
|
+
private historicalGlobalOpenedLanguageIds;
|
|
32
|
+
private historicalWorkspaceOpenedLanguageIds;
|
|
33
|
+
private dirtyBiases;
|
|
34
|
+
private langBiases;
|
|
35
|
+
constructor(_environmentService: IWorkbenchEnvironmentService, languageService: ILanguageService, _configurationService: IConfigurationService, _diagnosticsService: IDiagnosticsService, _workspaceContextService: IWorkspaceContextService, modelService: IModelService, _editorService: IEditorService, telemetryService: ITelemetryService, storageService: IStorageService, _logService: ILogService);
|
|
36
|
+
private resolveWorkspaceLanguageIds;
|
|
37
|
+
isEnabledForLanguage(languageId: string): boolean;
|
|
38
|
+
private getLanguageBiases;
|
|
39
|
+
detectLanguage(resource: URI, supportedLangs?: string[]): Promise<string | undefined>;
|
|
40
|
+
private initEditorOpenedListeners;
|
|
41
|
+
}
|
|
42
|
+
export declare class LanguageDetectionWorkerClient extends Disposable {
|
|
43
|
+
private readonly _modelService;
|
|
44
|
+
private readonly _languageService;
|
|
45
|
+
private readonly _telemetryService;
|
|
46
|
+
private readonly _indexJsUri;
|
|
47
|
+
private readonly _modelJsonUri;
|
|
48
|
+
private readonly _weightsUri;
|
|
49
|
+
private readonly _regexpModelUri;
|
|
50
|
+
private worker;
|
|
51
|
+
constructor(_modelService: IModelService, _languageService: ILanguageService, _telemetryService: ITelemetryService, _indexJsUri: string, _modelJsonUri: string, _weightsUri: string, _regexpModelUri: string);
|
|
52
|
+
private _getOrCreateLanguageDetectionWorker;
|
|
53
|
+
private _guessLanguageIdByUri;
|
|
54
|
+
getIndexJsUri(): Promise<string>;
|
|
55
|
+
getLanguageId(languageIdOrExt: string | undefined): string | undefined;
|
|
56
|
+
getModelJsonUri(): Promise<string>;
|
|
57
|
+
getWeightsUri(): Promise<string>;
|
|
58
|
+
getRegexpModelUri(): Promise<string>;
|
|
59
|
+
sendTelemetryEvent(languages: string[], confidences: number[], timeSpent: number): Promise<void>;
|
|
60
|
+
detectLanguage(resource: URI, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined>;
|
|
61
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
3
|
-
import { LanguageDetectionStatsId } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
|
|
4
|
+
import { LanguageDetectionStatsId } from '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
|
|
4
5
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
5
6
|
import { nodeModulesPath, FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
6
7
|
import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
|
|
@@ -8,15 +9,17 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
|
|
|
8
9
|
import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
|
|
9
10
|
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
10
11
|
import 'vscode/vscode/vs/base/common/platform';
|
|
12
|
+
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
11
13
|
import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
|
|
12
14
|
import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
|
|
13
15
|
import { IDiagnosticsService } from 'vscode/vscode/vs/platform/diagnostics/common/diagnostics.service';
|
|
14
16
|
import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
|
|
15
17
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
18
|
+
import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
|
|
16
19
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
17
20
|
import { LRUCache } from 'vscode/vscode/vs/base/common/map';
|
|
18
21
|
import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
|
|
19
|
-
import 'vscode/vscode/vs/amdX';
|
|
22
|
+
import '@codingame/monaco-vscode-cb805e61-7d70-50d9-b937-bf6481ea0c17-common/vscode/vs/amdX';
|
|
20
23
|
import { createWebWorker } from 'vscode/vscode/vs/base/browser/defaultWorkerFactory';
|
|
21
24
|
import { WorkerTextModelSyncClient } from 'vscode/vscode/vs/editor/common/services/textModelSync/textModelSync.impl';
|
|
22
25
|
import { LanguageDetectionWorkerHost } from './languageDetectionWorker.protocol.js';
|
|
@@ -109,14 +112,14 @@ let LanguageDetectionService = class LanguageDetectionService extends Disposable
|
|
|
109
112
|
}
|
|
110
113
|
initEditorOpenedListeners(storageService) {
|
|
111
114
|
try {
|
|
112
|
-
const globalLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.globalOpenedLanguagesStorageKey,
|
|
115
|
+
const globalLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.globalOpenedLanguagesStorageKey, StorageScope.PROFILE, '[]'));
|
|
113
116
|
this.historicalGlobalOpenedLanguageIds.fromJSON(globalLangHistoryData);
|
|
114
117
|
}
|
|
115
118
|
catch (e) {
|
|
116
119
|
console.error(e);
|
|
117
120
|
}
|
|
118
121
|
try {
|
|
119
|
-
const workspaceLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey,
|
|
122
|
+
const workspaceLangHistoryData = JSON.parse(storageService.get(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey, StorageScope.WORKSPACE, '[]'));
|
|
120
123
|
this.historicalWorkspaceOpenedLanguageIds.fromJSON(workspaceLangHistoryData);
|
|
121
124
|
}
|
|
122
125
|
catch (e) {
|
|
@@ -128,8 +131,8 @@ let LanguageDetectionService = class LanguageDetectionService extends Disposable
|
|
|
128
131
|
this.sessionOpenedLanguageIds.add(activeLanguage);
|
|
129
132
|
this.historicalGlobalOpenedLanguageIds.set(activeLanguage, true);
|
|
130
133
|
this.historicalWorkspaceOpenedLanguageIds.set(activeLanguage, true);
|
|
131
|
-
storageService.store(LanguageDetectionService_1.globalOpenedLanguagesStorageKey, JSON.stringify(this.historicalGlobalOpenedLanguageIds.toJSON()),
|
|
132
|
-
storageService.store(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey, JSON.stringify(this.historicalWorkspaceOpenedLanguageIds.toJSON()),
|
|
134
|
+
storageService.store(LanguageDetectionService_1.globalOpenedLanguagesStorageKey, JSON.stringify(this.historicalGlobalOpenedLanguageIds.toJSON()), StorageScope.PROFILE, StorageTarget.MACHINE);
|
|
135
|
+
storageService.store(LanguageDetectionService_1.workspaceOpenedLanguagesStorageKey, JSON.stringify(this.historicalWorkspaceOpenedLanguageIds.toJSON()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
|
|
133
136
|
this.dirtyBiases = true;
|
|
134
137
|
}
|
|
135
138
|
}));
|
package/worker.js
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import './vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.js';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
2
|
-
import { LanguageDetectionService } from './vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.js';
|
|
3
|
-
import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
|
|
4
|
-
import { registerAssets } from 'vscode/assets';
|
|
5
|
-
import './vscode/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.js';
|
|
6
|
-
|
|
7
|
-
registerAssets({
|
|
8
|
-
'vs/../../node_modules/@vscode/vscode-languagedetection/model/model.json': new URL('@vscode/vscode-languagedetection/model/model.json', import.meta.url).href,
|
|
9
|
-
'vs/../../node_modules/@vscode/vscode-languagedetection/model/group1-shard1of1.bin': new URL('@vscode/vscode-languagedetection/model/group1-shard1of1.bin', import.meta.url).href
|
|
10
|
-
});
|
|
11
|
-
function getServiceOverride() {
|
|
12
|
-
return {
|
|
13
|
-
[( ILanguageDetectionService.toString())]: new SyncDescriptor(LanguageDetectionService, [], false)
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
export { getServiceOverride as default };
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
import '../vscode/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.js';
|