monaco-languageclient-examples 6.5.0-next.2 → 6.5.1
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/dist/common.d.ts +2 -1
- package/dist/common.d.ts.map +1 -1
- package/dist/common.js +4 -4
- package/dist/common.js.map +1 -1
- package/dist/langium/statemachineClient.d.ts.map +1 -1
- package/dist/langium/statemachineClient.js +3 -3
- package/dist/langium/statemachineClient.js.map +1 -1
- package/dist/python/client/main.d.ts +0 -1
- package/dist/python/client/main.d.ts.map +1 -1
- package/dist/python/client/main.js +6 -3
- package/dist/python/client/main.js.map +1 -1
- package/package.json +13 -14
- package/src/common.ts +5 -4
- package/src/langium/statemachineClient.ts +3 -4
- package/src/python/client/main.ts +7 -3
package/dist/common.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { editor
|
|
1
|
+
import { editor } from 'monaco-editor';
|
|
2
2
|
import { IReference, ITextFileEditorModel } from 'vscode/monaco';
|
|
3
3
|
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
4
4
|
import '@codingame/monaco-vscode-json-default-extension';
|
|
5
5
|
import { MonacoLanguageClient } from 'monaco-languageclient';
|
|
6
6
|
import { MessageTransports } from 'vscode-languageclient';
|
|
7
|
+
import { Uri } from 'vscode';
|
|
7
8
|
export declare const createLanguageClient: (transports: MessageTransports) => MonacoLanguageClient;
|
|
8
9
|
export declare const createUrl: (hostname: string, port: number, path: string, searchParams?: Record<string, any>, secure?: boolean) => string;
|
|
9
10
|
export declare const createWebSocketAndStartClient: (url: string) => WebSocket;
|
package/dist/common.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAa,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAa,MAAM,eAAe,CAAC;AAClD,OAAO,EAAgD,UAAU,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC/G,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAKzD,OAAO,EAAgB,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAA4B,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,eAAO,MAAM,oBAAoB,eAAgB,iBAAiB,KAAG,oBAmBpE,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,MAAM,QAAQ,MAAM,QAAQ,MAAM,iBAAgB,OAAO,MAAM,EAAE,GAAG,CAAC,WAAe,OAAO,KAAoC,MAclK,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAS,MAAM,KAAG,SAc3D,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAO,MAK3C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,qBAAqB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC9C,CAAA;AAED,eAAO,MAAM,WAAW,kBAAyB,OAAO,kBAoBvD,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAkB;IAC3C,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAA;CAClB,+BAsBA,CAAC"}
|
package/dist/common.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import { languages
|
|
5
|
+
import { languages } from 'monaco-editor';
|
|
6
6
|
import { createConfiguredEditor, createModelReference } from 'vscode/monaco';
|
|
7
7
|
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
8
8
|
import '@codingame/monaco-vscode-json-default-extension';
|
|
@@ -13,7 +13,7 @@ import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-servic
|
|
|
13
13
|
import { initServices, MonacoLanguageClient } from 'monaco-languageclient';
|
|
14
14
|
import { CloseAction, ErrorAction } from 'vscode-languageclient';
|
|
15
15
|
import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
|
|
16
|
-
import {
|
|
16
|
+
import { Uri } from 'vscode';
|
|
17
17
|
export const createLanguageClient = (transports) => {
|
|
18
18
|
return new MonacoLanguageClient({
|
|
19
19
|
name: 'Sample Language Client',
|
|
@@ -74,8 +74,8 @@ export const performInit = async (vscodeApiInit) => {
|
|
|
74
74
|
userServices: {
|
|
75
75
|
...getThemeServiceOverride(),
|
|
76
76
|
...getTextmateServiceOverride(),
|
|
77
|
-
...getConfigurationServiceOverride(
|
|
78
|
-
...getKeybindingsServiceOverride()
|
|
77
|
+
...getConfigurationServiceOverride(Uri.file('/workspace')),
|
|
78
|
+
...getKeybindingsServiceOverride()
|
|
79
79
|
},
|
|
80
80
|
debugLogging: true
|
|
81
81
|
});
|
package/dist/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAU,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statemachineClient.d.ts","sourceRoot":"","sources":["../../src/langium/statemachineClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"statemachineClient.d.ts","sourceRoot":"","sources":["../../src/langium/statemachineClient.ts"],"names":[],"mappings":"AAiBA,OAAO,2DAA2D,CAAC;AAQnE,eAAO,MAAM,uBAAuB,qBAmGnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,qBAMnC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import { editor
|
|
5
|
+
import { editor } from 'monaco-editor';
|
|
6
6
|
import { MonacoLanguageClient, initServices, useOpenEditorStub } from 'monaco-languageclient';
|
|
7
7
|
import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
|
|
8
8
|
import { CloseAction, ErrorAction } from 'vscode-languageclient';
|
|
@@ -15,7 +15,7 @@ import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-over
|
|
|
15
15
|
import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
|
|
16
16
|
import { LogLevel } from 'vscode/services';
|
|
17
17
|
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
18
|
-
import {
|
|
18
|
+
import { Uri } from 'vscode';
|
|
19
19
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
20
20
|
buildWorkerDefinition('../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
|
21
21
|
const languageId = 'statemachine';
|
|
@@ -25,7 +25,7 @@ export const setupStatemachineClient = async () => {
|
|
|
25
25
|
userServices: {
|
|
26
26
|
...getThemeServiceOverride(),
|
|
27
27
|
...getTextmateServiceOverride(),
|
|
28
|
-
...getConfigurationServiceOverride(
|
|
28
|
+
...getConfigurationServiceOverride(Uri.file('/workspace')),
|
|
29
29
|
...getEditorServiceOverride(useOpenEditorStub),
|
|
30
30
|
...getKeybindingsServiceOverride()
|
|
31
31
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statemachineClient.js","sourceRoot":"","sources":["../../src/langium/statemachineClient.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"statemachineClient.js","sourceRoot":"","sources":["../../src/langium/statemachineClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAQA,OAAO,mDAAmD,CAAC;AAmE3D,eAAO,MAAM,iBAAiB,qBAkG7B,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import * as monaco from 'monaco-editor';
|
|
6
6
|
import * as vscode from 'vscode';
|
|
7
|
-
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
7
|
+
import { whenReady } from '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
8
8
|
import '@codingame/monaco-vscode-python-default-extension';
|
|
9
9
|
import { LogLevel } from 'vscode/services';
|
|
10
10
|
import { createConfiguredEditor, createModelReference } from 'vscode/monaco';
|
|
@@ -17,7 +17,7 @@ import { initServices, MonacoLanguageClient } from 'monaco-languageclient';
|
|
|
17
17
|
import { CloseAction, ErrorAction } from 'vscode-languageclient';
|
|
18
18
|
import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
|
|
19
19
|
import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from 'vscode/service-override/files';
|
|
20
|
-
import {
|
|
20
|
+
import { Uri } from 'vscode';
|
|
21
21
|
import { createUrl } from '../../common.js';
|
|
22
22
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
23
23
|
buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
|
@@ -73,12 +73,15 @@ export const startPythonClient = async () => {
|
|
|
73
73
|
userServices: {
|
|
74
74
|
...getThemeServiceOverride(),
|
|
75
75
|
...getTextmateServiceOverride(),
|
|
76
|
-
...getConfigurationServiceOverride(
|
|
76
|
+
...getConfigurationServiceOverride(Uri.file('/workspace')),
|
|
77
77
|
...getKeybindingsServiceOverride()
|
|
78
78
|
},
|
|
79
79
|
debugLogging: true,
|
|
80
80
|
logLevel: LogLevel.Debug
|
|
81
81
|
});
|
|
82
|
+
console.log('Before ready themes');
|
|
83
|
+
await whenReady();
|
|
84
|
+
console.log('After ready themes');
|
|
82
85
|
// extension configuration derived from:
|
|
83
86
|
// https://github.com/microsoft/pyright/blob/main/packages/vscode-pyright/package.json
|
|
84
87
|
// only a minimum is required to get pyright working
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,2DAA2D,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient-examples",
|
|
3
|
-
"version": "6.5.
|
|
3
|
+
"version": "6.5.1",
|
|
4
4
|
"description": "Monaco Language client examples",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -43,21 +43,20 @@
|
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@codingame/monaco-vscode-configuration-service-override": "1.82.
|
|
47
|
-
"@codingame/monaco-vscode-editor-service-override": "1.82.
|
|
48
|
-
"@codingame/monaco-vscode-json-default-extension": "1.82.
|
|
49
|
-
"@codingame/monaco-vscode-keybindings-service-override": "1.82.
|
|
50
|
-
"@codingame/monaco-vscode-python-default-extension": "1.82.
|
|
51
|
-
"@codingame/monaco-vscode-textmate-service-override": "1.82.
|
|
52
|
-
"@codingame/monaco-vscode-theme-defaults-default-extension": "1.82.
|
|
53
|
-
"@codingame/monaco-vscode-theme-service-override": "1.82.
|
|
54
|
-
"@codingame/monaco-vscode-views-service-override": "1.82.2",
|
|
46
|
+
"@codingame/monaco-vscode-configuration-service-override": "~1.82.3",
|
|
47
|
+
"@codingame/monaco-vscode-editor-service-override": "~1.82.3",
|
|
48
|
+
"@codingame/monaco-vscode-json-default-extension": "~1.82.3",
|
|
49
|
+
"@codingame/monaco-vscode-keybindings-service-override": "~1.82.3",
|
|
50
|
+
"@codingame/monaco-vscode-python-default-extension": "~1.82.3",
|
|
51
|
+
"@codingame/monaco-vscode-textmate-service-override": "~1.82.3",
|
|
52
|
+
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.82.3",
|
|
53
|
+
"@codingame/monaco-vscode-theme-service-override": "~1.82.3",
|
|
55
54
|
"express": "~4.18.2",
|
|
56
55
|
"langium": "~2.0.2",
|
|
57
56
|
"langium-statemachine-dsl": "~2.0.0",
|
|
58
57
|
"monaco-editor-workers": "~0.43.0",
|
|
59
|
-
"monaco-languageclient": "6.5.
|
|
60
|
-
"pyright": "~1.1.
|
|
58
|
+
"monaco-languageclient": "~6.5.1",
|
|
59
|
+
"pyright": "~1.1.330",
|
|
61
60
|
"react": "~18.2.0",
|
|
62
61
|
"react-dom": "~18.2.0",
|
|
63
62
|
"request-light": "~0.7.0",
|
|
@@ -69,8 +68,8 @@
|
|
|
69
68
|
"devDependencies": {
|
|
70
69
|
"@types/ws": "~8.5.6",
|
|
71
70
|
"@types/express": "~4.17.18",
|
|
72
|
-
"@types/react": "~18.2.
|
|
73
|
-
"@types/react-dom": "~18.2.
|
|
71
|
+
"@types/react": "~18.2.24",
|
|
72
|
+
"@types/react-dom": "~18.2.9",
|
|
74
73
|
"ts-node": "~10.9.1",
|
|
75
74
|
"vscode-languageserver-types": "~3.17.3"
|
|
76
75
|
},
|
package/src/common.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
import { editor, languages
|
|
6
|
+
import { editor, languages } from 'monaco-editor';
|
|
7
7
|
import { createConfiguredEditor, createModelReference, IReference, ITextFileEditorModel } from 'vscode/monaco';
|
|
8
8
|
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
9
9
|
import '@codingame/monaco-vscode-json-default-extension';
|
|
@@ -14,7 +14,7 @@ import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-servic
|
|
|
14
14
|
import { initServices, MonacoLanguageClient } from 'monaco-languageclient';
|
|
15
15
|
import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient';
|
|
16
16
|
import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
|
|
17
|
-
import {
|
|
17
|
+
import { Uri } from 'vscode';
|
|
18
18
|
|
|
19
19
|
export const createLanguageClient = (transports: MessageTransports): MonacoLanguageClient => {
|
|
20
20
|
return new MonacoLanguageClient({
|
|
@@ -36,6 +36,7 @@ export const createLanguageClient = (transports: MessageTransports): MonacoLangu
|
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
38
|
};
|
|
39
|
+
|
|
39
40
|
export const createUrl = (hostname: string, port: number, path: string, searchParams: Record<string, any> = {}, secure: boolean = location.protocol === 'https:'): string => {
|
|
40
41
|
const protocol = secure ? 'wss' : 'ws';
|
|
41
42
|
const url = new URL(`${protocol}://${hostname}:${port}${path}`);
|
|
@@ -88,8 +89,8 @@ export const performInit = async (vscodeApiInit: boolean) => {
|
|
|
88
89
|
userServices: {
|
|
89
90
|
...getThemeServiceOverride(),
|
|
90
91
|
...getTextmateServiceOverride(),
|
|
91
|
-
...getConfigurationServiceOverride(
|
|
92
|
-
...getKeybindingsServiceOverride()
|
|
92
|
+
...getConfigurationServiceOverride(Uri.file('/workspace')),
|
|
93
|
+
...getKeybindingsServiceOverride()
|
|
93
94
|
},
|
|
94
95
|
debugLogging: true
|
|
95
96
|
});
|
|
@@ -3,8 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
import { editor
|
|
7
|
-
|
|
6
|
+
import { editor } from 'monaco-editor';
|
|
8
7
|
import { MonacoLanguageClient, initServices, useOpenEditorStub } from 'monaco-languageclient';
|
|
9
8
|
import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
|
|
10
9
|
import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient';
|
|
@@ -17,7 +16,7 @@ import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-over
|
|
|
17
16
|
import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
|
|
18
17
|
import { LogLevel } from 'vscode/services';
|
|
19
18
|
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
20
|
-
import {
|
|
19
|
+
import { Uri } from 'vscode';
|
|
21
20
|
|
|
22
21
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
23
22
|
buildWorkerDefinition('../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
|
@@ -30,7 +29,7 @@ export const setupStatemachineClient = async () => {
|
|
|
30
29
|
userServices: {
|
|
31
30
|
...getThemeServiceOverride(),
|
|
32
31
|
...getTextmateServiceOverride(),
|
|
33
|
-
...getConfigurationServiceOverride(
|
|
32
|
+
...getConfigurationServiceOverride(Uri.file('/workspace')),
|
|
34
33
|
...getEditorServiceOverride(useOpenEditorStub),
|
|
35
34
|
...getKeybindingsServiceOverride()
|
|
36
35
|
},
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
import * as monaco from 'monaco-editor';
|
|
7
7
|
import * as vscode from 'vscode';
|
|
8
|
-
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
8
|
+
import { whenReady } from '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
9
9
|
import '@codingame/monaco-vscode-python-default-extension';
|
|
10
10
|
import { LogLevel } from 'vscode/services';
|
|
11
11
|
import { createConfiguredEditor, createModelReference } from 'vscode/monaco';
|
|
@@ -18,7 +18,7 @@ import { initServices, MonacoLanguageClient } from 'monaco-languageclient';
|
|
|
18
18
|
import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient';
|
|
19
19
|
import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
|
|
20
20
|
import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from 'vscode/service-override/files';
|
|
21
|
-
import {
|
|
21
|
+
import { Uri } from 'vscode';
|
|
22
22
|
import { createUrl } from '../../common.js';
|
|
23
23
|
|
|
24
24
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
@@ -79,13 +79,17 @@ export const startPythonClient = async () => {
|
|
|
79
79
|
userServices: {
|
|
80
80
|
...getThemeServiceOverride(),
|
|
81
81
|
...getTextmateServiceOverride(),
|
|
82
|
-
...getConfigurationServiceOverride(
|
|
82
|
+
...getConfigurationServiceOverride(Uri.file('/workspace')),
|
|
83
83
|
...getKeybindingsServiceOverride()
|
|
84
84
|
},
|
|
85
85
|
debugLogging: true,
|
|
86
86
|
logLevel: LogLevel.Debug
|
|
87
87
|
});
|
|
88
88
|
|
|
89
|
+
console.log('Before ready themes');
|
|
90
|
+
await whenReady();
|
|
91
|
+
console.log('After ready themes');
|
|
92
|
+
|
|
89
93
|
// extension configuration derived from:
|
|
90
94
|
// https://github.com/microsoft/pyright/blob/main/packages/vscode-pyright/package.json
|
|
91
95
|
// only a minimum is required to get pyright working
|