Introduce and adopt @editorBrowserContribution

alexdima · alexdima · commit ac263d212901 · 2016-09-01T15:13:14.000+02:00
diff --git a/src/vs/editor/browser/editorBrowserExtensions.ts b/src/vs/editor/browser/editorBrowserExtensions.ts
@@ -9,13 +9,14 @@ import {Registry} from 'vs/platform/platform';
 import {IEditorContribution} from 'vs/editor/common/editorCommon';
 import {ICodeEditor, IEditorContributionDescriptor, ISimpleEditorContributionCtor} from 'vs/editor/browser/editorBrowser';
 
+export function editorBrowserContribution(ctor:ISimpleEditorContributionCtor): void {
+	EditorContributionRegistry.INSTANCE.registerEditorBrowserContribution(ctor);
+}
+
 export namespace EditorBrowserRegistry {
 	// --- Editor Contributions
-	export function registerEditorContribution(ctor:ISimpleEditorContributionCtor): void {
-		(<EditorContributionRegistry>Registry.as(Extensions.EditorContributions)).registerEditorBrowserContribution(ctor);
-	}
 	export function getEditorContributions(): IEditorContributionDescriptor[] {
-		return (<EditorContributionRegistry>Registry.as(Extensions.EditorContributions)).getEditorBrowserContributions();
+		return EditorContributionRegistry.INSTANCE.getEditorBrowserContributions();
 	}
 }
 
