monaco-languageclient 10.5.0-next.1 → 10.6.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/CHANGELOG.md +9 -1
- package/LICENSE +0 -0
- package/README.md +0 -0
- package/lib/common/commonTypes.d.ts +1 -1
- package/lib/common/commonTypes.d.ts.map +1 -1
- package/lib/common/commonTypes.js +1 -1
- package/lib/common/commonTypes.js.map +1 -1
- package/lib/common/index.d.ts +0 -1
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +0 -1
- package/lib/common/index.js.map +1 -1
- package/lib/debugger/index.d.ts +2 -2
- package/lib/debugger/index.d.ts.map +1 -1
- package/lib/debugger/index.js.map +1 -1
- package/lib/editorApp/editorApp.d.ts +2 -2
- package/lib/editorApp/editorApp.d.ts.map +1 -1
- package/lib/editorApp/editorApp.js +1 -1
- package/lib/editorApp/editorApp.js.map +1 -1
- package/lib/fs/definitions.d.ts +2 -2
- package/lib/fs/definitions.d.ts.map +1 -1
- package/lib/fs/endpoints/defaultEndpoint.d.ts +2 -2
- package/lib/fs/endpoints/defaultEndpoint.d.ts.map +1 -1
- package/lib/fs/endpoints/defaultEndpoint.js +1 -0
- package/lib/fs/endpoints/defaultEndpoint.js.map +1 -1
- package/lib/vscode/apiWrapper.d.ts.map +1 -1
- package/lib/vscode/apiWrapper.js +16 -5
- package/lib/vscode/apiWrapper.js.map +1 -1
- package/lib/vscode/config.d.ts +5 -4
- package/lib/vscode/config.d.ts.map +1 -1
- package/lib/vscode/config.js +1 -1
- package/lib/vscode/config.js.map +1 -1
- package/lib/vscode/locales.d.ts +2 -2
- package/lib/vscode/locales.d.ts.map +1 -1
- package/lib/vscode/locales.js +0 -1
- package/lib/vscode/locales.js.map +1 -1
- package/lib/vscode/utils.d.ts +2 -6
- package/lib/vscode/utils.d.ts.map +1 -1
- package/lib/vscode/utils.js +0 -13
- package/lib/vscode/utils.js.map +1 -1
- package/lib/worker/index.d.ts +3 -3
- package/lib/worker/index.d.ts.map +1 -1
- package/lib/worker/index.js.map +1 -1
- package/lib/wrapper/lcconfig.d.ts +3 -1
- package/lib/wrapper/lcconfig.d.ts.map +1 -1
- package/lib/wrapper/lcmanager.d.ts.map +1 -1
- package/lib/wrapper/lcmanager.js +1 -1
- package/lib/wrapper/lcmanager.js.map +1 -1
- package/lib/wrapper/lcwrapper.d.ts +2 -2
- package/lib/wrapper/lcwrapper.d.ts.map +1 -1
- package/lib/wrapper/lcwrapper.js +9 -5
- package/lib/wrapper/lcwrapper.js.map +1 -1
- package/package.json +39 -39
- package/src/common/commonTypes.ts +1 -1
- package/src/common/index.ts +1 -1
- package/src/common/utils.ts +0 -0
- package/src/debugger/index.ts +2 -2
- package/src/editorApp/config.ts +0 -0
- package/src/editorApp/editorApp.ts +3 -2
- package/src/editorApp/index.ts +0 -0
- package/src/fs/definitions.ts +2 -2
- package/src/fs/endpoints/defaultEndpoint.ts +3 -3
- package/src/fs/index.ts +0 -0
- package/src/index.ts +0 -0
- package/src/vscode/apiWrapper.ts +17 -6
- package/src/vscode/config.ts +5 -4
- package/src/vscode/index.ts +0 -0
- package/src/vscode/locales.ts +2 -2
- package/src/vscode/utils.ts +3 -17
- package/src/vscode/viewsService.ts +0 -0
- package/src/worker/index.ts +3 -3
- package/src/wrapper/index.ts +0 -0
- package/src/wrapper/lcconfig.ts +4 -1
- package/src/wrapper/lcmanager.ts +2 -2
- package/src/wrapper/lcwrapper.ts +12 -7
- package/lib/common/logging.d.ts +0 -10
- package/lib/common/logging.d.ts.map +0 -1
- package/lib/common/logging.js +0 -18
- package/lib/common/logging.js.map +0 -1
- package/src/common/logging.ts +0 -26
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+CAA+C,CAAC;AAG7E,qBAAa,MAAM;IACf,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,YAAY,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,CAAC,EAAE,aAAa,EAGrD;CACJ;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,GAAG,SAAS,CAAC;AAEtD,MAAM,WAAW,mBAAmB;IAChC,aAAa,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACtD,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,gBAAgB,uCAY5B,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAyBlF,CAAC;AAEF,eAAO,MAAM,6BAA6B,wCAKzC,CAAC"}
|
package/lib/worker/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAGhG,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF,MAAM,OAAO,MAAM;IACf,GAAG,CAAe;IAClB,OAAO,CAAiB;IAExB,YAAY,GAAiB,EAAE,OAAuB,EAAE;QACpD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAAA,CAC1B;CACJ;AASD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAA2B,EAAE,EAAE,CAAC;IAC7D,MAAM,WAAW,GAAG,4BAA4B,EAAE,CAAC;IAEnD,WAAW,CAAC,YAAY,GAAG,CAAC,QAAgB,EAAE,KAAa,EAAE,EAAE,CAAC;QAC5D,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,2BAA2B,QAAQ,WAAW,KAAK,EAAE,CAAC,CAAC;QAC3E,OAAO,MAAM,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IAAA,CAC3D,CAAC;IAEF,WAAW,CAAC,gBAAgB,GAAG,CAAC,QAAgB,EAAE,KAAa,EAAE,EAAE,CAAC;QAChE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,+BAA+B,QAAQ,WAAW,KAAK,EAAE,CAAC,CAAC;QAC/E,OAAO,MAAM,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;IAAA,CACpD,CAAC;AAAA,CACL,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAgD,GAAG,EAAE,CAAC;IACzF,MAAM,0BAA0B,GAAG,GAAG,EAAE,CAAC,IAAI,MAAM,CAC/C,IAAI,GAAG,CAAC,oEAAoE,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EAC9F,EAAE,IAAI,EAAE,QAAQ,EAAE,CACrB,CAAC;IACF,MAAM,8BAA8B,GAAG,GAAG,EAAE,CAAC,IAAI,MAAM,CACnD,IAAI,GAAG,CAAC,2DAA2D,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EACrF,EAAE,IAAI,EAAE,QAAQ,EAAE,CACrB,CAAC;IACF,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,IAAI,MAAM,CAC1C,IAAI,GAAG,CAAC,2DAA2D,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EACrF,EAAE,IAAI,EAAE,QAAQ,EAAE,CACrB,CAAC;IAEF,OAAO;QACH,4FAA4F;QAC5F,mBAAmB,EAAE,0BAA0B;QAC/C,uBAAuB,EAAE,8BAA8B;QACvD,cAAc,EAAE,qBAAqB;QACrC,6DAA6D;QAC7D,yBAAyB,EAAE,SAAS;QACpC,uBAAuB,EAAE,SAAS;QAClC,oBAAoB,EAAE,SAAS;QAC/B,qBAAqB,EAAE,SAAS;KACnC,CAAC;AAAA,CACL,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAAgB,EAAE,EAAE,CAAC;IAC/D,gBAAgB,CAAC;QACb,aAAa,EAAE,0BAA0B,EAAE;QAC3C,MAAM;KACT,CAAC,CAAC;AAAA,CACN,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
2
2
|
import { type ConnectionConfigOptions } from 'monaco-languageclient/common';
|
|
3
|
-
import type { LanguageClientOptions, MessageTransports } from 'vscode-languageclient/browser.js';
|
|
3
|
+
import type { DynamicFeature, LanguageClientOptions, MessageTransports, StaticFeature } from 'vscode-languageclient/browser.js';
|
|
4
4
|
export interface ConnectionConfig {
|
|
5
5
|
options: ConnectionConfigOptions;
|
|
6
6
|
messageTransports?: MessageTransports;
|
|
@@ -10,6 +10,8 @@ export interface LanguageClientConfig {
|
|
|
10
10
|
connection: ConnectionConfig;
|
|
11
11
|
clientOptions: LanguageClientOptions;
|
|
12
12
|
restartOptions?: LanguageClientRestartOptions;
|
|
13
|
+
useClientWithProposedFeatures?: boolean;
|
|
14
|
+
registerFeatures?: Array<(StaticFeature | DynamicFeature<any>)>;
|
|
13
15
|
disposeWorker?: boolean;
|
|
14
16
|
logLevel?: LogLevel | number;
|
|
15
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcconfig.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcconfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"lcconfig.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcconfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEhI,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,uBAAuB,CAAC;IACjC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC;AAED,MAAM,WAAW,oBAAoB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,aAAa,EAAE,qBAAqB,CAAC;IACrC,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C,6BAA6B,CAAC,EAAE,OAAO,CAAC;IAExC,gBAAgB,CAAC,EAAE,KAAK,CAAC,CAAC,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,4BAA4B;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;CACjD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcmanager.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"lcmanager.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,qBAAqB,CAAC,CAAwB;IACtD,OAAO,CAAC,sBAAsB,CAAiD;IAE/E,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,QAEvC;IAED,mBAAmB,IAAI,OAAO,CAE7B;IAED,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAE9E;IAED,iBAAiB,CAAC,UAAU,EAAE,MAAM,0DAEnC;IAED,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEhD;IAED,SAAS,CAAC,oBAAoB,CAAC,EAAE,oBAAoB,QAUpD;IAED,UAAU,CAAC,qBAAqB,EAAE,qBAAqB,QAStD;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC,CASpC;IAED,SAAS,IAAI,OAAO,CAUnB;IAEK,OAAO,CAAC,YAAY,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC,CAanE;CACJ"}
|
package/lib/wrapper/lcmanager.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
6
|
-
import { ConsoleLogger } from 'monaco-
|
|
6
|
+
import { ConsoleLogger } from '@codingame/monaco-vscode-log-service-override';
|
|
7
7
|
import { LanguageClientWrapper } from './lcwrapper.js';
|
|
8
8
|
export class LanguageClientManager {
|
|
9
9
|
logger = new ConsoleLogger();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcmanager.js","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"lcmanager.js","sourceRoot":"","sources":["../../src/wrapper/lcmanager.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAgB,MAAM,+CAA+C,CAAC;AAE5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,MAAM,OAAO,qBAAqB;IAEtB,MAAM,GAAY,IAAI,aAAa,EAAE,CAAC;IACtC,qBAAqB,CAAyB;IAC9C,sBAAsB,GAAuC,IAAI,GAAG,EAAE,CAAC;IAE/E,WAAW,CAAC,QAA4B,EAAE;QACtC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAAA,CAClD;IAED,mBAAmB,GAAY;QAC3B,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC;IAAA,CAC/C;IAED,wBAAwB,CAAC,UAAkB,EAAqC;QAC5E,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAAA,CACtD;IAED,iBAAiB,CAAC,UAAkB,EAAE;QAClC,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAAA,CAC3E;IAED,SAAS,CAAC,UAAkB,EAAsB;QAC9C,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IAAA,CACnE;IAED,SAAS,CAAC,oBAA2C,EAAE;QACnD,IAAI,oBAAoB,KAAK,SAAS;YAAE,OAAO;QAE/C,MAAM,UAAU,GAAG,oBAAoB,CAAC,UAAU,CAAC;QACnD,IAAI,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEtD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACpB,GAAG,GAAG,IAAI,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;YACtD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QACrD,CAAC;IAAA,CACJ;IAED,UAAU,CAAC,qBAA4C,EAAE;QACrD,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QAEnD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACrB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;QACL,CAAC;IAAA,CACJ;IAED,KAAK,CAAC,KAAK,GAA2B;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC;YACrD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC;gBACnB,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAAA,CACnC;IAED,SAAS,GAAY;QACjB,YAAY;QACZ,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACzD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC;YACrD,uCAAuC;YACvC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC;gBACnB,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAAA,CACf;IAED,KAAK,CAAC,OAAO,CAAC,YAAY,GAAY,KAAK,EAA0B;QACjE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC;YACrD,IAAI,GAAG,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAC3B,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE/B,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC;QACxC,CAAC;IAAA,CACJ;CACJ"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { MessageTransports } from 'vscode-languageclient/browser.js';
|
|
2
|
-
import { type WorkerConfigOptionsDirect, type WorkerConfigOptionsParams } from 'monaco-languageclient/common';
|
|
3
1
|
import { MonacoLanguageClient } from 'monaco-languageclient';
|
|
2
|
+
import { type WorkerConfigOptionsDirect, type WorkerConfigOptionsParams } from 'monaco-languageclient/common';
|
|
3
|
+
import { MessageTransports } from 'vscode-languageclient/browser.js';
|
|
4
4
|
import type { LanguageClientConfig, LanguageClientRestartOptions } from './lcconfig.js';
|
|
5
5
|
export interface LanguageClientError {
|
|
6
6
|
message: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcwrapper.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lcwrapper.d.ts","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAA4C,MAAM,uBAAuB,CAAC;AACvG,OAAO,EAAa,KAAK,yBAAyB,EAAE,KAAK,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzH,OAAO,EAA4B,iBAAiB,EAAS,MAAM,kCAAkC,CAAC;AAGtG,OAAO,KAAK,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAExF,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;CACzB;AAED,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,cAAc,CAAC,CAAkE;IACzF,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,IAAI,CAAC,CAAc;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAsB;IAEpC,YAAY,MAAM,EAAE,oBAAoB,EAIvC;IAED,kBAAkB,IAAI,OAAO,CAE5B;IAED,iBAAiB,IAAI,oBAAoB,GAAG,SAAS,CAEpD;IAED,SAAS,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,SAAS,IAAI,OAAO,CAEnB;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAkB3B;IAED;;;;;OAKG;IACG,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAMjF;IAED,UAAgB,6BAA6B,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,iBA2B1H;IAED,UAAgB,0BAA0B,CAAC,UAAU,EAAE,yBAAyB,GAAG,yBAAyB,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,iBAmCpK;IAED,UAAgB,0BAA0B,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,iBAwEvI;IAED,SAAS,CAAC,wBAAwB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,CAAC,EAAE,4BAA4B,QA2BrH;IAED,SAAS,CAAC,aAAa,SAGtB;IAEK,OAAO,CAAC,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBzD;IAED,YAAY,aAMX;CACJ"}
|
package/lib/wrapper/lcwrapper.js
CHANGED
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
* Copyright (c) 2024 TypeFox and others.
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import {
|
|
5
|
+
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
6
|
+
import { ConsoleLogger } from '@codingame/monaco-vscode-log-service-override';
|
|
7
|
+
import { MonacoLanguageClient, MonacoLanguageClientWithProposedFeatures } from 'monaco-languageclient';
|
|
8
|
+
import { createUrl } from 'monaco-languageclient/common';
|
|
6
9
|
import { CloseAction, ErrorAction, MessageTransports, State } from 'vscode-languageclient/browser.js';
|
|
7
|
-
import {
|
|
10
|
+
import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
|
|
8
11
|
import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
9
|
-
import { MonacoLanguageClient } from 'monaco-languageclient';
|
|
10
|
-
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
11
12
|
export class LanguageClientWrapper {
|
|
12
13
|
languageClient;
|
|
13
14
|
languageClientConfig;
|
|
@@ -150,7 +151,6 @@ export class LanguageClientWrapper {
|
|
|
150
151
|
},
|
|
151
152
|
messageTransports
|
|
152
153
|
};
|
|
153
|
-
this.languageClient = new MonacoLanguageClient(mlcConfig);
|
|
154
154
|
const conOptions = this.languageClientConfig.connection.options;
|
|
155
155
|
this.initRestartConfiguration(messageTransports, this.languageClientConfig.restartOptions);
|
|
156
156
|
const isWebSocket = conOptions.$type === 'WebSocketParams' || conOptions.$type === 'WebSocketUrl' || conOptions.$type === 'WebSocketDirect';
|
|
@@ -165,6 +165,10 @@ export class LanguageClientWrapper {
|
|
|
165
165
|
}
|
|
166
166
|
});
|
|
167
167
|
try {
|
|
168
|
+
this.languageClient = this.languageClientConfig.useClientWithProposedFeatures === true ? new MonacoLanguageClientWithProposedFeatures(mlcConfig) : new MonacoLanguageClient(mlcConfig);
|
|
169
|
+
if (this.languageClientConfig.registerFeatures !== undefined) {
|
|
170
|
+
this.languageClient.registerFeatures(this.languageClientConfig.registerFeatures);
|
|
171
|
+
}
|
|
168
172
|
await this.languageClient.start();
|
|
169
173
|
if (isWebSocket && conOptions.startOptions !== undefined) {
|
|
170
174
|
const startOptions = conOptions.startOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lcwrapper.js","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"lcwrapper.js","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.6.0",
|
|
4
4
|
"description": "Monaco Language client implementation",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -93,8 +93,8 @@
|
|
|
93
93
|
"npm": ">=10.2.3"
|
|
94
94
|
},
|
|
95
95
|
"volta": {
|
|
96
|
-
"node": "
|
|
97
|
-
"npm": "
|
|
96
|
+
"node": "24.13.0",
|
|
97
|
+
"npm": "11.6.2"
|
|
98
98
|
},
|
|
99
99
|
"files": [
|
|
100
100
|
"lib",
|
|
@@ -104,47 +104,47 @@
|
|
|
104
104
|
"LICENSE"
|
|
105
105
|
],
|
|
106
106
|
"dependencies": {
|
|
107
|
-
"@codingame/monaco-vscode-api": "^
|
|
108
|
-
"@codingame/monaco-vscode-configuration-service-override": "^
|
|
109
|
-
"@codingame/monaco-vscode-editor-api": "^
|
|
110
|
-
"@codingame/monaco-vscode-editor-service-override": "^
|
|
111
|
-
"@codingame/monaco-vscode-extensions-service-override": "^
|
|
112
|
-
"@codingame/monaco-vscode-extension-api": "^
|
|
113
|
-
"@codingame/monaco-vscode-languages-service-override": "^
|
|
114
|
-
"@codingame/monaco-vscode-language-pack-cs": "^
|
|
115
|
-
"@codingame/monaco-vscode-language-pack-de": "^
|
|
116
|
-
"@codingame/monaco-vscode-language-pack-es": "^
|
|
117
|
-
"@codingame/monaco-vscode-language-pack-fr": "^
|
|
118
|
-
"@codingame/monaco-vscode-language-pack-it": "^
|
|
119
|
-
"@codingame/monaco-vscode-language-pack-ja": "^
|
|
120
|
-
"@codingame/monaco-vscode-language-pack-ko": "^
|
|
121
|
-
"@codingame/monaco-vscode-language-pack-pl": "^
|
|
122
|
-
"@codingame/monaco-vscode-language-pack-pt-br": "^
|
|
123
|
-
"@codingame/monaco-vscode-language-pack-qps-ploc": "^
|
|
124
|
-
"@codingame/monaco-vscode-language-pack-ru": "^
|
|
125
|
-
"@codingame/monaco-vscode-language-pack-tr": "^
|
|
126
|
-
"@codingame/monaco-vscode-language-pack-zh-hans": "^
|
|
127
|
-
"@codingame/monaco-vscode-language-pack-zh-hant": "^
|
|
128
|
-
"@codingame/monaco-vscode-localization-service-override": "^
|
|
129
|
-
"@codingame/monaco-vscode-log-service-override": "^
|
|
130
|
-
"@codingame/monaco-vscode-model-service-override": "^
|
|
131
|
-
"@codingame/monaco-vscode-monarch-service-override": "^
|
|
132
|
-
"@codingame/monaco-vscode-textmate-service-override": "^
|
|
133
|
-
"@codingame/monaco-vscode-theme-defaults-default-extension": "^
|
|
134
|
-
"@codingame/monaco-vscode-theme-service-override": "^
|
|
135
|
-
"@codingame/monaco-vscode-views-service-override": "^
|
|
136
|
-
"@codingame/monaco-vscode-workbench-service-override": "^
|
|
137
|
-
"vscode": "npm:@codingame/monaco-vscode-extension-api@^
|
|
107
|
+
"@codingame/monaco-vscode-api": "^25.0.0",
|
|
108
|
+
"@codingame/monaco-vscode-configuration-service-override": "^25.0.0",
|
|
109
|
+
"@codingame/monaco-vscode-editor-api": "^25.0.0",
|
|
110
|
+
"@codingame/monaco-vscode-editor-service-override": "^25.0.0",
|
|
111
|
+
"@codingame/monaco-vscode-extensions-service-override": "^25.0.0",
|
|
112
|
+
"@codingame/monaco-vscode-extension-api": "^25.0.0",
|
|
113
|
+
"@codingame/monaco-vscode-languages-service-override": "^25.0.0",
|
|
114
|
+
"@codingame/monaco-vscode-language-pack-cs": "^25.0.0",
|
|
115
|
+
"@codingame/monaco-vscode-language-pack-de": "^25.0.0",
|
|
116
|
+
"@codingame/monaco-vscode-language-pack-es": "^25.0.0",
|
|
117
|
+
"@codingame/monaco-vscode-language-pack-fr": "^25.0.0",
|
|
118
|
+
"@codingame/monaco-vscode-language-pack-it": "^25.0.0",
|
|
119
|
+
"@codingame/monaco-vscode-language-pack-ja": "^25.0.0",
|
|
120
|
+
"@codingame/monaco-vscode-language-pack-ko": "^25.0.0",
|
|
121
|
+
"@codingame/monaco-vscode-language-pack-pl": "^25.0.0",
|
|
122
|
+
"@codingame/monaco-vscode-language-pack-pt-br": "^25.0.0",
|
|
123
|
+
"@codingame/monaco-vscode-language-pack-qps-ploc": "^25.0.0",
|
|
124
|
+
"@codingame/monaco-vscode-language-pack-ru": "^25.0.0",
|
|
125
|
+
"@codingame/monaco-vscode-language-pack-tr": "^25.0.0",
|
|
126
|
+
"@codingame/monaco-vscode-language-pack-zh-hans": "^25.0.0",
|
|
127
|
+
"@codingame/monaco-vscode-language-pack-zh-hant": "^25.0.0",
|
|
128
|
+
"@codingame/monaco-vscode-localization-service-override": "^25.0.0",
|
|
129
|
+
"@codingame/monaco-vscode-log-service-override": "^25.0.0",
|
|
130
|
+
"@codingame/monaco-vscode-model-service-override": "^25.0.0",
|
|
131
|
+
"@codingame/monaco-vscode-monarch-service-override": "^25.0.0",
|
|
132
|
+
"@codingame/monaco-vscode-textmate-service-override": "^25.0.0",
|
|
133
|
+
"@codingame/monaco-vscode-theme-defaults-default-extension": "^25.0.0",
|
|
134
|
+
"@codingame/monaco-vscode-theme-service-override": "^25.0.0",
|
|
135
|
+
"@codingame/monaco-vscode-views-service-override": "^25.0.0",
|
|
136
|
+
"@codingame/monaco-vscode-workbench-service-override": "^25.0.0",
|
|
137
|
+
"vscode": "npm:@codingame/monaco-vscode-extension-api@^25.0.0",
|
|
138
138
|
"vscode-languageclient": "~9.0.1",
|
|
139
139
|
"vscode-languageserver-protocol": "~3.17.5",
|
|
140
140
|
"vscode-ws-jsonrpc": "~3.5.0"
|
|
141
141
|
},
|
|
142
142
|
"devDependencies": {
|
|
143
|
-
"@codingame/monaco-vscode-standalone-languages": "^
|
|
144
|
-
"@codingame/monaco-vscode-standalone-css-language-features": "^
|
|
145
|
-
"@codingame/monaco-vscode-standalone-html-language-features": "^
|
|
146
|
-
"@codingame/monaco-vscode-standalone-json-language-features": "^
|
|
147
|
-
"@codingame/monaco-vscode-standalone-typescript-language-features": "^
|
|
143
|
+
"@codingame/monaco-vscode-standalone-languages": "^25.0.0",
|
|
144
|
+
"@codingame/monaco-vscode-standalone-css-language-features": "^25.0.0",
|
|
145
|
+
"@codingame/monaco-vscode-standalone-html-language-features": "^25.0.0",
|
|
146
|
+
"@codingame/monaco-vscode-standalone-json-language-features": "^25.0.0",
|
|
147
|
+
"@codingame/monaco-vscode-standalone-typescript-language-features": "^25.0.0"
|
|
148
148
|
},
|
|
149
149
|
|
|
150
150
|
"scripts": {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
import { BaseLanguageClient } from 'vscode-languageclient/browser.js';
|
|
6
|
+
import type { BaseLanguageClient } from 'vscode-languageclient/browser.js';
|
|
7
7
|
|
|
8
8
|
export type ConnectionConfigOptions = WebSocketConfigOptionsDirect | WebSocketConfigOptionsParams | WebSocketConfigOptionsUrl | WorkerConfigOptionsParams | WorkerConfigOptionsDirect;
|
|
9
9
|
|
package/src/common/index.ts
CHANGED
package/src/common/utils.ts
CHANGED
|
File without changes
|
package/src/debugger/index.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
6
|
import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
|
|
7
|
-
import type {
|
|
7
|
+
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
8
8
|
import type { ExtensionConfig } from 'monaco-languageclient/vscodeApiWrapper';
|
|
9
9
|
import * as vscode from 'vscode';
|
|
10
10
|
import { Uri } from 'vscode';
|
|
@@ -81,7 +81,7 @@ export const provideDebuggerExtensionConfig = (config: ConfigParams): ExtensionC
|
|
|
81
81
|
};
|
|
82
82
|
};
|
|
83
83
|
|
|
84
|
-
export const configureDebugging = async (api: typeof vscode, config: ConfigParams, logger?:
|
|
84
|
+
export const configureDebugging = async (api: typeof vscode, config: ConfigParams, logger?: ILogger) => {
|
|
85
85
|
class WebsocketDebugAdapter implements vscode.DebugAdapter {
|
|
86
86
|
private websocket: WebSocket;
|
|
87
87
|
|
package/src/editorApp/config.ts
CHANGED
|
File without changes
|
|
@@ -7,7 +7,8 @@ import { ConfigurationTarget, IConfigurationService, LogLevel, StandaloneService
|
|
|
7
7
|
import { createModelReference, type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
|
|
8
8
|
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
9
9
|
import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
|
|
10
|
-
import {
|
|
10
|
+
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
11
|
+
import { ConsoleLogger } from '@codingame/monaco-vscode-log-service-override';
|
|
11
12
|
import { getEnhancedMonacoEnvironment } from 'monaco-languageclient/vscodeApiWrapper';
|
|
12
13
|
import * as vscode from 'vscode';
|
|
13
14
|
import type { CallbackDisposeable, CodeContent, CodeResources, DisposableModelRefs, EditorAppConfig, TextContents, TextModels } from './config.js';
|
|
@@ -25,7 +26,7 @@ export class EditorApp {
|
|
|
25
26
|
private id: string;
|
|
26
27
|
private config: EditorAppConfig;
|
|
27
28
|
|
|
28
|
-
protected logger:
|
|
29
|
+
protected logger: ILogger = new ConsoleLogger();
|
|
29
30
|
|
|
30
31
|
private editor: monaco.editor.IStandaloneCodeEditor | undefined;
|
|
31
32
|
private diffEditor: monaco.editor.IStandaloneDiffEditor | undefined;
|
package/src/editorApp/index.ts
CHANGED
|
File without changes
|
package/src/fs/definitions.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
import type {
|
|
6
|
+
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
7
7
|
|
|
8
8
|
export interface FileReadRequest {
|
|
9
9
|
resourceUri: string
|
|
@@ -103,7 +103,7 @@ export interface FileSystemEndpoint extends FileSystemCapabilities {
|
|
|
103
103
|
* Set an optional logger
|
|
104
104
|
* @param logger the logger implemenation
|
|
105
105
|
*/
|
|
106
|
-
setLogger?(logger:
|
|
106
|
+
setLogger?(logger: ILogger): void;
|
|
107
107
|
|
|
108
108
|
/**
|
|
109
109
|
* Get the type of the client
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
import type
|
|
6
|
+
import { type ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
7
7
|
import type { DirectoryListingRequest, DirectoryListingRequestResult, EndpointType, FileReadRequest, FileReadRequestResult, FileSystemEndpoint, FileUpdate, FileUpdateResult, StatsRequest, StatsRequestResult } from '../definitions.js';
|
|
8
8
|
|
|
9
9
|
export class EmptyFileSystemEndpoint implements FileSystemEndpoint {
|
|
10
10
|
|
|
11
11
|
private endpointType: EndpointType;
|
|
12
|
-
private logger?:
|
|
12
|
+
private logger?: ILogger;
|
|
13
13
|
|
|
14
14
|
constructor(endpointType: EndpointType) {
|
|
15
15
|
this.endpointType = endpointType;
|
|
@@ -21,7 +21,7 @@ export class EmptyFileSystemEndpoint implements FileSystemEndpoint {
|
|
|
21
21
|
return 'This file system performs no operations.';
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
setLogger(logger:
|
|
24
|
+
setLogger(logger: ILogger): void {
|
|
25
25
|
this.logger = logger;
|
|
26
26
|
}
|
|
27
27
|
|
package/src/fs/index.ts
CHANGED
|
File without changes
|
package/src/index.ts
CHANGED
|
File without changes
|
package/src/vscode/apiWrapper.ts
CHANGED
|
@@ -8,14 +8,14 @@ import { ExtensionHostKind, getBuiltinExtensions, registerExtension, type IExten
|
|
|
8
8
|
import { DisposableStore, setUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/monaco';
|
|
9
9
|
import getConfigurationServiceOverride, { initUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override';
|
|
10
10
|
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
11
|
-
import getLogServiceOverride from '@codingame/monaco-vscode-log-service-override';
|
|
11
|
+
import getLogServiceOverride, { ConsoleLogger, type ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
12
12
|
import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
|
|
13
|
-
import {
|
|
13
|
+
import { encodeStringOrUrlToDataUrl } from 'monaco-languageclient/common';
|
|
14
14
|
import { useWorkerFactory } from 'monaco-languageclient/workerFactory';
|
|
15
15
|
import * as vscode from 'vscode';
|
|
16
16
|
import 'vscode/localExtensionHost';
|
|
17
17
|
import type { ExtensionConfig, MonacoVscodeApiConfig, ViewsConfig } from './config.js';
|
|
18
|
-
import {
|
|
18
|
+
import { getEnhancedMonacoEnvironment, mergeServices, reportServiceLoading, useOpenEditorStub } from './utils.js';
|
|
19
19
|
|
|
20
20
|
export interface MonacoVscodeApiConfigRuntime extends MonacoVscodeApiConfig {
|
|
21
21
|
serviceOverrides: monaco.editor.IEditorOverrideServices;
|
|
@@ -30,7 +30,7 @@ export interface StartInstructions {
|
|
|
30
30
|
|
|
31
31
|
export class MonacoVscodeApiWrapper {
|
|
32
32
|
|
|
33
|
-
private logger:
|
|
33
|
+
private logger: ILogger = new ConsoleLogger();
|
|
34
34
|
private extensionRegisterResults: Map<string, | RegisterExtensionResult> = new Map();
|
|
35
35
|
private disposableStore: DisposableStore = new DisposableStore();
|
|
36
36
|
private apiConfig: MonacoVscodeApiConfigRuntime;
|
|
@@ -228,7 +228,14 @@ export class MonacoVscodeApiWrapper {
|
|
|
228
228
|
const services = await this.supplyRequiredServices();
|
|
229
229
|
|
|
230
230
|
mergeServices(services, this.apiConfig.serviceOverrides);
|
|
231
|
-
|
|
231
|
+
if (this.apiConfig.advanced?.loadExtensionServices === undefined ? true : this.apiConfig.advanced.loadExtensionServices === true) {
|
|
232
|
+
const { default: getExtensionServiceOverride } = await import('@codingame/monaco-vscode-extensions-service-override');
|
|
233
|
+
mergeServices(services, {
|
|
234
|
+
...getExtensionServiceOverride({
|
|
235
|
+
enableWorkerExtensionHost: this.apiConfig.advanced?.enableExtHostWorker === true
|
|
236
|
+
})
|
|
237
|
+
});
|
|
238
|
+
}
|
|
232
239
|
|
|
233
240
|
reportServiceLoading(services, this.logger);
|
|
234
241
|
|
|
@@ -243,7 +250,11 @@ export class MonacoVscodeApiWrapper {
|
|
|
243
250
|
}
|
|
244
251
|
|
|
245
252
|
setUnexpectedErrorHandler((e) => {
|
|
246
|
-
|
|
253
|
+
const message = 'Unexpected error';
|
|
254
|
+
if (this.logger.getLevel() >= LogLevel.Error) {
|
|
255
|
+
this.logger.error(message, e);
|
|
256
|
+
}
|
|
257
|
+
return new Error(message);
|
|
247
258
|
});
|
|
248
259
|
}
|
|
249
260
|
|
package/src/vscode/config.ts
CHANGED
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
7
|
-
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
8
6
|
import type { IWorkbenchConstructionOptions } from '@codingame/monaco-vscode-api';
|
|
7
|
+
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
9
8
|
import type { IExtensionManifest } from '@codingame/monaco-vscode-api/extensions';
|
|
10
9
|
import type { EnvironmentOverride } from '@codingame/monaco-vscode-api/workbench';
|
|
10
|
+
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
11
11
|
import type { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
|
|
12
|
-
import type {
|
|
12
|
+
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
13
13
|
|
|
14
14
|
export type OverallConfigType = 'extended' | 'classic';
|
|
15
15
|
|
|
@@ -51,8 +51,9 @@ export interface MonacoVscodeApiConfig {
|
|
|
51
51
|
userConfiguration?: UserConfiguration;
|
|
52
52
|
envOptions?: EnvironmentOverride;
|
|
53
53
|
extensions?: ExtensionConfig[];
|
|
54
|
-
monacoWorkerFactory?: (logger?:
|
|
54
|
+
monacoWorkerFactory?: (logger?: ILogger) => void;
|
|
55
55
|
advanced?: {
|
|
56
|
+
loadExtensionServices?: boolean;
|
|
56
57
|
enableExtHostWorker?: boolean;
|
|
57
58
|
loadThemes?: boolean;
|
|
58
59
|
enforceSemanticHighlighting?: boolean;
|
package/src/vscode/index.ts
CHANGED
|
File without changes
|
package/src/vscode/locales.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
6
|
import type { LocalizationOptions } from '@codingame/monaco-vscode-localization-service-override';
|
|
7
|
-
import {
|
|
7
|
+
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
8
8
|
|
|
9
9
|
export const createDefaultLocaleConfiguration = (): LocalizationOptions => {
|
|
10
10
|
return {
|
|
@@ -117,7 +117,7 @@ const localeLoader: Partial<Record<string, () => Promise<void>>> = {
|
|
|
117
117
|
|
|
118
118
|
export const locales = Object.keys(localeLoader);
|
|
119
119
|
|
|
120
|
-
export const initLocaleLoader = async (locale = new URLSearchParams(window.location.search).get('locale'), logger?:
|
|
120
|
+
export const initLocaleLoader = async (locale = new URLSearchParams(window.location.search).get('locale'), logger?: ILogger) => {
|
|
121
121
|
if (locale !== null) {
|
|
122
122
|
const loader = localeLoader[locale];
|
|
123
123
|
if (loader) {
|
package/src/vscode/utils.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
import * as monaco from '@codingame/monaco-vscode-editor-api';
|
|
7
7
|
import type { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
|
|
8
|
-
import type {
|
|
8
|
+
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
9
9
|
import type { MonacoEnvironmentEnhanced } from './config.js';
|
|
10
10
|
|
|
11
11
|
export const getEnhancedMonacoEnvironment = (): MonacoEnvironmentEnhanced => {
|
|
@@ -26,7 +26,7 @@ export const getEnhancedMonacoEnvironment = (): MonacoEnvironmentEnhanced => {
|
|
|
26
26
|
return envEnhanced;
|
|
27
27
|
};
|
|
28
28
|
|
|
29
|
-
export const reportServiceLoading = (services: monaco.editor.IEditorOverrideServices, logger?:
|
|
29
|
+
export const reportServiceLoading = (services: monaco.editor.IEditorOverrideServices, logger?: ILogger) => {
|
|
30
30
|
for (const serviceName of Object.keys(services)) {
|
|
31
31
|
logger?.debug(`Loading service: ${serviceName}`);
|
|
32
32
|
}
|
|
@@ -40,21 +40,7 @@ export const mergeServices = (overrideServices: monaco.editor.IEditorOverrideSer
|
|
|
40
40
|
}
|
|
41
41
|
};
|
|
42
42
|
|
|
43
|
-
|
|
44
|
-
* Enable ext host to run in a worker
|
|
45
|
-
*/
|
|
46
|
-
export const configureExtHostWorker = async (enableExtHostWorker: boolean, userServices: monaco.editor.IEditorOverrideServices) => {
|
|
47
|
-
if (enableExtHostWorker) {
|
|
48
|
-
const { default: getExtensionServiceOverride } = await import('@codingame/monaco-vscode-extensions-service-override');
|
|
49
|
-
mergeServices(userServices, {
|
|
50
|
-
...getExtensionServiceOverride({
|
|
51
|
-
enableWorkerExtensionHost: true
|
|
52
|
-
})
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
};
|
|
56
|
-
|
|
57
|
-
export const useOpenEditorStub: OpenEditor = async (modelRef, options, sideBySide, logger?: Logger) => {
|
|
43
|
+
export const useOpenEditorStub: OpenEditor = async (modelRef, options, sideBySide, logger?: ILogger) => {
|
|
58
44
|
logger?.info('Received open editor call with parameters: ', modelRef, options, sideBySide);
|
|
59
45
|
return undefined;
|
|
60
46
|
};
|
|
File without changes
|
package/src/worker/index.ts
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
* Licensed under the MIT License. See LICENSE in the package root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
+
import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
|
|
6
7
|
import { getEnhancedMonacoEnvironment } from 'monaco-languageclient/vscodeApiWrapper';
|
|
7
|
-
import type { Logger } from 'monaco-languageclient/common';
|
|
8
8
|
|
|
9
9
|
export class Worker {
|
|
10
10
|
url: string | URL;
|
|
@@ -20,7 +20,7 @@ export type WorkerLoader = (() => Worker) | undefined;
|
|
|
20
20
|
|
|
21
21
|
export interface WorkerFactoryConfig {
|
|
22
22
|
workerLoaders?: Partial<Record<string, WorkerLoader>>;
|
|
23
|
-
logger?:
|
|
23
|
+
logger?: ILogger;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
export const useWorkerFactory = (config: WorkerFactoryConfig) => {
|
|
@@ -64,7 +64,7 @@ export const defineDefaultWorkerLoaders: () => Partial<Record<string, WorkerLoad
|
|
|
64
64
|
};
|
|
65
65
|
};
|
|
66
66
|
|
|
67
|
-
export const configureDefaultWorkerFactory = (logger?:
|
|
67
|
+
export const configureDefaultWorkerFactory = (logger?: ILogger) => {
|
|
68
68
|
useWorkerFactory({
|
|
69
69
|
workerLoaders: defineDefaultWorkerLoaders(),
|
|
70
70
|
logger
|
package/src/wrapper/index.ts
CHANGED
|
File without changes
|
package/src/wrapper/lcconfig.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
import { LogLevel } from '@codingame/monaco-vscode-api';
|
|
7
7
|
import { type ConnectionConfigOptions } from 'monaco-languageclient/common';
|
|
8
|
-
import type { LanguageClientOptions, MessageTransports } from 'vscode-languageclient/browser.js';
|
|
8
|
+
import type { DynamicFeature, LanguageClientOptions, MessageTransports, StaticFeature } from 'vscode-languageclient/browser.js';
|
|
9
9
|
|
|
10
10
|
export interface ConnectionConfig {
|
|
11
11
|
options: ConnectionConfigOptions;
|
|
@@ -17,6 +17,9 @@ export interface LanguageClientConfig {
|
|
|
17
17
|
connection: ConnectionConfig;
|
|
18
18
|
clientOptions: LanguageClientOptions;
|
|
19
19
|
restartOptions?: LanguageClientRestartOptions;
|
|
20
|
+
useClientWithProposedFeatures?: boolean;
|
|
21
|
+
// oxlint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22
|
+
registerFeatures?: Array<(StaticFeature | DynamicFeature<any>)>;
|
|
20
23
|
disposeWorker?: boolean;
|
|
21
24
|
logLevel?: LogLevel | number;
|
|
22
25
|
}
|