diff --git a/src/vs/editor/common/editorAction.ts b/src/vs/editor/common/editorAction.ts index 13c80bef73a..f3e87dccc4f 100644 --- a/src/vs/editor/common/editorAction.ts +++ b/src/vs/editor/common/editorAction.ts @@ -7,7 +7,6 @@ import {Action} from 'vs/base/common/actions'; import * as strings from 'vs/base/common/strings'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {Behaviour, IEnablementState, createActionEnablement} from 'vs/editor/common/editorActionEnablement'; import {IActionDescriptor, IActionEnablement, ICommonCodeEditor, IEditorActionDescriptorData, IEditorContribution} from 'vs/editor/common/editorCommon'; import {ILineContext} from 'vs/editor/common/modes'; @@ -151,7 +150,7 @@ export class DynamicEditorAction extends EditorAction { private _tokensAtPosition:string[]; private _wordAtPosition:boolean; - constructor(descriptor:IActionDescriptor, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IActionDescriptor, editor:ICommonCodeEditor) { var enablement: IActionEnablement = descriptor.enablement || {}; super({ id: descriptor.id, diff --git a/src/vs/editor/contrib/accessibility/browser/accessibility.ts b/src/vs/editor/contrib/accessibility/browser/accessibility.ts index ffe817613c4..166a049527f 100644 --- a/src/vs/editor/contrib/accessibility/browser/accessibility.ts +++ b/src/vs/editor/contrib/accessibility/browser/accessibility.ts @@ -15,7 +15,6 @@ import {clearNode} from 'vs/base/browser/dom'; import {renderHtml} from 'vs/base/browser/htmlContentRenderer'; import {StyleMutator} from 'vs/base/browser/styleMutator'; import {Widget} from 'vs/base/browser/ui/widget'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry'; @@ -43,7 +42,7 @@ class AccessibilityHelpController extends Disposable implements IEditorContribut private _editor: ICodeEditor; private _widget: AccessibilityHelpWidget; - constructor(editor:ICodeEditor, @IKeybindingService keybindingService: IKeybindingService, @INullService ns) { + constructor(editor:ICodeEditor, @IKeybindingService keybindingService: IKeybindingService) { super(); this._editor = editor; @@ -212,7 +211,7 @@ class AccessibilityHelpWidget extends Widget implements IOverlayWidget { class ShowAccessibilityHelpAction extends EditorAction { - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus); } diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts index 21769db0e49..ab7b996b17f 100644 --- a/src/vs/editor/contrib/clipboard/browser/clipboard.ts +++ b/src/vs/editor/contrib/clipboard/browser/clipboard.ts @@ -12,7 +12,6 @@ import {cAll} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; import * as browser from 'vs/base/browser/browser'; import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindings} from 'vs/platform/keybinding/common/keybindingService'; import {findFocusedEditor} from 'vs/editor/common/config/config'; import {EditorAction} from 'vs/editor/common/editorAction'; @@ -24,7 +23,7 @@ class ClipboardWritingAction extends EditorAction { private toUnhook:Function[]; - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, condition:Behaviour, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, condition:Behaviour) { super(descriptor, editor, condition); this.toUnhook = []; this.toUnhook.push(this.editor.addListener(editorCommon.EventType.CursorSelectionChanged, (e:editorCommon.ICursorSelectionChangedEvent) => { @@ -62,8 +61,8 @@ function editorCursorIsInEditableRange(editor:editorCommon.ICommonCodeEditor): b class ExecCommandCutAction extends ClipboardWritingAction { - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { - super(descriptor, editor, Behaviour.Writeable | Behaviour.WidgetFocus | Behaviour.ShowInContextMenu | Behaviour.UpdateOnCursorPositionChange, ns); + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { + super(descriptor, editor, Behaviour.Writeable | Behaviour.WidgetFocus | Behaviour.ShowInContextMenu | Behaviour.UpdateOnCursorPositionChange); } public getGroupId(): string { @@ -83,8 +82,8 @@ class ExecCommandCutAction extends ClipboardWritingAction { class ExecCommandCopyAction extends ClipboardWritingAction { - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { - super(descriptor, editor, Behaviour.WidgetFocus | Behaviour.ShowInContextMenu, ns); + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { + super(descriptor, editor, Behaviour.WidgetFocus | Behaviour.ShowInContextMenu); } public getGroupId(): string { @@ -100,7 +99,7 @@ class ExecCommandCopyAction extends ClipboardWritingAction { class ExecCommandPasteAction extends EditorAction { - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.Writeable | Behaviour.WidgetFocus | Behaviour.ShowInContextMenu | Behaviour.UpdateOnCursorPositionChange); } diff --git a/src/vs/editor/contrib/color/browser/color.ts b/src/vs/editor/contrib/color/browser/color.ts index 767c3b8dbd4..11684f4932d 100644 --- a/src/vs/editor/contrib/color/browser/color.ts +++ b/src/vs/editor/contrib/color/browser/color.ts @@ -12,7 +12,6 @@ import {IDisposable, cAll, disposeAll} from 'vs/base/common/lifecycle'; import * as strings from 'vs/base/common/strings'; import {TPromise} from 'vs/base/common/winjs.base'; import * as dom from 'vs/base/browser/dom'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import * as editorCommon from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; @@ -82,7 +81,7 @@ export class ColorContribution implements editorCommon.IEditorContribution { private _style:HTMLStyleElement; - constructor(editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(editor:editorCommon.ICommonCodeEditor) { this._instanceCount = (++ColorContribution.INSTANCE_COUNT); this._editor = editor; this._callOnDispose = []; diff --git a/src/vs/editor/contrib/comment/common/comment.ts b/src/vs/editor/contrib/comment/common/comment.ts index 802f8a0226c..daefa0315a4 100644 --- a/src/vs/editor/contrib/comment/common/comment.ts +++ b/src/vs/editor/contrib/comment/common/comment.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EditorAction} from 'vs/editor/common/editorAction'; import {ICommand, ICommonCodeEditor, IEditorActionDescriptorData} from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; @@ -20,7 +19,7 @@ class CommentLineAction extends EditorAction { private _type: Type; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, type: Type, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, type: Type) { super(descriptor, editor); this._type = type; } @@ -45,8 +44,8 @@ class ToggleCommentLineAction extends CommentLineAction { static ID = 'editor.action.commentLine'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { - super(descriptor, editor, Type.Toggle, ns); + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { + super(descriptor, editor, Type.Toggle); } } @@ -54,8 +53,8 @@ class AddLineCommentAction extends CommentLineAction { static ID = 'editor.action.addCommentLine'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { - super(descriptor, editor, Type.ForceAdd, ns); + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { + super(descriptor, editor, Type.ForceAdd); } } @@ -64,8 +63,8 @@ class RemoveLineCommentAction extends CommentLineAction { static ID = 'editor.action.removeCommentLine'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { - super(descriptor, editor, Type.ForceRemove, ns); + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { + super(descriptor, editor, Type.ForceRemove); } } @@ -74,7 +73,7 @@ class BlockCommentAction extends EditorAction { static ID = 'editor.action.blockComment'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor); } diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts index 83a8a90c3f1..d4ff4b37b4c 100644 --- a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts +++ b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts @@ -14,7 +14,6 @@ import * as dom from 'vs/base/browser/dom'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {ActionItem, Separator} from 'vs/base/browser/ui/actionbar/actionbar'; import {IContextMenuService, IContextViewService} from 'vs/platform/contextview/browser/contextView'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; @@ -257,7 +256,7 @@ class ShowContextMenu extends EditorAction { public static ID = 'editor.action.showContextMenu'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Behaviour.TextFocus); } diff --git a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts index d2e09fb0479..37012842399 100644 --- a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts +++ b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts @@ -16,7 +16,6 @@ import * as dom from 'vs/base/browser/dom'; import {renderHtml} from 'vs/base/browser/htmlContentRenderer'; import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {StyleMutator} from 'vs/base/browser/styleMutator'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {Range} from 'vs/editor/common/core/range'; @@ -453,7 +452,7 @@ export class DefineKeybindingAction extends EditorAction { static ID = 'editor.action.defineKeybinding'; - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus | Behaviour.UpdateOnModelChange | Behaviour.Writeable); } diff --git a/src/vs/editor/contrib/find/common/findController.ts b/src/vs/editor/contrib/find/common/findController.ts index b89559de261..886542e245f 100644 --- a/src/vs/editor/contrib/find/common/findController.ts +++ b/src/vs/editor/contrib/find/common/findController.ts @@ -8,7 +8,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {Disposable} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindingContextKey, IKeybindingService, IKeybindings} from 'vs/platform/keybinding/common/keybindingService'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; @@ -224,7 +223,7 @@ export class CommonFindController extends Disposable implements editorCommon.IEd export class StartFindAction extends EditorAction { - constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus); } @@ -242,7 +241,7 @@ export class StartFindAction extends EditorAction { } export abstract class MatchFindAction extends EditorAction { - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus); } @@ -277,7 +276,7 @@ export class PreviousMatchFindAction extends MatchFindAction { } export abstract class SelectionMatchFindAction extends EditorAction { - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus); } @@ -317,7 +316,7 @@ export class PreviousSelectionMatchFindAction extends SelectionMatchFindAction { export class StartFindReplaceAction extends EditorAction { - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus | Behaviour.Writeable); } @@ -393,7 +392,7 @@ function multiCursorFind(editor:editorCommon.ICommonCodeEditor, changeFindSearch } export class SelectNextFindMatchAction extends EditorAction { - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus); } @@ -422,8 +421,8 @@ export class SelectNextFindMatchAction extends EditorAction { export class AddSelectionToNextFindMatchAction extends SelectNextFindMatchAction { static ID = FIND_IDS.AddSelectionToNextFindMatchAction; - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { - super(descriptor, editor, ns); + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { + super(descriptor, editor); } public run(): TPromise { @@ -444,8 +443,8 @@ export class AddSelectionToNextFindMatchAction extends SelectNextFindMatchAction export class MoveSelectionToNextFindMatchAction extends SelectNextFindMatchAction { static ID = FIND_IDS.MoveSelectionToNextFindMatchAction; - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { - super(descriptor, editor, ns); + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { + super(descriptor, editor); } public run(): TPromise { @@ -467,7 +466,7 @@ export class SelectHighlightsAction extends EditorAction { static ID = 'editor.action.selectHighlights'; static COMPAT_ID = 'editor.action.changeAll'; - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { let behaviour = Behaviour.WidgetFocus | Behaviour.Writeable; if (descriptor.id === SelectHighlightsAction.COMPAT_ID) { behaviour |= Behaviour.ShowInContextMenu; @@ -500,7 +499,7 @@ export class SelectionHighlighter extends Disposable implements editorCommon.IEd private editor: editorCommon.ICommonCodeEditor; private decorations: string[]; - constructor(editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(editor:editorCommon.ICommonCodeEditor) { super(); this.editor = editor; this.decorations = []; diff --git a/src/vs/editor/contrib/find/test/common/findController.test.ts b/src/vs/editor/contrib/find/test/common/findController.test.ts index 873a4a962e5..084602eb991 100644 --- a/src/vs/editor/contrib/find/test/common/findController.test.ts +++ b/src/vs/editor/contrib/find/test/common/findController.test.ts @@ -42,8 +42,8 @@ suite('FindController', () => { // The cursor is at the very top, of the file, at the first ABC let findController = editor.registerAndInstantiateContribution(TestFindController); let findState = findController.getState(); - let startFindAction = new StartFindAction({id:'',label:''}, editor, null); - let nextMatchFindAction = new NextMatchFindAction({id:'',label:''}, editor, null); + let startFindAction = new StartFindAction({id:'',label:''}, editor); + let nextMatchFindAction = new NextMatchFindAction({id:'',label:''}, editor); // I hit Ctrl+F to show the Find dialog startFindAction.run(); @@ -96,7 +96,7 @@ suite('FindController', () => { // The cursor is at the very top, of the file, at the first ABC let findController = editor.registerAndInstantiateContribution(TestFindController); - let nextMatchFindAction = new NextMatchFindAction({id:'',label:''}, editor, null); + let nextMatchFindAction = new NextMatchFindAction({id:'',label:''}, editor); editor.setPosition({ lineNumber: 1, diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts index 1fe26dba43a..eb2ef6aa14d 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/browser/folding.ts @@ -11,7 +11,6 @@ import {RunOnceScheduler} from 'vs/base/common/async'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EditorAction} from 'vs/editor/common/editorAction'; import * as editorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; @@ -148,7 +147,7 @@ export class FoldingController implements editorCommon.IEditorContribution { private decorations: CollapsibleRegion[]; - constructor(editor:ICodeEditor, @INullService nullService) { + constructor(editor:ICodeEditor) { this.editor = editor; this.globalToDispose = []; @@ -285,7 +284,7 @@ export class FoldingController implements editorCommon.IEditorContribution { this.contentChangedScheduler = new RunOnceScheduler(() => { let myToken = (++this.computeToken); - + this.computeCollapsibleRegions().then(regions => { if (myToken !== this.computeToken) { return; // A new request was made in the meantime or the model was changed @@ -514,7 +513,7 @@ export class FoldingController implements editorCommon.IEditorContribution { } abstract class FoldingAction extends EditorAction { - constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor) { super(descriptor, editor); } diff --git a/src/vs/editor/contrib/format/common/formatActions.ts b/src/vs/editor/contrib/format/common/formatActions.ts index cd9330bbcc4..82d7b906133 100644 --- a/src/vs/editor/contrib/format/common/formatActions.ts +++ b/src/vs/editor/contrib/format/common/formatActions.ts @@ -9,7 +9,6 @@ import * as arrays from 'vs/base/common/arrays'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {IDisposable, cAll, disposeAll} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; import * as editorCommon from 'vs/editor/common/editorCommon'; @@ -32,7 +31,7 @@ class FormatOnType implements editorCommon.IEditorContribution { private callOnDispose: IDisposable[]; private callOnModel: Function[]; - constructor(editor: editorCommon.ICommonCodeEditor, @INullService ns: INullService) { + constructor(editor: editorCommon.ICommonCodeEditor) { this.editor = editor; this.callOnDispose = []; this.callOnModel = []; @@ -150,7 +149,7 @@ export class FormatAction extends EditorAction { private _disposable: IDisposable; - constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor:editorCommon.IEditorActionDescriptorData, editor:editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.WidgetFocus | Behaviour.Writeable | Behaviour.UpdateOnModelChange | Behaviour.ShowInContextMenu); this._disposable = FormatRegistry.onDidChange(() => this.resetEnablementState()); } diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts index 10f8d0803fe..98b38efa806 100644 --- a/src/vs/editor/contrib/hover/browser/hover.ts +++ b/src/vs/editor/contrib/hover/browser/hover.ts @@ -13,7 +13,6 @@ import * as platform from 'vs/base/common/platform'; import {TPromise} from 'vs/base/common/winjs.base'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {IEditorService} from 'vs/platform/editor/common/editor'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindingService, KbExpr} from 'vs/platform/keybinding/common/keybindingService'; import {Range} from 'vs/editor/common/core/range'; import {EditorAction} from 'vs/editor/common/editorAction'; @@ -146,7 +145,7 @@ class ModesHoverController implements editorCommon.IEditorContribution { class ShowHoverAction extends EditorAction { static ID = 'editor.action.showHover'; - constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.TextFocus); } diff --git a/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts b/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts index ab640d02ea9..22b0f73ef29 100644 --- a/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts +++ b/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts @@ -9,7 +9,6 @@ import 'vs/css!./iPadShowKeyboard'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import * as browser from 'vs/base/browser/browser'; import * as dom from 'vs/base/browser/dom'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EventType, IEditorContribution} from 'vs/editor/common/editorCommon'; import {ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference} from 'vs/editor/browser/editorBrowser'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; @@ -22,7 +21,7 @@ export class IPadShowKeyboard implements IEditorContribution { private widget:ShowKeyboardWidget; private toDispose:IDisposable[]; - constructor(editor:ICodeEditor, @INullService ns) { + constructor(editor:ICodeEditor) { this.editor = editor; this.toDispose = []; if (browser.isIPad) { diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/common/indentation.ts index 1cb199fbce2..cace93da42e 100644 --- a/src/vs/editor/contrib/indentation/common/indentation.ts +++ b/src/vs/editor/contrib/indentation/common/indentation.ts @@ -5,7 +5,6 @@ import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {EditorAction} from 'vs/editor/common/editorAction'; import {ICommonCodeEditor, IEditorActionDescriptorData} from 'vs/editor/common/editorCommon'; @@ -16,7 +15,7 @@ import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpe export class IndentationToSpacesAction extends EditorAction { static ID = 'editor.action.indentationToSpaces'; - constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor, @INullService ns) { + constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor) { super(descriptor, editor); } @@ -35,7 +34,7 @@ export class IndentationToSpacesAction extends EditorAction { export class IndentationToTabsAction extends EditorAction { static ID = 'editor.action.indentationToTabs'; - constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor, @INullService ns) { + constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor) { super(descriptor, editor); } diff --git a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts index 0a5ac37ded3..3ebab02652f 100644 --- a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts +++ b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {TrimTrailingWhitespaceCommand} from 'vs/editor/common/commands/trimTrailingWhitespaceCommand'; import {EditorAction, HandlerEditorAction} from 'vs/editor/common/editorAction'; import {Handler, ICommand, ICommonCodeEditor, IEditorActionDescriptorData} from 'vs/editor/common/editorCommon'; @@ -45,7 +44,7 @@ class CopyLinesAction extends EditorAction { class CopyLinesUpAction extends CopyLinesAction { static ID = 'editor.action.copyLinesUpAction'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, false); } @@ -54,7 +53,7 @@ class CopyLinesUpAction extends CopyLinesAction { class CopyLinesDownAction extends CopyLinesAction { static ID = 'editor.action.copyLinesDownAction'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, true); } } @@ -88,7 +87,7 @@ class MoveLinesAction extends EditorAction { class MoveLinesUpAction extends MoveLinesAction { static ID = 'editor.action.moveLinesUpAction'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, false); } } @@ -96,7 +95,7 @@ class MoveLinesUpAction extends MoveLinesAction { class MoveLinesDownAction extends MoveLinesAction { static ID = 'editor.action.moveLinesDownAction'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, true); } } @@ -105,7 +104,7 @@ class TrimTrailingWhitespaceAction extends EditorAction { static ID = 'editor.action.trimTrailingWhitespace'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor); } @@ -179,7 +178,7 @@ class DeleteLinesAction extends AbstractRemoveLinesAction { static ID = 'editor.action.deleteLines'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor); } @@ -201,7 +200,7 @@ class DeleteLinesAction extends AbstractRemoveLinesAction { class IndentLinesAction extends HandlerEditorAction { static ID = 'editor.action.indentLines'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Handler.Indent); } } @@ -209,7 +208,7 @@ class IndentLinesAction extends HandlerEditorAction { class OutdentLinesAction extends HandlerEditorAction { static ID = 'editor.action.outdentLines'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Handler.Outdent); } } @@ -217,7 +216,7 @@ class OutdentLinesAction extends HandlerEditorAction { class InsertLineBeforeAction extends HandlerEditorAction { static ID = 'editor.action.insertLineBefore'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Handler.LineInsertBefore); } } @@ -225,7 +224,7 @@ class InsertLineBeforeAction extends HandlerEditorAction { class InsertLineAfterAction extends HandlerEditorAction { static ID = 'editor.action.insertLineAfter'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Handler.LineInsertAfter); } } diff --git a/src/vs/editor/contrib/multicursor/common/multicursor.ts b/src/vs/editor/contrib/multicursor/common/multicursor.ts index 7252fbac617..72b0853f3af 100644 --- a/src/vs/editor/contrib/multicursor/common/multicursor.ts +++ b/src/vs/editor/contrib/multicursor/common/multicursor.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EditorAction, HandlerEditorAction} from 'vs/editor/common/editorAction'; import {Handler, ICommonCodeEditor, IEditorActionDescriptorData, ISelection} from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; @@ -15,7 +14,7 @@ import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/edito class InsertCursorAbove extends HandlerEditorAction { static ID = 'editor.action.insertCursorAbove'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Handler.AddCursorUp); } } @@ -23,7 +22,7 @@ class InsertCursorAbove extends HandlerEditorAction { class InsertCursorBelow extends HandlerEditorAction { static ID = 'editor.action.insertCursorBelow'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Handler.AddCursorDown); } } @@ -31,7 +30,7 @@ class InsertCursorBelow extends HandlerEditorAction { class InsertCursorAtEndOfEachLineSelected extends EditorAction { static ID = 'editor.action.insertCursorAtEndOfEachLineSelected'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor); } diff --git a/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts b/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts index 5da7abd8986..dde16fe92df 100644 --- a/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts +++ b/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts @@ -10,7 +10,6 @@ import {RunOnceScheduler} from 'vs/base/common/async'; import {onUnexpectedError} from 'vs/base/common/errors'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {Range} from 'vs/editor/common/core/range'; import * as editorCommon from 'vs/editor/common/editorCommon'; import {IOutlineEntry} from 'vs/editor/common/modes'; @@ -121,7 +120,7 @@ export class OutlineMarkerContribution implements editorCommon.IEditorContributi private _markers:OutlineMarker[]; - constructor(editor:ICodeEditor, @INullService ns) { + constructor(editor:ICodeEditor) { this._editor = editor; this._globalToDispose = []; diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts index aee72dd52d8..c33c544b59c 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {EditorAction} from 'vs/editor/common/editorAction'; import {ICommonCodeEditor, IEditorActionDescriptorData, IEditorContribution} from 'vs/editor/common/editorCommon'; @@ -74,7 +73,7 @@ export class TriggerParameterHintsAction extends EditorAction { static ID = 'editor.action.triggerParameterHints'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor); } diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.ts b/src/vs/editor/contrib/quickFix/browser/quickFix.ts index 38ab2a4cb24..7a37e8bf904 100644 --- a/src/vs/editor/contrib/quickFix/browser/quickFix.ts +++ b/src/vs/editor/contrib/quickFix/browser/quickFix.ts @@ -11,7 +11,6 @@ import Severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; import {IEditorService} from 'vs/platform/editor/common/editor'; import {IEventService} from 'vs/platform/event/common/event'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {IMarkerService} from 'vs/platform/markers/common/markers'; import {IMessageService} from 'vs/platform/message/common/message'; @@ -145,7 +144,7 @@ export class QuickFixAction extends EditorAction { static ID = 'editor.action.quickFix'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor); } diff --git a/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts b/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts index 27cc8bb08cb..b2d74a269e0 100644 --- a/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts +++ b/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts @@ -7,7 +7,6 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; import * as editorCommon from 'vs/editor/common/editorCommon'; @@ -34,7 +33,7 @@ export class QuickOpenController implements editorCommon.IEditorContribution { private editor:ICodeEditor; private widget:QuickOpenEditorWidget; - constructor(editor:ICodeEditor, @INullService ns) { + constructor(editor:ICodeEditor) { this.editor = editor; } diff --git a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts index 156ad9150d0..95893a94fde 100644 --- a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts +++ b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts @@ -9,7 +9,6 @@ import 'vs/css!./gotoLine'; import * as nls from 'vs/nls'; import {IContext, QuickOpenEntry, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {IAutoFocus, Mode} from 'vs/base/parts/quickopen/common/quickOpen'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import * as editorCommon from 'vs/editor/common/editorCommon'; import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser'; import {BaseEditorQuickOpenAction, IDecorator} from './editorQuickOpen'; @@ -150,7 +149,7 @@ export class GotoLineAction extends BaseEditorQuickOpenAction { public static ID = 'editor.action.gotoLine'; - constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor) { super(descriptor, editor, nls.localize('GotoLineAction.label', "Go to Line...")); } diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts index c3552959cad..68c3daa7282 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts @@ -15,7 +15,6 @@ import * as strings from 'vs/base/common/strings'; import {TPromise} from 'vs/base/common/winjs.base'; import {IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {IAutoFocus, Mode} from 'vs/base/parts/quickopen/common/quickOpen'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; import {ICommonCodeEditor, IEditorActionDescriptorData, IRange} from 'vs/editor/common/editorCommon'; import {IOutlineEntry} from 'vs/editor/common/modes'; @@ -122,7 +121,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction { private cachedResult: IOutlineEntry[]; - constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor, @INullService ns) { + constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor) { super(descriptor, editor, nls.localize('QuickOutlineAction.label', "Go to Symbol..."), Behaviour.WidgetFocus | Behaviour.ShowInContextMenu); } diff --git a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts index a1fcd2795d5..adfcffe6011 100644 --- a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts +++ b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; import {Handler, ICommonCodeEditor, IEditorActionDescriptorData} from 'vs/editor/common/editorCommon'; @@ -17,7 +16,7 @@ class SelectBracketAction extends EditorAction { static ID = 'editor.action.jumpToBracket'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Behaviour.TextFocus); } diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts index 7b0393eb44b..72429c825db 100644 --- a/src/vs/editor/contrib/suggest/browser/suggest.ts +++ b/src/vs/editor/contrib/suggest/browser/suggest.ts @@ -9,7 +9,7 @@ import {onUnexpectedError} from 'vs/base/common/errors'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {IDisposable, cAll, disposeAll} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; -import {IInstantiationService, INullService} from 'vs/platform/instantiation/common/instantiation'; +import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {EditorAction} from 'vs/editor/common/editorAction'; import {EventType, ICommonCodeEditor, IEditorActionDescriptorData, IEditorContribution, IModeSupportChangedEvent} from 'vs/editor/common/editorCommon'; @@ -198,7 +198,7 @@ export class TriggerSuggestAction extends EditorAction { static ID: string = 'editor.action.triggerSuggest'; - constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor, @INullService ns) { + constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor) { super(descriptor, editor); } diff --git a/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts index 92bb3c6239e..5e432905c88 100644 --- a/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts +++ b/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; import {ICommonCodeEditor, IEditorActionDescriptorData} from 'vs/editor/common/editorCommon'; @@ -17,7 +16,7 @@ export class ToggleTabFocusModeAction extends EditorAction { public static ID = 'editor.action.toggleTabFocusMode'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Behaviour.TextFocus); } diff --git a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts b/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts index 089d0d29385..49c9883b57c 100644 --- a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts +++ b/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {DefaultConfig} from 'vs/editor/common/config/defaultConfig'; import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; @@ -18,7 +17,7 @@ class ToggleWordWrapAction extends EditorAction { static ID = 'editor.action.toggleWordWrap'; - constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @INullService ns) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor) { super(descriptor, editor, Behaviour.TextFocus); } diff --git a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts index 8e06cabcbbb..51569155742 100644 --- a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts +++ b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts @@ -7,7 +7,6 @@ import {sequence} from 'vs/base/common/async'; import {onUnexpectedError} from 'vs/base/common/errors'; import {TPromise} from 'vs/base/common/winjs.base'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {Range} from 'vs/editor/common/core/range'; import * as editorCommon from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; @@ -279,7 +278,7 @@ class WordHighlighterContribution implements editorCommon.IEditorContribution { private wordHighligher: WordHighlighter; - constructor(editor:editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(editor:editorCommon.ICommonCodeEditor) { this.wordHighligher = new WordHighlighter(editor); } diff --git a/src/vs/languages/json/common/contributions/globPatternContribution.ts b/src/vs/languages/json/common/contributions/globPatternContribution.ts index 51196276c60..cc1fc72306c 100644 --- a/src/vs/languages/json/common/contributions/globPatternContribution.ts +++ b/src/vs/languages/json/common/contributions/globPatternContribution.ts @@ -10,7 +10,6 @@ import Modes = require('vs/editor/common/modes'); import WinJS = require('vs/base/common/winjs.base'); import nls = require('vs/nls'); import JSONWorker = require('vs/languages/json/common/jsonWorker'); -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import URI from 'vs/base/common/uri'; import {JSONLocation} from 'vs/languages/json/common/parser/jsonLocation'; @@ -31,7 +30,7 @@ var globValues:Modes.ISuggestion[] = [ export class GlobPatternContribution implements JSONWorker.IJSONWorkerContribution { - constructor(@INullService ns) { + constructor() { } private isSettingsFile(resource: URI): boolean { diff --git a/src/vs/platform/instantiation/common/instantiation.ts b/src/vs/platform/instantiation/common/instantiation.ts index a91554135a9..904a99f0b89 100644 --- a/src/vs/platform/instantiation/common/instantiation.ts +++ b/src/vs/platform/instantiation/common/instantiation.ts @@ -230,12 +230,3 @@ export function createDecorator(serviceId: string): { (...args: any[]): void; export interface Context { get(id: ServiceIdentifier): T; } - -/* - * Dummy service to make signal that the new service injection is used. I will go away once we remove the old way (using ctx) - */ -export const INullService = createDecorator('nullService'); - -export interface INullService { - serviceId: ServiceIdentifier; -} \ No newline at end of file diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts index dacb8fa6055..2462cacfd48 100644 --- a/src/vs/platform/instantiation/common/instantiationService.ts +++ b/src/vs/platform/instantiation/common/instantiationService.ts @@ -162,55 +162,44 @@ class ServicesMap { public createInstance(descriptor: descriptors.SyncDescriptor, args: any[]): T { let allArguments: any[] = []; - let serviceInjections = instantiation._util.getServiceDependencies(descriptor.ctor) ; - if (Array.isArray(serviceInjections)) { - let fixedArguments = descriptor.staticArguments().concat(args); - let expectedFirstServiceIndex = fixedArguments.length; - let actualFirstServiceIndex = Number.MAX_VALUE; - serviceInjections.forEach(si => { - // @IServiceName - let {serviceId, index} = si; - let service = this._lock.runUnlocked(() => this[serviceId]); - allArguments[index] = service; - actualFirstServiceIndex = Math.min(actualFirstServiceIndex, si.index); - }); + let serviceInjections = instantiation._util.getServiceDependencies(descriptor.ctor) || []; + let fixedArguments = descriptor.staticArguments().concat(args); + let expectedFirstServiceIndex = fixedArguments.length; + let actualFirstServiceIndex = Number.MAX_VALUE; + serviceInjections.forEach(si => { + // @IServiceName + let {serviceId, index} = si; + let service = this._lock.runUnlocked(() => this[serviceId]); + allArguments[index] = service; + actualFirstServiceIndex = Math.min(actualFirstServiceIndex, si.index); + }); - // insert the fixed arguments into the array of all ctor - // arguments. don't overwrite existing values tho it indicates - // something is off - let i = 0; - for (let arg of fixedArguments) { - let hasValue = allArguments[i] !== void 0; - if (!hasValue) { - allArguments[i] = arg; - } - i += 1; + // insert the fixed arguments into the array of all ctor + // arguments. don't overwrite existing values tho it indicates + // something is off + let i = 0; + for (let arg of fixedArguments) { + let hasValue = allArguments[i] !== void 0; + if (!hasValue) { + allArguments[i] = arg; } + i += 1; + } - allArguments.unshift(descriptor.ctor); // ctor is first arg + allArguments.unshift(descriptor.ctor); // ctor is first arg - // services are the last arguments of ctor-calls. We check if static ctor arguments - // (like those from a [sync|async] desriptor) or args that are passed by createInstance - // don't override positions of those arguments - if (actualFirstServiceIndex !== Number.MAX_VALUE - && actualFirstServiceIndex !== expectedFirstServiceIndex) { + // services are the last arguments of ctor-calls. We check if static ctor arguments + // (like those from a [sync|async] desriptor) or args that are passed by createInstance + // don't override positions of those arguments + if (actualFirstServiceIndex !== Number.MAX_VALUE + && actualFirstServiceIndex !== expectedFirstServiceIndex) { - let msg = `[createInstance] constructor '${descriptor.ctor.name}' has first` + - ` service dependency at position ${actualFirstServiceIndex + 1} but is called with` + - ` ${expectedFirstServiceIndex - 1} static arguments that are expected to come first`; + let msg = `[createInstance] constructor '${descriptor.ctor.name}' has first` + + ` service dependency at position ${actualFirstServiceIndex + 1} but is called with` + + ` ${expectedFirstServiceIndex - 1} static arguments that are expected to come first`; - // throw new Error(msg); - console.warn(msg); - } - - } else { - allArguments = [descriptor.ctor, this /*this === ctx*/]; - allArguments.push.apply(allArguments, descriptor.staticArguments()); - allArguments.push.apply(allArguments, args); - - if (allArguments.length > 2) { - console.warn('using OLD INJECTION STYLE for ' + descriptor.ctor.name); - } + // throw new Error(msg); + console.warn(msg); } return this._lock.runUnlocked(() => { diff --git a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts index 29bae8ed9e2..d2145759d4e 100644 --- a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts +++ b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts @@ -11,7 +11,6 @@ import URI from 'vs/base/common/uri'; import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); import strings = require('vs/base/common/strings'); import paths = require('vs/base/common/paths'); -import {INullService} from 'vs/platform/instantiation/common/instantiation'; interface IJSONValidationExtensionPoint { fileMatch: string; @@ -42,9 +41,7 @@ let configurationExtPoint = PluginsRegistry.registerExtensionPoint { for (var i = 0; i < extensions.length; i++) { var extensionValue = extensions[i].value; diff --git a/src/vs/workbench/api/node/extHostConfiguration.ts b/src/vs/workbench/api/node/extHostConfiguration.ts index 81075bd1157..a7b1d28b326 100644 --- a/src/vs/workbench/api/node/extHostConfiguration.ts +++ b/src/vs/workbench/api/node/extHostConfiguration.ts @@ -9,7 +9,6 @@ import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import {IThreadService, Remotable} from 'vs/platform/thread/common/thread'; import {IConfigurationService, ConfigurationServiceEventTypes, IConfigurationServiceEvent} from 'vs/platform/configuration/common/configuration'; import Event, {Emitter} from 'vs/base/common/event'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {WorkspaceConfiguration} from 'vscode'; @Remotable.PluginHostContext('ExtHostConfiguration') @@ -19,7 +18,7 @@ export class ExtHostConfiguration { private _hasConfig: boolean; private _onDidChangeConfiguration: Emitter; - constructor(@INullService ns) { + constructor() { this._onDidChangeConfiguration = new Emitter(); } diff --git a/src/vs/workbench/api/node/extHostFileSystemEventService.ts b/src/vs/workbench/api/node/extHostFileSystemEventService.ts index 46088c1633c..38cfd4f0417 100644 --- a/src/vs/workbench/api/node/extHostFileSystemEventService.ts +++ b/src/vs/workbench/api/node/extHostFileSystemEventService.ts @@ -13,7 +13,6 @@ import {RunOnceScheduler} from 'vs/base/common/async'; import URI from 'vs/base/common/uri'; import {match} from 'vs/base/common/glob'; import {Uri, FileSystemWatcher as _FileSystemWatcher} from 'vscode'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; export interface FileSystemEvents { created: URI[]; @@ -103,7 +102,7 @@ export class ExtHostFileSystemEventService { private _emitter = new Emitter(); - constructor(@INullService ns) { + constructor() { } public createFileSystemWatcher(globPattern: string, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): _FileSystemWatcher { diff --git a/src/vs/workbench/browser/actions/showPerformanceBox.ts b/src/vs/workbench/browser/actions/showPerformanceBox.ts index ddf474b2da1..157ad1514e1 100644 --- a/src/vs/workbench/browser/actions/showPerformanceBox.ts +++ b/src/vs/workbench/browser/actions/showPerformanceBox.ts @@ -7,13 +7,12 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {TimeKeeperRenderer} from 'vs/base/browser/ui/timer/timer'; import {Action} from 'vs/base/common/actions'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; let timeKeeperRenderer: TimeKeeperRenderer = null; export class ShowPerformanceBox extends Action { - constructor(id: string, label: string, @INullService ns: any) { + constructor(id: string, label: string) { super(id, label, null, true); } diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index 1d8e12d1c43..688468aaa6d 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -24,7 +24,6 @@ import {Composite, CompositeDescriptor, CompositeRegistry} from 'vs/workbench/br import {IContextMenuService} from 'vs/platform/contextview/browser/contextView'; import {IMessageService} from 'vs/platform/message/common/message'; import {StructuredSelection} from 'vs/platform/selection/common/selection'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; export abstract class Viewlet extends Composite implements IViewlet { } @@ -254,7 +253,7 @@ export class ToggleViewletAction extends Action { // Collapse All action export class CollapseAction extends Action { - constructor(viewer: ITree, enabled: boolean, clazz: string, @INullService ns) { + constructor(viewer: ITree, enabled: boolean, clazz: string) { super('workbench.action.collapse', nls.localize('collapse', "Collapse"), clazz, enabled, (context: any) => { if (viewer.getHighlight()) { return TPromise.as(null); // Global action disabled if user is in edit mode from another action diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index cac1fe268dd..5a77861263b 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -16,7 +16,6 @@ import {IMessageService, Severity} from 'vs/platform/message/common/message'; import {IWindowConfiguration} from 'vs/workbench/electron-browser/window'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {ipcRenderer as ipc, webFrame, remote} from 'electron'; @@ -146,7 +145,7 @@ export class ToggleDevToolsAction extends Action { public static ID = 'workbench.action.toggleDevTools'; public static LABEL = nls.localize('toggleDevTools', "Toggle Developer Tools"); - constructor(id: string, label: string, @INullService ns) { + constructor(id: string, label: string) { super(id, label); } @@ -162,7 +161,7 @@ export class ZoomInAction extends Action { public static ID = 'workbench.action.zoomIn'; public static LABEL = nls.localize('zoomIn', "Zoom in"); - constructor(id: string, label: string, @INullService ns) { + constructor(id: string, label: string) { super(id, label); } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugActions.ts b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts index eda831ae01c..12de40278f5 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugActions.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts @@ -14,7 +14,6 @@ import { EditorAction } from 'vs/editor/common/editorAction'; import { Behaviour } from 'vs/editor/common/editorActionEnablement'; import { IEventService } from 'vs/platform/event/common/event'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybindingService'; -import { INullService } from 'vs/platform/instantiation/common/instantiation'; import { EventType, CompositeEvent } from 'vs/workbench/common/events'; import debug = require('vs/workbench/parts/debug/common/debug'); import model = require('vs/workbench/parts/debug/common/debugModel'); @@ -611,7 +610,7 @@ export class SelectionToReplAction extends EditorAction { export class ShowDebugHoverAction extends EditorAction { static ID = 'editor.debug.action.showDebugHover'; - constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor, @INullService ns) { + constructor(descriptor: editorCommon.IEditorActionDescriptorData, editor: editorCommon.ICommonCodeEditor) { super(descriptor, editor, Behaviour.TextFocus); } diff --git a/src/vs/workbench/parts/emmet/node/emmetActions.ts b/src/vs/workbench/parts/emmet/node/emmetActions.ts index 0583405f532..69a204280f9 100644 --- a/src/vs/workbench/parts/emmet/node/emmetActions.ts +++ b/src/vs/workbench/parts/emmet/node/emmetActions.ts @@ -10,14 +10,13 @@ import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/e import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; import {EditorAccessor} from './editorAccessor'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; export class ExpandAbbreviationAction extends EditorAction { static ID = 'editor.emmet.action.expandAbbreviation'; private editorAccessor: EditorAccessor; - constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor, @INullService ns) { + constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor) { super(descriptor, editor, Behaviour.TextFocus); this.editorAccessor = new EditorAccessor(editor); } diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index ec4715e98a7..6a65867e237 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -43,7 +43,7 @@ import {IPartService} from 'vs/workbench/services/part/common/partService'; import {IStorageService} from 'vs/platform/storage/common/storage'; import {IResourceInput, Position, IEditor} from 'vs/platform/editor/common/editor'; import {IEventService} from 'vs/platform/event/common/event'; -import {IInstantiationService, IConstructorSignature2, INullService} from 'vs/platform/instantiation/common/instantiation'; +import {IInstantiationService, IConstructorSignature2} from 'vs/platform/instantiation/common/instantiation'; import {IMessageService, IMessageWithAction, IConfirmation, Severity, CancelAction} from 'vs/platform/message/common/message'; import {IProgressService, IProgressRunner} from 'vs/platform/progress/common/progress'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; @@ -1213,7 +1213,7 @@ export class SelectResourceForCompareAction extends Action { private resource: URI; private tree: ITree; - constructor(resource: URI, tree: ITree, @INullService ns) { + constructor(resource: URI, tree: ITree) { super('workbench.files.action.selectForCompare', nls.localize('compareSource', "Select for Compare")); this.tree = tree; @@ -1385,7 +1385,7 @@ export class CompareResourcesAction extends Action { // Refresh Explorer Viewer export class RefreshViewExplorerAction extends Action { - constructor(explorerView: ExplorerView, clazz: string, @INullService ns) { + constructor(explorerView: ExplorerView, clazz: string) { super('workbench.files.action.refreshExplorer', nls.localize('refresh', "Refresh"), clazz, true, (context: any) => { if (explorerView.getViewer().getHighlight()) { return TPromise.as(null); // Global action disabled if user is in edit mode from another action diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts index 390eef4ebd7..411f7bc719f 100644 --- a/src/vs/workbench/parts/files/browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/browser/files.contribution.ts @@ -29,7 +29,7 @@ import {SaveParticipant} from 'vs/workbench/parts/files/common/editors/saveParti import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput'; import {TextFileEditor} from 'vs/workbench/parts/files/browser/editors/textFileEditor'; import {BinaryFileEditor} from 'vs/workbench/parts/files/browser/editors/binaryFileEditor'; -import {IInstantiationService, INullService} from 'vs/platform/instantiation/common/instantiation'; +import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {SyncDescriptor, AsyncDescriptor} from 'vs/platform/instantiation/common/descriptors'; import {IKeybindings} from 'vs/platform/keybinding/common/keybindingService'; import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletService'; @@ -130,7 +130,7 @@ interface ISerializedFileInput { // Register Editor Input Factory class FileEditorInputFactory implements IEditorInputFactory { - constructor(@INullService ns) { } + constructor() { } public serialize(editorInput: EditorInput): string { let fileEditorInput = editorInput; diff --git a/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts b/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts index 66c824b3fe4..15246c38485 100644 --- a/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts @@ -29,7 +29,7 @@ import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/unti import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IContextMenuService} from 'vs/platform/contextview/browser/contextView'; -import {IInstantiationService, INullService} from 'vs/platform/instantiation/common/instantiation'; +import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {CommonKeybindings, Keybinding} from 'vs/base/common/keyCodes'; @@ -37,7 +37,7 @@ const ROOT_ID = '__WORKING_FILES_ROOT'; export class WorkingFilesDataSource implements IDataSource { - constructor( @INullService ns) { } + constructor() { } public getId(tree: ITree, element: any): string { if (element instanceof WorkingFileEntry) { @@ -70,7 +70,7 @@ export class WorkingFilesDataSource implements IDataSource { export class WorkingFilesSorter implements ISorter { - constructor(@INullService ns) { } + constructor() { } public compare(tree: ITree, element: any, otherElement: any): number { return WorkingFilesModel.compare(element, otherElement); diff --git a/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts b/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts index 7411244ac87..f53489c1ea8 100644 --- a/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/electronFileActions.ts @@ -16,14 +16,13 @@ import severity from 'vs/base/common/severity'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {asFileEditorInput} from 'vs/workbench/common/editor'; import {IMessageService} from 'vs/platform/message/common/message'; -import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {ipcRenderer as ipc, shell, clipboard} from 'electron'; export class RevealInOSAction extends Action { private resource: uri; - constructor(resource: uri, @INullService ns) { + constructor(resource: uri) { super('workbench.action.files.revealInWindows', platform.isWindows ? nls.localize('revealInWindows', "Reveal in Explorer") : (platform.isMacintosh ? nls.localize('revealInMac', "Reveal in Finder") : nls.localize('openContainer', "Open Containing Folder"))); this.resource = resource; @@ -67,7 +66,7 @@ export class GlobalRevealInOSAction extends Action { export class CopyPathAction extends Action { private resource: uri; - constructor(resource: uri, @INullService ns) { + constructor(resource: uri) { super('workbench.action.files.copyPath', nls.localize('copyPath', "Copy Path")); this.resource = resource; @@ -131,7 +130,7 @@ export const OPEN_FILE_LABEL = nls.localize('openFile', "Open File..."); export class OpenFileAction extends BaseOpenAction { - constructor(id: string, label: string, @INullService ns) { + constructor(id: string, label: string) { super(id, label, 'vscode:openFilePicker'); } } @@ -141,7 +140,7 @@ export const OPEN_FOLDER_LABEL = nls.localize('openFolder', "Open Folder..."); export class OpenFolderAction extends BaseOpenAction { - constructor(id: string, label: string, @INullService ns) { + constructor(id: string, label: string) { super(id, label, 'vscode:openFolderPicker'); } @@ -152,7 +151,7 @@ export const OPEN_FILE_FOLDER_LABEL = nls.localize('openFileFolder', "Open..."); export class OpenFileFolderAction extends BaseOpenAction { - constructor(id: string, label: string, @INullService ns) { + constructor(id: string, label: string) { super(id, label, 'vscode:openFileFolderPicker'); } } diff --git a/src/vs/workbench/parts/markdown/browser/markdown.contribution.ts b/src/vs/workbench/parts/markdown/browser/markdown.contribution.ts index a77e7101f82..81e10719bdc 100644 --- a/src/vs/workbench/parts/markdown/browser/markdown.contribution.ts +++ b/src/vs/workbench/parts/markdown/browser/markdown.contribution.ts @@ -11,12 +11,12 @@ import {EditorInput} from 'vs/workbench/common/editor'; import {MarkdownEditorInput} from 'vs/workbench/parts/markdown/common/markdownEditorInput'; import {MarkdownFileTracker} from 'vs/workbench/parts/markdown/browser/markdownExtension'; import {IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions} from 'vs/workbench/common/contributions'; -import {IInstantiationService, INullService} from 'vs/platform/instantiation/common/instantiation'; +import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; // Register Editor Input Factory class MarkdownInputFactory implements IEditorInputFactory { - constructor(@INullService ns) {} + constructor() {} public serialize(editorInput: EditorInput): string { let markdownInput = editorInput;