Skip to content

Commit 3c54514

Browse files
authored
fix(vscode): bring upstream VSCode fixes in (#4648)
Refs CodinGame/monaco-vscode-api#268 Refs CodinGame/monaco-vscode-api#267
1 parent bacd968 commit 3c54514

File tree

4 files changed

+83
-19
lines changed

4 files changed

+83
-19
lines changed

package-lock.json

Lines changed: 68 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"short-unique-id": "^4.4.4",
105105
"styled-components": "^6.1.1",
106106
"swagger-ui-react": "^5.10.3",
107-
"vscode": "npm:@codingame/monaco-vscode-api@=1.83.5",
107+
"vscode": "npm:@codingame/monaco-vscode-api@=1.83.15",
108108
"vscode-languageclient": "^9.0.1",
109109
"vscode-languageserver-textdocument": "^1.0.11"
110110
},

src/plugins/editor-monaco/after-load.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { initialize as initializeMonacoServices } from 'vscode/services';
2-
import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
2+
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
3+
import { registerServiceInitializeParticipant } from 'vscode/lifecycle';
4+
import 'vscode/localExtensionHost';
35

46
import lazyMonacoContribution from './monaco-contribution/index.js';
57

@@ -33,7 +35,12 @@ function afterLoad(system) {
3335

3436
(async () => {
3537
try {
36-
await Promise.all([initializeMonacoServices({}), initializeVscodeExtensions()]);
38+
/**
39+
* {@link https://github.com/CodinGame/monaco-vscode-api/issues/283}
40+
* @TODO([email protected]): this can go away with next release of vscode >1.83.15
41+
*/
42+
registerServiceInitializeParticipant((accessor) => accessor.get(IExtensionService));
43+
await initializeMonacoServices({});
3744
system.monacoInitializationDeferred().resolve();
3845
} catch (error) {
3946
system.monacoInitializationDeferred().reject(error);
@@ -42,7 +49,7 @@ function afterLoad(system) {
4249
}
4350
})();
4451

45-
lazyMonacoContribution();
52+
lazyMonacoContribution({ system });
4653
}
4754
}
4855

src/plugins/editor-monaco/monaco-contribution/index.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
import * as monaco from 'monaco-editor';
22
import { StandaloneServices, IStorageService } from 'vscode/services';
3-
/**
4-
* This is quick fix for displaying command palette.
5-
*
6-
* {@link https://github.com/CodinGame/monaco-vscode-api/issues/267}
7-
* @TODO([email protected]): this can be removed with next VSCode API release.
8-
*/
9-
import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
103

114
import goToSymbolActionDescriptor from './actions/go-to-symbol.js';
125

13-
const lazyMonacoContribution = () => {
6+
const lazyMonacoContribution = ({ system }) => {
147
const disposables = [];
158

16-
StandaloneServices.get(IStorageService).store('expandSuggestionDocs', true, 0, 0);
9+
system.monacoInitializationDeferred().promise.then(() => {
10+
StandaloneServices.get(IStorageService).store('expandSuggestionDocs', true, 0, 0);
11+
});
1712

1813
// setup custom actions
1914
disposables.push(

0 commit comments

Comments
 (0)