Skip to content

Commit

Permalink
fix(vscode): bring upstream VSCode fixes in (#4648)
Browse files Browse the repository at this point in the history
  • Loading branch information
char0n authored Dec 6, 2023
1 parent bacd968 commit 3c54514
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 19 deletions.
74 changes: 68 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"short-unique-id": "^4.4.4",
"styled-components": "^6.1.1",
"swagger-ui-react": "^5.10.3",
"vscode": "npm:@codingame/monaco-vscode-api@=1.83.5",
"vscode": "npm:@codingame/monaco-vscode-api@=1.83.15",
"vscode-languageclient": "^9.0.1",
"vscode-languageserver-textdocument": "^1.0.11"
},
Expand Down
13 changes: 10 additions & 3 deletions src/plugins/editor-monaco/after-load.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { initialize as initializeMonacoServices } from 'vscode/services';
import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
import { registerServiceInitializeParticipant } from 'vscode/lifecycle';
import 'vscode/localExtensionHost';

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

Expand Down Expand Up @@ -33,7 +35,12 @@ function afterLoad(system) {

(async () => {
try {
await Promise.all([initializeMonacoServices({}), initializeVscodeExtensions()]);
/**
* {@link https://github.com/CodinGame/monaco-vscode-api/issues/283}
* @TODO([email protected]): this can go away with next release of vscode >1.83.15
*/
registerServiceInitializeParticipant((accessor) => accessor.get(IExtensionService));
await initializeMonacoServices({});
system.monacoInitializationDeferred().resolve();
} catch (error) {
system.monacoInitializationDeferred().reject(error);
Expand All @@ -42,7 +49,7 @@ function afterLoad(system) {
}
})();

lazyMonacoContribution();
lazyMonacoContribution({ system });
}
}

Expand Down
13 changes: 4 additions & 9 deletions src/plugins/editor-monaco/monaco-contribution/index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
import * as monaco from 'monaco-editor';
import { StandaloneServices, IStorageService } from 'vscode/services';
/**
* This is quick fix for displaying command palette.
*
* {@link https://github.com/CodinGame/monaco-vscode-api/issues/267}
* @TODO([email protected]): this can be removed with next VSCode API release.
*/
import 'vscode/vscode/vs/workbench/browser/workbench.contribution';

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

const lazyMonacoContribution = () => {
const lazyMonacoContribution = ({ system }) => {
const disposables = [];

StandaloneServices.get(IStorageService).store('expandSuggestionDocs', true, 0, 0);
system.monacoInitializationDeferred().promise.then(() => {
StandaloneServices.get(IStorageService).store('expandSuggestionDocs', true, 0, 0);
});

// setup custom actions
disposables.push(
Expand Down

0 comments on commit 3c54514

Please sign in to comment.