Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: initialize editor features after participants have been run #233

Merged
merged 1 commit into from
Nov 9, 2023
Merged

fix: initialize editor features after participants have been run #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions scripts/vscode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,19 @@ index 23d547570e9..31dfb4fd8d4 100644

export * from 'vs/editor/editor.api';
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index 01f2c6987ac..5d6abf9d561 100644
index 01f2c6987ac..fcd285d22b5 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -517,10 +517,14 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {
@@ -89,8 +89,6 @@ import { DefaultConfiguration } from 'vs/platform/configuration/common/configura
import { WorkspaceEdit } from 'vs/editor/common/languages';
import { AudioCue, IAudioCueService, Sound } from 'vs/platform/audioCues/browser/audioCueService';
import { LogService } from 'vs/platform/log/common/logService';
-import { getEditorFeatures } from 'vs/editor/common/editorFeatures';
-import { onUnexpectedError } from 'vs/base/common/errors';
import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from 'vs/platform/environment/common/environment';

class SimpleModel implements IResolvedTextEditorModel {
@@ -517,10 +515,14 @@ export class StandaloneKeybindingService extends AbstractKeybindingService {
this._onDidUpdateKeybindings.fire();
}

Expand All @@ -338,6 +347,23 @@ index 01f2c6987ac..5d6abf9d561 100644
this._cachedResolver = new KeybindingResolver(defaults, overrides, (str) => this._log(str));
}
return this._cachedResolver;
@@ -1155,16 +1157,6 @@ export module StandaloneServices {
}
}

- // Instantiate all editor features
- const editorFeatures = getEditorFeatures();
- for (const feature of editorFeatures) {
- try {
- instantiationService.createInstance(feature);
- } catch (err) {
- onUnexpectedError(err);
- }
- }
-
onDidInitialize.fire();

return instantiationService;
diff --git a/src/vs/nls.ts b/src/vs/nls.ts
index db57b98d67b..defd683e0b0 100644
--- a/src/vs/nls.ts
Expand Down
1 change: 1 addition & 0 deletions src/monaco.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import 'vs/workbench/contrib/folding/browser/folding.contribution'
import 'vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty'
import 'vs/workbench/contrib/codeActions/browser/codeActions.contribution'
import 'vs/workbench/contrib/list/browser/list.contribution'
import 'vs/workbench/contrib/codeEditor/browser/editorFeatures'

class ExtensionPoints implements IWorkbenchContribution {
constructor (
Expand Down