Skip to content

Commit 14cd314

Browse files
authored
Always require passing in explicit instantiation for editor contribution (microsoft#167458)
Always require passing in explicit instantiation for editor contributions
1 parent 068357d commit 14cd314

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/vs/editor/browser/editorExtensions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ export function registerInstantiatedEditorAction(editorAction: EditorAction): vo
515515
EditorContributionRegistry.INSTANCE.registerEditorAction(editorAction);
516516
}
517517

518-
export function registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation = EditorContributionInstantiation.Eager): void {
518+
export function registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation: EditorContributionInstantiation): void {
519519
EditorContributionRegistry.INSTANCE.registerEditorContribution(id, ctor, instantiation);
520520
}
521521

@@ -567,7 +567,7 @@ class EditorContributionRegistry {
567567
this.editorCommands = Object.create(null);
568568
}
569569

570-
public registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation = EditorContributionInstantiation.Eager): void {
570+
public registerEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: ICodeEditor, ...services: Services): IEditorContribution }, instantiation: EditorContributionInstantiation): void {
571571
this.editorContributions.push({ id, ctor: ctor as IEditorContributionCtor, instantiation });
572572
}
573573

src/vs/editor/contrib/inlineCompletions/browser/ghostText.contribution.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { KeyCode } from 'vs/base/common/keyCodes';
7-
import { EditorCommand, registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
7+
import { EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
88
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
99
import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
1010
import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/consts';
@@ -13,7 +13,7 @@ import { InlineCompletionsHoverParticipant } from 'vs/editor/contrib/inlineCompl
1313
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
1414
import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
1515

16-
registerEditorContribution(GhostTextController.ID, GhostTextController);
16+
registerEditorContribution(GhostTextController.ID, GhostTextController, EditorContributionInstantiation.Eager);
1717
registerEditorAction(TriggerInlineSuggestionAction);
1818
registerEditorAction(ShowNextInlineSuggestionAction);
1919
registerEditorAction(ShowPreviousInlineSuggestionAction);

src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import 'vs/css!./standaloneQuickInput';
77
import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
8-
import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
8+
import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
99
import { IEditorContribution } from 'vs/editor/common/editorCommon';
1010
import { IThemeService } from 'vs/platform/theme/common/themeService';
1111
import { IQuickInputService, IQuickInputButton, IQuickPickItem, IQuickPick, IInputBox, IQuickNavigateConfiguration, IPickOptions, QuickPickInput, IInputOptions } from 'vs/platform/quickinput/common/quickInput';
@@ -184,4 +184,4 @@ export class QuickInputEditorWidget implements IOverlayWidget {
184184
}
185185
}
186186

187-
registerEditorContribution(QuickInputEditorContribution.ID, QuickInputEditorContribution);
187+
registerEditorContribution(QuickInputEditorContribution.ID, QuickInputEditorContribution, EditorContributionInstantiation.Eager);

src/vs/workbench/contrib/debug/browser/debug.contribution.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { isMacintosh, isWeb } from 'vs/base/common/platform';
99
import { URI } from 'vs/base/common/uri';
1010
import 'vs/css!./media/debug.contribution';
1111
import 'vs/css!./media/debugHover';
12-
import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
12+
import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
1313
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
1414
import * as nls from 'vs/nls';
1515
import { ICommandActionTitle, Icon } from 'vs/platform/action/common/action';
@@ -90,9 +90,9 @@ Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQui
9090
helpEntries: [{ description: nls.localize('tasksQuickAccessHelp', "Show All Debug Consoles"), commandId: SELECT_DEBUG_CONSOLE_ID }]
9191
});
9292

93-
registerEditorContribution('editor.contrib.callStack', LazyCallStackEditorContribution);
94-
registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, LazyBreakpointEditorContribution);
95-
registerEditorContribution(EDITOR_CONTRIBUTION_ID, LazyDebugEditorContribution);
93+
registerEditorContribution('editor.contrib.callStack', LazyCallStackEditorContribution, EditorContributionInstantiation.Eager);
94+
registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, LazyBreakpointEditorContribution, EditorContributionInstantiation.Eager);
95+
registerEditorContribution(EDITOR_CONTRIBUTION_ID, LazyDebugEditorContribution, EditorContributionInstantiation.Eager);
9696

9797
const registerDebugCommandPaletteItem = (id: string, title: ICommandActionTitle, when?: ContextKeyExpression, precondition?: ContextKeyExpression) => {
9898
MenuRegistry.appendMenuItem(MenuId.CommandPalette, {

0 commit comments

Comments
 (0)