Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-21 03:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce and adopt @editorBrowserContribution

Browse Source
This commit is contained in:
Alex Dima
2016-09-01 15:13:14 +02:00
parent d4979dbd32
commit ac263d2129
25 changed files with 55 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/browser/editorBrowserExtensions.ts
+8 -5
View File
@@ -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);
src/vs/editor/contrib/accessibility/browser/accessibility.ts
+2 -3
View File
@@ -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({
src/vs/editor/contrib/codelens/browser/codelens.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/find/browser/find.ts
+3 -5
View File
@@ -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);
src/vs/editor/contrib/find/common/findController.ts
+2 -1
View File
@@ -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';
src/vs/editor/contrib/folding/browser/folding.ts
+2 -3
View File
@@ -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),
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/gotoError/browser/gotoError.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/hover/browser/hover.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/links/browser/links.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/multicursor/browser/menuPreventer.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
+2 -3
View File
@@ -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,
src/vs/editor/contrib/quickFix/browser/quickFix.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts
+2 -3
View File
@@ -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);
src/vs/editor/contrib/referenceSearch/browser/referencesController.ts
+2 -4
View File
@@ -19,7 +19,7 @@ import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
import {IStorageService} from 'vs/platform/storage/common/storage';
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 {IPeekViewService} from 'vs/editor/contrib/zoneWidget/browser/peekViewWidget';
import {ReferencesModel, OneReference} from './referencesModel';
import {ReferenceWidget, LayoutData} from './referencesWidget';
@@ -32,6 +32,7 @@ export interface RequestOptions {
onGoto?: (reference: OneReference) => TPromise<any>;
}
@editorBrowserContribution
export class ReferencesController implements editorCommon.IEditorContribution {
private static ID = 'editor.contrib.referencesController';
@@ -238,6 +239,3 @@ export class ReferencesController implements editorCommon.IEditorContribution {
}
}
}
EditorBrowserRegistry.registerEditorContribution(ReferencesController);
src/vs/editor/contrib/rename/browser/rename.ts
+2 -3
View File
@@ -16,7 +16,7 @@ import {RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr} from 'vs
import {IMessageService} from 'vs/platform/message/common/message';
import {IProgressService} from 'vs/platform/progress/common/progress';
import {editorAction, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
import {IRange, ICommonCodeEditor, EditorContextKeys, ModeContextKeys, IEditorContribution} from 'vs/editor/common/editorCommon';
import {BulkEdit, createBulkEdit} from 'vs/editor/common/services/bulkEdit';
import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
@@ -27,6 +27,7 @@ import RenameInputField from './renameInputField';
const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false);
@editorBrowserContribution
class RenameController implements IEditorContribution {
private static ID = 'editor.contrib.renameController';
@@ -170,8 +171,6 @@ export class RenameAction extends EditorAction {
}
}
EditorBrowserRegistry.registerEditorContribution(RenameController);
const RenameCommand = EditorCommand.bindToContribution<RenameController>(RenameController.get);
CommonEditorRegistry.registerEditorCommand(new RenameCommand({
src/vs/editor/contrib/selectionClipboard/electron-browser/selectionClipboard.ts
+2 -3
View File
@@ -10,11 +10,12 @@ import * as platform from 'vs/base/common/platform';
import {ICodeEditor, IEditorMouseEvent} from 'vs/editor/browser/editorBrowser';
import {Disposable} from 'vs/base/common/lifecycle';
import {EndOfLinePreference, IEditorContribution, ICursorSelectionChangedEvent, IConfigurationChangedEvent} from 'vs/editor/common/editorCommon';
import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
import {IContextKeyService} from 'vs/platform/contextkey/common/contextkey';
import {RunOnceScheduler} from 'vs/base/common/async';
import {Range} from 'vs/editor/common/core/range';
@editorBrowserContribution
class SelectionClipboard extends Disposable implements IEditorContribution {
private static ID = 'editor.contrib.selectionClipboard';
@@ -98,5 +99,3 @@ class SelectionClipboard extends Disposable implements IEditorContribution {
super.dispose();
}
}
EditorBrowserRegistry.registerEditorContribution(SelectionClipboard);
src/vs/editor/contrib/suggest/browser/suggestController.ts
+2 -3
View File
@@ -15,7 +15,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
import { ICommonCodeEditor, IEditorContribution, EditorContextKeys, ModeContextKeys } 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 { EditOperation } from 'vs/editor/common/core/editOperation';
import { CodeSnippet } from 'vs/editor/contrib/snippet/common/snippet';
import { SnippetController } from 'vs/editor/contrib/snippet/common/snippetController';
@@ -24,6 +24,7 @@ import { SuggestModel } from '../common/suggestModel';
import { ICompletionItem } from '../common/completionModel';
import { SuggestWidget } from './suggestWidget';
@editorBrowserContribution
export class SuggestController implements IEditorContribution {
private static ID: string = 'editor.contrib.suggestController';
@@ -281,5 +282,3 @@ CommonEditorRegistry.registerEditorCommand(new SuggestCommand({
mac: { primary: KeyMod.WinCtrl | KeyCode.Space }
}
}));
EditorBrowserRegistry.registerEditorContribution(SuggestController);
src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
+1 -4
View File
@@ -8,7 +8,6 @@ import 'vs/css!../browser/media/debugHover';
import nls = require('vs/nls');
import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
import {TPromise} from 'vs/base/common/winjs.base';
import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import platform = require('vs/platform/platform');
import {registerSingleton} from 'vs/platform/instantiation/common/extensions';
@@ -27,7 +26,7 @@ import {StepOverAction, ClearReplAction, FocusReplAction, StepIntoAction, StepOu
ConfigureAction, ToggleReplAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction} from 'vs/workbench/parts/debug/browser/debugActions';
import debugwidget = require('vs/workbench/parts/debug/browser/debugActionsWidget');
import service = require('vs/workbench/parts/debug/electron-browser/debugService');
import {DebugEditorContribution} from 'vs/workbench/parts/debug/electron-browser/debugEditorContribution';
import 'vs/workbench/parts/debug/electron-browser/debugEditorContribution';
import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletService';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
@@ -47,8 +46,6 @@ class OpenDebugViewletAction extends viewlet.ToggleViewletAction {
}
}
EditorBrowserRegistry.registerEditorContribution(DebugEditorContribution);
// register viewlet
(<viewlet.ViewletRegistry>platform.Registry.as(viewlet.Extensions.Viewlets)).registerViewlet(new viewlet.ViewletDescriptor(
'vs/workbench/parts/debug/browser/debugViewlet',
src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
+2
View File
@@ -13,6 +13,7 @@ import {IAction, Action} from 'vs/base/common/actions';
import {KeyCode} from 'vs/base/common/keyCodes';
import keyboard = require('vs/base/browser/keyboardEvent');
import editorbrowser = require('vs/editor/browser/editorBrowser');
import {editorBrowserContribution} from 'vs/editor/browser/editorBrowserExtensions';
import editorcommon = require('vs/editor/common/editorCommon');
import {DebugHoverWidget} from 'vs/workbench/parts/debug/electron-browser/debugHover';
import debugactions = require('vs/workbench/parts/debug/browser/debugActions');
@@ -24,6 +25,7 @@ import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService';
const HOVER_DELAY = 300;
@editorBrowserContribution
export class DebugEditorContribution implements debug.IDebugEditorContribution {
private toDispose: lifecycle.IDisposable[];
src/vs/workbench/parts/git/browser/gitEditorContributions.ts
+2
View File
@@ -5,6 +5,7 @@
'use strict';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { editorBrowserContribution } from 'vs/editor/browser/editorBrowserExtensions';
import { IModel, IModelDeltaDecoration, IModelDecorationOptions, OverviewRulerLane, IEditorContribution, TrackedRangeStickiness } from 'vs/editor/common/editorCommon';
import { IGitService, ModelEvents, StatusType } from 'vs/workbench/parts/git/common/git';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -70,6 +71,7 @@ class MergeDecoratorBoundToModel extends Disposable {
}
}
@editorBrowserContribution
export class MergeDecorator extends Disposable implements IEditorContribution {
static ID = 'vs.git.editor.merge.decorator';
src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts
+1 -5
View File
@@ -24,11 +24,10 @@ import wbar = require('vs/workbench/common/actionRegistry');
import gitoutput = require('vs/workbench/parts/git/browser/gitOutput');
import output = require('vs/workbench/parts/output/common/output');
import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
import confregistry = require('vs/platform/configuration/common/configurationRegistry');
import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
import quickopen = require('vs/workbench/browser/quickopen');
import editorcontrib = require('vs/workbench/parts/git/browser/gitEditorContributions');
import 'vs/workbench/parts/git/browser/gitEditorContributions';
import {IActivityService, ProgressBadge, NumberBadge} from 'vs/workbench/services/activity/common/activityService';
import {IEventService} from 'vs/platform/event/common/event';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
@@ -498,9 +497,6 @@ export function registerContributions(): void {
nls.localize('view', "View")
);
// Register MergeDecorator
EditorBrowserRegistry.registerEditorContribution(editorcontrib.MergeDecorator);
// Register StatusUpdater
(<ext.IWorkbenchContributionsRegistry>platform.Registry.as(ext.Extensions.Workbench)).registerWorkbenchContribution(
StatusUpdater