@@ -39,6 +40,8 @@ var Extensions = {
 
 class EditorContributionRegistry {
 
+	public static INSTANCE = new EditorContributionRegistry();
+
 	private editorContributions: IEditorContributionDescriptor[];
 
 	constructor() {
@@ -54,4 +57,4 @@ class EditorContributionRegistry {
 	}
 }
 
-Registry.add(Extensions.EditorContributions, new EditorContributionRegistry());
+Registry.add(Extensions.EditorContributions, EditorContributionRegistry.INSTANCE);
diff --git a/src/vs/editor/contrib/accessibility/browser/accessibility.ts b/src/vs/editor/contrib/accessibility/browser/accessibility.ts
@@ -22,12 +22,13 @@ import {GlobalScreenReaderNVDA} from 'vs/editor/common/config/commonEditorConfig
 import {ICommonCodeEditor, IEditorContribution, EditorContextKeys} from 'vs/editor/common/editorCommon';
 import {editorAction, CommonEditorRegistry, EditorAction, EditorCommand, Command} from 'vs/editor/common/editorCommonExtensions';
 import {ICodeEditor, IOverlayWidget, IOverlayWidgetPosition} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {ToggleTabFocusModeAction} from 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode';
 
 const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);
 const TOGGLE_EXPERIMENTAL_SCREEN_READER_SUPPORT_COMMAND_ID = 'toggleExperimentalScreenReaderSupport';
 
+@editorBrowserContribution
 class AccessibilityHelpController extends Disposable implements IEditorContribution {
 
 	private static ID = 'editor.contrib.accessibilityHelpController';
@@ -216,8 +217,6 @@ class ShowAccessibilityHelpAction extends EditorAction {
 	}
 }
 
-EditorBrowserRegistry.registerEditorContribution(AccessibilityHelpController);
-
 const AccessibilityHelpCommand = EditorCommand.bindToContribution<AccessibilityHelpController>(AccessibilityHelpController.get);
 
 CommonEditorRegistry.registerEditorCommand(new AccessibilityHelpCommand({
diff --git a/src/vs/editor/contrib/codelens/browser/codelens.ts b/src/vs/editor/contrib/codelens/browser/codelens.ts
@@ -20,7 +20,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import {CodeLensProviderRegistry, ICodeLensSymbol, Command} from 'vs/editor/common/modes';
 import {IModelService} from 'vs/editor/common/services/modelService';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {ICodeLensData, getCodeLensData} from '../common/codelens';
 
 
@@ -339,6 +339,7 @@ class CodeLens {
 	}
 }
 
+@editorBrowserContribution
 export class CodeLensContribution implements editorCommon.IEditorContribution {
 
 	private static ID: string = 'css.editor.codeLens';
@@ -626,5 +627,3 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 		});
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(CodeLensContribution);
diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
@@ -19,13 +19,14 @@ import {IMenuService, IMenu, MenuId} from 'vs/platform/actions/common/actions';
 import {ICommonCodeEditor, IEditorContribution, MouseTargetType, EditorContextKeys, IScrollEvent} from 'vs/editor/common/editorCommon';
 import {editorAction, ServicesAccessor, EditorAction} from 'vs/editor/common/editorCommonExtensions';
 import {ICodeEditor, IEditorMouseEvent} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 
 interface IPosition {
 	x: number;
 	y: number;
 }
 
+@editorBrowserContribution
 class ContextMenuController implements IEditorContribution {
 
 	private static ID = 'editor.contrib.contextmenu';
@@ -241,5 +242,3 @@ class ShowContextMenu extends EditorAction {
 		contribution.showContextMenu();
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(ContextMenuController);
diff --git a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts
@@ -22,7 +22,7 @@ import {Range} from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import {editorAction, ServicesAccessor, EditorAction} from 'vs/editor/common/editorCommonExtensions';
 import {ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {CodeSnippet} from 'vs/editor/contrib/snippet/common/snippet';
 import {SnippetController} from 'vs/editor/contrib/snippet/common/snippetController';
 import {SmartSnippetInserter} from 'vs/editor/contrib/defineKeybinding/common/smartSnippetInserter';
@@ -36,6 +36,7 @@ const NLS_KB_LAYOUT_ERROR_MESSAGE = nls.localize('defineKeybinding.kbLayoutError
 
 const INTERESTING_FILE = /keybindings\.json$/;
 
+@editorBrowserContribution
 export class DefineKeybindingController implements editorCommon.IEditorContribution {
 
 	private static ID = 'editor.contrib.defineKeybinding';
@@ -486,5 +487,3 @@ function isInterestingEditorModel(editor:editorCommon.ICommonCodeEditor): boolea
 	let url = model.uri.toString();
 	return INTERESTING_FILE.test(url);
 }
-
-EditorBrowserRegistry.registerEditorContribution(DefineKeybindingController);
diff --git a/src/vs/editor/contrib/find/browser/find.ts b/src/vs/editor/contrib/find/browser/find.ts
@@ -8,10 +8,11 @@ import {IContextViewService} from 'vs/platform/contextview/browser/contextView';
 import {IKeybindingService} from 'vs/platform/keybinding/common/keybinding';
 import {IContextKeyService} from 'vs/platform/contextkey/common/contextkey';
 import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {FindWidget, IFindController} from 'vs/editor/contrib/find/browser/findWidget';
-import {CommonFindController, FindStartFocusAction, IFindStartOptions, SelectionHighlighter} from 'vs/editor/contrib/find/common/findController';
+import {CommonFindController, FindStartFocusAction, IFindStartOptions} from 'vs/editor/contrib/find/common/findController';
 
+@editorBrowserContribution
 class FindController extends CommonFindController implements IFindController {
 
 	private _widget: FindWidget;
@@ -37,6 +38,3 @@ class FindController extends CommonFindController implements IFindController {
 		}
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(FindController);
-EditorBrowserRegistry.registerEditorContribution(SelectionHighlighter);
diff --git a/src/vs/editor/contrib/find/common/findController.ts b/src/vs/editor/contrib/find/common/findController.ts
@@ -12,7 +12,7 @@ import {Range} from 'vs/editor/common/core/range';
 import {Selection} from 'vs/editor/common/core/selection';
 import * as strings from 'vs/base/common/strings';
 import * as editorCommon from 'vs/editor/common/editorCommon';
-import {editorAction, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
+import {editorAction, commonEditorContribution, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 import {FIND_IDS, FindModelBoundToEditorModel} from 'vs/editor/contrib/find/common/findModel';
 import {FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState} from 'vs/editor/contrib/find/common/findState';
 import {DocumentHighlightProviderRegistry} from 'vs/editor/common/modes';
@@ -694,6 +694,7 @@ export class CompatChangeAll extends AbstractSelectHighlightsAction {
 	}
 }
 
+@commonEditorContribution
 export class SelectionHighlighter extends Disposable implements editorCommon.IEditorContribution {
 	private static ID = 'editor.contrib.selectionHighlighter';
 
diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -16,13 +16,14 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import {Range} from 'vs/editor/common/core/range';
 import {editorAction, ServicesAccessor, EditorAction, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 import {ICodeEditor, IEditorMouseEvent} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {CollapsibleRegion, getCollapsibleRegionsToFoldAtLine, getCollapsibleRegionsToUnfoldAtLine, doesLineBelongsToCollapsibleRegion, IFoldingRange} from 'vs/editor/contrib/folding/common/foldingModel';
 import {computeRanges, limitByIndent} from 'vs/editor/contrib/folding/common/indentFoldStrategy';
 import {Selection} from 'vs/editor/common/core/selection';
 
 import EditorContextKeys = editorCommon.EditorContextKeys;
 
+@editorBrowserContribution
 export class FoldingController implements editorCommon.IEditorContribution {
 
 	private static ID = 'editor.contrib.folding';
@@ -706,8 +707,6 @@ class FoldLevelAction extends FoldingAction<void> {
 	}
 }
 
-EditorBrowserRegistry.registerEditorContribution(FoldingController);
-
 CommonEditorRegistry.registerEditorAction(
 	new FoldLevelAction({
 		id: FoldLevelAction.ID(1),
diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
@@ -24,7 +24,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import {editorAction, IActionOptions, ServicesAccessor, EditorAction} from 'vs/editor/common/editorCommonExtensions';
 import {Location, DefinitionProviderRegistry} from 'vs/editor/common/modes';
 import {ICodeEditor, IEditorMouseEvent, IMouseTarget} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {getDeclarationsAtPosition} from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration';
 import {ReferencesController} from 'vs/editor/contrib/referenceSearch/browser/referencesController';
 import {ReferencesModel} from 'vs/editor/contrib/referenceSearch/browser/referencesModel';
@@ -211,6 +211,7 @@ export class PeekDefinitionAction extends DefinitionAction {
 
 // --- Editor Contribution to goto definition using the mouse and a modifier key
 
+@editorBrowserContribution
 class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorContribution {
 
 	private static ID = 'editor.contrib.gotodefinitionwithmouse';
@@ -487,5 +488,3 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 		this.toUnhook = dispose(this.toUnhook);
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(GotoDefinitionWithMouseEditorContribution);
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
@@ -25,7 +25,7 @@ import {Range} from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import {editorAction, ServicesAccessor, IActionOptions, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {ZoneWidget} from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
 import {getCodeActions, IQuickFix2} from 'vs/editor/contrib/quickFix/common/quickFix';
 
@@ -446,6 +446,7 @@ class MarkerNavigationAction extends EditorAction {
 	}
 }
 
+@editorBrowserContribution
 class MarkerController implements editorCommon.IEditorContribution {
 
 	private static ID = 'editor.contrib.markerController';
@@ -572,5 +573,3 @@ CommonEditorRegistry.registerEditorCommand(new MarkerCommand({
 		secondary: [KeyMod.Shift | KeyCode.Escape]
 	}
 }));
-
-EditorBrowserRegistry.registerEditorContribution(MarkerController);
diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts
@@ -16,13 +16,14 @@ import {Range} from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import {editorAction, ServicesAccessor, EditorAction} from 'vs/editor/common/editorCommonExtensions';
 import {ICodeEditor, IEditorMouseEvent} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {ModesContentHoverWidget} from './modesContentHover';
 import {ModesGlyphHoverWidget} from './modesGlyphHover';
 import {IDisposable, dispose} from 'vs/base/common/lifecycle';
 
 import EditorContextKeys = editorCommon.EditorContextKeys;
 
+@editorBrowserContribution
 class ModesHoverController implements editorCommon.IEditorContribution {
 
 	private static ID = 'editor.contrib.hover';
@@ -165,5 +166,3 @@ class ShowHoverAction extends EditorAction {
 		ModesHoverController.get(editor).showContentHover(range, true);
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(ModesHoverController);
diff --git a/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts b/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts
@@ -11,8 +11,9 @@ import * as browser from 'vs/base/browser/browser';
 import * as dom from 'vs/base/browser/dom';
 import {IEditorContribution} from 'vs/editor/common/editorCommon';
 import {ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 
+@editorBrowserContribution
 export class IPadShowKeyboard implements IEditorContribution {
 
 	private static ID = 'editor.contrib.iPadShowKeyboard';
@@ -105,5 +106,3 @@ class ShowKeyboardWidget implements IOverlayWidget {
 		};
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(IPadShowKeyboard);
diff --git a/src/vs/editor/contrib/links/browser/links.ts b/src/vs/editor/contrib/links/browser/links.ts
@@ -22,7 +22,7 @@ import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerServic
 import {IEditorMouseEvent, ICodeEditor} from 'vs/editor/browser/editorBrowser';
 import {getLinks, Link} from 'vs/editor/contrib/links/common/links';
 import {IDisposable, dispose} from 'vs/base/common/lifecycle';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 
 class LinkOccurence {
 
@@ -71,6 +71,7 @@ class LinkOccurence {
 	}
 }
 
+@editorBrowserContribution
 class LinkDetector implements editorCommon.IEditorContribution {
 
 	private static ID: string = 'editor.linkDetector';
@@ -336,5 +337,3 @@ class OpenLinkAction extends EditorAction {
 		}
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(LinkDetector);
diff --git a/src/vs/editor/contrib/multicursor/browser/menuPreventer.ts b/src/vs/editor/contrib/multicursor/browser/menuPreventer.ts
@@ -8,11 +8,12 @@ import {KeyMod} from 'vs/base/common/keyCodes';
 import {Disposable} from 'vs/base/common/lifecycle';
 import {IEditorContribution} from 'vs/editor/common/editorCommon';
 import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 
 /**
  * Prevents the top-level menu from showing up when doing Alt + Click in the editor
  */
+@editorBrowserContribution
 export class MenuPreventer extends Disposable implements IEditorContribution {
 
 	private static ID = 'editor.contrib.menuPreventer';
@@ -61,5 +62,3 @@ export class MenuPreventer extends Disposable implements IEditorContribution {
 		return MenuPreventer.ID;
 	}
 }
-
-EditorBrowserRegistry.registerEditorContribution(MenuPreventer);
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
@@ -12,10 +12,11 @@ import { ICommonCodeEditor, IEditorContribution, EditorContextKeys, ModeContextK
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { editorAction, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorBrowserRegistry } from 'vs/editor/browser/editorBrowserExtensions';
+import { editorBrowserContribution } from 'vs/editor/browser/editorBrowserExtensions';
 import { ParameterHintsWidget } from './parameterHintsWidget';
 import { Context } from '../common/parameterHints';
 
+@editorBrowserContribution
 class ParameterHintsController implements IEditorContribution {
 
 	private static ID = 'editor.controller.parameterHints';
@@ -82,8 +83,6 @@ const weight = CommonEditorRegistry.commandWeight(75);
 
 const ParameterHintsCommand = EditorCommand.bindToContribution<ParameterHintsController>(ParameterHintsController.get);
 
-EditorBrowserRegistry.registerEditorContribution(ParameterHintsController);
-
 CommonEditorRegistry.registerEditorCommand(new ParameterHintsCommand({
 	id: 'closeParameterHints',
 	precondition: Context.Visible,
diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.ts b/src/vs/editor/contrib/quickFix/browser/quickFix.ts
@@ -16,11 +16,12 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
 import {ICommonCodeEditor, EditorContextKeys, ModeContextKeys, IEditorContribution, IRange} from 'vs/editor/common/editorCommon';
 import {editorAction, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
 import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {IQuickFix2} from '../common/quickFix';
 import {QuickFixModel} from './quickFixModel';
 import {QuickFixSelectionWidget} from './quickFixSelectionWidget';
 
+@editorBrowserContribution
 export class QuickFixController implements IEditorContribution {
 
 	private static ID = 'editor.contrib.quickFixController';
@@ -204,5 +205,3 @@ CommonEditorRegistry.registerEditorCommand(new QuickFixCommand({
 		primary: KeyCode.PageUp
 	}
 }));
-
-EditorBrowserRegistry.registerEditorContribution(QuickFixController);
diff --git a/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts b/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts
@@ -8,7 +8,7 @@ import {QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import {IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
 import {QuickOpenEditorWidget} from './quickOpenEditorWidget';
 import {Selection} from 'vs/editor/common/core/selection';
 import {IActionOptions, EditorAction} from 'vs/editor/common/editorCommonExtensions';
@@ -19,6 +19,7 @@ export interface IQuickOpenControllerOpts {
 	getAutoFocus(searchValue:string):IAutoFocus;
 }
 
+@editorBrowserContribution
 export class QuickOpenController implements editorCommon.IEditorContribution {
 
 	private static ID = 'editor.controller.quickOpenController';
@@ -164,5 +165,3 @@ export interface IDecorator {
 	decorateLine(range:editorCommon.IRange, editor:editorCommon.IEditor):void;
 	clearDecorations():void;
 }
-
-EditorBrowserRegistry.registerEditorContribution(QuickOpenController);
diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesController.ts b/src/vs/editor/contrib/referenceSearch/browser/referencesController.ts
diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts
diff --git a/src/vs/editor/contrib/selectionClipboard/electron-browser/selectionClipboard.ts b/src/vs/editor/contrib/selectionClipboard/electron-browser/selectionClipboard.ts
diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
diff --git a/src/vs/workbench/parts/git/browser/gitEditorContributions.ts b/src/vs/workbench/parts/git/browser/gitEditorContributions.ts
diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';`
`20`	`20`	`import {CodeLensProviderRegistry, ICodeLensSymbol, Command} from 'vs/editor/common/modes';`
`21`	`21`	`import {IModelService} from 'vs/editor/common/services/modelService';`
`22`	`22`	`import * as editorBrowser from 'vs/editor/browser/editorBrowser';`
`23`		`-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';`
	`23`	`+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';`
`24`	`24`	`import {ICodeLensData, getCodeLensData} from '../common/codelens';`
`25`	`25`
`26`	`26`
`@@ -339,6 +339,7 @@ class CodeLens {`
`339`	`339`	`}`
`340`	`340`	`}`
`341`	`341`
	`342`	`+@editorBrowserContribution`
`342`	`343`	`export class CodeLensContribution implements editorCommon.IEditorContribution {`
`343`	`344`
`344`	`345`	`private static ID: string = 'css.editor.codeLens';`
`@@ -626,5 +627,3 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {`
`626`	`627`	`});`
`627`	`628`	`}`
`628`	`629`	`}`
`629`		`-`
`630`		`-EditorBrowserRegistry.registerEditorContribution(CodeLensContribution);`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,14 @@ import {IMenuService, IMenu, MenuId} from 'vs/platform/actions/common/actions';`
`19`	`19`	`import {ICommonCodeEditor, IEditorContribution, MouseTargetType, EditorContextKeys, IScrollEvent} from 'vs/editor/common/editorCommon';`
`20`	`20`	`import {editorAction, ServicesAccessor, EditorAction} from 'vs/editor/common/editorCommonExtensions';`
`21`	`21`	`import {ICodeEditor, IEditorMouseEvent} from 'vs/editor/browser/editorBrowser';`
`22`		`-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';`
	`22`	`+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';`
`23`	`23`
`24`	`24`	`interface IPosition {`
`25`	`25`	`x: number;`
`26`	`26`	`y: number;`
`27`	`27`	`}`
`28`	`28`
	`29`	`+@editorBrowserContribution`
`29`	`30`	`class ContextMenuController implements IEditorContribution {`
`30`	`31`
`31`	`32`	`private static ID = 'editor.contrib.contextmenu';`
`@@ -241,5 +242,3 @@ class ShowContextMenu extends EditorAction {`
`241`	`242`	`contribution.showContextMenu();`
`242`	`243`	`}`
`243`	`244`	`}`
`244`		`-`
`245`		`-EditorBrowserRegistry.registerEditorContribution(ContextMenuController);`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,11 @@ import {IContextViewService} from 'vs/platform/contextview/browser/contextView';`
`8`	`8`	`import {IKeybindingService} from 'vs/platform/keybinding/common/keybinding';`
`9`	`9`	`import {IContextKeyService} from 'vs/platform/contextkey/common/contextkey';`
`10`	`10`	`import {ICodeEditor} from 'vs/editor/browser/editorBrowser';`
`11`		`-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';`
	`11`	`+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';`
`12`	`12`	`import {FindWidget, IFindController} from 'vs/editor/contrib/find/browser/findWidget';`
`13`		`-import {CommonFindController, FindStartFocusAction, IFindStartOptions, SelectionHighlighter} from 'vs/editor/contrib/find/common/findController';`
	`13`	`+import {CommonFindController, FindStartFocusAction, IFindStartOptions} from 'vs/editor/contrib/find/common/findController';`
`14`	`14`
	`15`	`+@editorBrowserContribution`
`15`	`16`	`class FindController extends CommonFindController implements IFindController {`
`16`	`17`
`17`	`18`	`private _widget: FindWidget;`
`@@ -37,6 +38,3 @@ class FindController extends CommonFindController implements IFindController {`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`	`}`
`40`		`-`
`41`		`-EditorBrowserRegistry.registerEditorContribution(FindController);`
`42`		`-EditorBrowserRegistry.registerEditorContribution(SelectionHighlighter);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import {Range} from 'vs/editor/common/core/range';`
`12`	`12`	`import {Selection} from 'vs/editor/common/core/selection';`
`13`	`13`	`import * as strings from 'vs/base/common/strings';`
`14`	`14`	`import * as editorCommon from 'vs/editor/common/editorCommon';`
`15`		`-import {editorAction, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';`
	`15`	`+import {editorAction, commonEditorContribution, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';`
`16`	`16`	`import {FIND_IDS, FindModelBoundToEditorModel} from 'vs/editor/contrib/find/common/findModel';`
`17`	`17`	`import {FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState} from 'vs/editor/contrib/find/common/findState';`
`18`	`18`	`import {DocumentHighlightProviderRegistry} from 'vs/editor/common/modes';`
`@@ -694,6 +694,7 @@ export class CompatChangeAll extends AbstractSelectHighlightsAction {`
`694`	`694`	`}`
`695`	`695`	`}`
`696`	`696`
	`697`	`+@commonEditorContribution`
`697`	`698`	`export class SelectionHighlighter extends Disposable implements editorCommon.IEditorContribution {`
`698`	`699`	`private static ID = 'editor.contrib.selectionHighlighter';`
`699`	`700`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import {Range} from 'vs/editor/common/core/range';`
`25`	`25`	`import * as editorCommon from 'vs/editor/common/editorCommon';`
`26`	`26`	`import {editorAction, ServicesAccessor, IActionOptions, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';`
`27`	`27`	`import {ICodeEditor} from 'vs/editor/browser/editorBrowser';`
`28`		`-import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';`
	`28`	`+import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';`
`29`	`29`	`import {ZoneWidget} from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';`
`30`	`30`	`import {getCodeActions, IQuickFix2} from 'vs/editor/contrib/quickFix/common/quickFix';`
`31`	`31`
`@@ -446,6 +446,7 @@ class MarkerNavigationAction extends EditorAction {`
`446`	`446`	`}`
`447`	`447`	`}`
`448`	`448`
	`449`	`+@editorBrowserContribution`
`449`	`450`	`class MarkerController implements editorCommon.IEditorContribution {`
`450`	`451`
`451`	`452`	`private static ID = 'editor.contrib.markerController';`
`@@ -572,5 +573,3 @@ CommonEditorRegistry.registerEditorCommand(new MarkerCommand({`
`572`	`573`	`secondary: [KeyMod.Shift \| KeyCode.Escape]`
`573`	`574`	`}`
`574`	`575`	`}));`
`575`		`-`
`576`		`-EditorBrowserRegistry.registerEditorContribution(MarkerController);`