diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts index ba6f8c2ba64..6ba1c4cf240 100644 --- a/src/vs/base/browser/mouseEvent.ts +++ b/src/vs/base/browser/mouseEvent.ts @@ -21,6 +21,7 @@ export interface IMouseEvent { shiftKey:boolean; altKey:boolean; metaKey:boolean; + timestamp:number; preventDefault(): void; stopPropagation(): void; diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts index 840a2885ebd..bf02ff11bb9 100644 --- a/src/vs/base/browser/ui/findinput/findInput.ts +++ b/src/vs/base/browser/ui/findinput/findInput.ts @@ -14,7 +14,7 @@ import {IContextViewProvider} from 'vs/base/browser/ui/contextview/contextview'; import {Widget} from 'vs/base/browser/ui/widget'; import Event, {Emitter} from 'vs/base/common/event'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {StandardMouseEvent} from 'vs/base/browser/mouseEvent'; +import {IMouseEvent} from 'vs/base/browser/mouseEvent'; import {CommonKeybindings} from 'vs/base/common/keyCodes'; export interface IFindInputOptions { @@ -317,7 +317,7 @@ export class FindInput extends Widget { } interface IMatchCountOpts { - onClick: (e:StandardMouseEvent) => void; + onClick: (e:IMouseEvent) => void; } class MatchCount extends Widget { diff --git a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts index 2d5cf0f9cb7..f614cce18ae 100644 --- a/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts @@ -7,7 +7,7 @@ import * as Browser from 'vs/base/browser/browser'; import * as Platform from 'vs/base/common/platform'; import * as DomUtils from 'vs/base/browser/dom'; -import {StandardMouseEvent} from 'vs/base/browser/mouseEvent'; +import {IMouseEvent, StandardMouseEvent} from 'vs/base/browser/mouseEvent'; import {IMouseWheelEvent, IParent, Visibility, IScrollbar} from 'vs/base/browser/ui/scrollbar/scrollableElement'; import {Disposable} from 'vs/base/common/lifecycle'; import {GlobalMouseMoveMonitor, IStandardMouseMoveEventData, standardMouseMoveMerger} from 'vs/base/browser/globalMouseMoveMonitor'; @@ -215,7 +215,7 @@ class ScrollbarArrow extends Widget { this._mousedownScheduleRepeatTimer = this._register(new TimeoutTimer()); } - private _arrowMouseDown(e: StandardMouseEvent): void { + private _arrowMouseDown(e: IMouseEvent): void { let repeater = () => { this._parent.onMouseWheel(this._mouseWheelEventFactory()); }; @@ -446,7 +446,7 @@ export abstract class AbstractScrollbar extends Widget implements IScrollbar { // ----------------- DOM events - private _domNodeMouseDown(e: StandardMouseEvent): void { + private _domNodeMouseDown(e: IMouseEvent): void { if (e.target !== this.domNode) { return; } @@ -468,14 +468,14 @@ export abstract class AbstractScrollbar extends Widget implements IScrollbar { } } - private _onMouseDown(e: StandardMouseEvent): void { + private _onMouseDown(e: IMouseEvent): void { let domNodePosition = DomUtils.getDomNodePosition(this.domNode); let desiredSliderPosition = this._mouseDownRelativePosition(e, domNodePosition) - this._scrollbarState.getArrowSize() - this._scrollbarState.getSliderSize() / 2; this.setDesiredScrollPosition(this._scrollbarState.convertSliderPositionToScrollPosition(desiredSliderPosition)); this._sliderMouseDown(e); } - private _sliderMouseDown(e: StandardMouseEvent): void { + private _sliderMouseDown(e: IMouseEvent): void { if (e.leftButton) { let initialMouseOrthogonalPosition = this._sliderOrthogonalMousePosition(e); let initialScrollPosition = this._getScrollPosition(); @@ -523,7 +523,7 @@ export abstract class AbstractScrollbar extends Widget implements IScrollbar { protected abstract _renderDomNode(largeSize: number, smallSize: number): void; protected abstract _updateSlider(sliderSize: number, sliderPosition: number): void; - protected abstract _mouseDownRelativePosition(e: StandardMouseEvent, domNodePosition: DomUtils.IDomNodePosition): number; + protected abstract _mouseDownRelativePosition(e: IMouseEvent, domNodePosition: DomUtils.IDomNodePosition): number; protected abstract _sliderMousePosition(e: IMouseMoveEventData): number; protected abstract _sliderOrthogonalMousePosition(e: IMouseMoveEventData): number; protected abstract _getScrollPosition(): number; diff --git a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts index c49c596291c..a6deb0fe741 100644 --- a/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts @@ -6,7 +6,7 @@ import * as Browser from 'vs/base/browser/browser'; import {ARROW_IMG_SIZE, AbstractScrollbar, ScrollbarState, IMouseMoveEventData} from 'vs/base/browser/ui/scrollbar/abstractScrollbar'; -import {StandardMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent'; +import {IMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent'; import {IDomNodePosition} from 'vs/base/browser/dom'; import {IParent, IScrollableElementOptions, Visibility} from 'vs/base/browser/ui/scrollbar/scrollableElement'; import {IScrollable} from 'vs/base/common/scrollable'; @@ -57,7 +57,7 @@ export class HorizontalScrollbar extends AbstractScrollbar { StyleMutator.setBottom(this.domNode, 0); } - protected _mouseDownRelativePosition(e: StandardMouseEvent, domNodePosition: IDomNodePosition): number { + protected _mouseDownRelativePosition(e: IMouseEvent, domNodePosition: IDomNodePosition): number { return e.posx - domNodePosition.left; } diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts b/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts index df69f8ec964..1d369bc7864 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/scrollbars'; import * as DomUtils from 'vs/base/browser/dom'; import * as Platform from 'vs/base/common/platform'; -import {StandardMouseWheelEvent, StandardMouseEvent} from 'vs/base/browser/mouseEvent'; +import {StandardMouseWheelEvent, IMouseEvent} from 'vs/base/browser/mouseEvent'; import {DomNodeScrollable} from 'vs/base/browser/ui/scrollbar/domNodeScrollable'; import {HorizontalScrollbar} from 'vs/base/browser/ui/scrollbar/horizontalScrollbar'; import {VerticalScrollbar} from 'vs/base/browser/ui/scrollbar/verticalScrollbar'; @@ -319,12 +319,12 @@ export class ScrollableElement extends Widget implements IScrollableElement { this._hide(); } - private _onMouseOut(e: StandardMouseEvent): void { + private _onMouseOut(e: IMouseEvent): void { this._mouseIsOver = false; this._hide(); } - private _onMouseOver(e: StandardMouseEvent): void { + private _onMouseOver(e: IMouseEvent): void { this._mouseIsOver = true; this._reveal(); } diff --git a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts index b4ea590b749..88a1693daa0 100644 --- a/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts +++ b/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts @@ -6,7 +6,7 @@ import * as Browser from 'vs/base/browser/browser'; import {ARROW_IMG_SIZE, AbstractScrollbar, ScrollbarState, IMouseMoveEventData} from 'vs/base/browser/ui/scrollbar/abstractScrollbar'; -import {StandardMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent'; +import {IMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent'; import {IDomNodePosition} from 'vs/base/browser/dom'; import {IParent, IScrollableElementOptions, Visibility} from 'vs/base/browser/ui/scrollbar/scrollableElement'; import {IScrollable} from 'vs/base/common/scrollable'; @@ -58,7 +58,7 @@ export class VerticalScrollbar extends AbstractScrollbar { StyleMutator.setTop(this.domNode, 0); } - protected _mouseDownRelativePosition(e: StandardMouseEvent, domNodePosition: IDomNodePosition): number { + protected _mouseDownRelativePosition(e: IMouseEvent, domNodePosition: IDomNodePosition): number { return e.posy - domNodePosition.top; } diff --git a/src/vs/base/browser/ui/widget.ts b/src/vs/base/browser/ui/widget.ts index 6ad396b2667..d1feb225c39 100644 --- a/src/vs/base/browser/ui/widget.ts +++ b/src/vs/base/browser/ui/widget.ts @@ -6,25 +6,25 @@ 'use strict'; import {Disposable} from 'vs/base/common/lifecycle'; -import {StandardMouseEvent} from 'vs/base/browser/mouseEvent'; +import {StandardMouseEvent, IMouseEvent} from 'vs/base/browser/mouseEvent'; import {StandardKeyboardEvent, IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import * as DomUtils from 'vs/base/browser/dom'; export abstract class Widget extends Disposable { - protected onclick(domNode:HTMLElement, listener:(e:StandardMouseEvent)=>void): void { + protected onclick(domNode:HTMLElement, listener:(e:IMouseEvent)=>void): void { this._register(DomUtils.addDisposableListener(domNode, DomUtils.EventType.CLICK, (e:MouseEvent) => listener(new StandardMouseEvent(e)))); } - protected onmousedown(domNode:HTMLElement, listener:(e:StandardMouseEvent)=>void): void { + protected onmousedown(domNode:HTMLElement, listener:(e:IMouseEvent)=>void): void { this._register(DomUtils.addDisposableListener(domNode, DomUtils.EventType.MOUSE_DOWN, (e:MouseEvent) => listener(new StandardMouseEvent(e)))); } - protected onmouseover(domNode:HTMLElement, listener:(e:StandardMouseEvent)=>void): void { + protected onmouseover(domNode:HTMLElement, listener:(e:IMouseEvent)=>void): void { this._register(DomUtils.addDisposableListener(domNode, DomUtils.EventType.MOUSE_OVER, (e:MouseEvent) => listener(new StandardMouseEvent(e)))); } - protected onnonbubblingmouseout(domNode:HTMLElement, listener:(e:StandardMouseEvent)=>void): void { + protected onnonbubblingmouseout(domNode:HTMLElement, listener:(e:IMouseEvent)=>void): void { this._register(DomUtils.addDisposableNonBubblingMouseOutListener(domNode, (e:MouseEvent) => listener(new StandardMouseEvent(e)))); } diff --git a/src/vs/base/parts/tree/browser/tree.ts b/src/vs/base/parts/tree/browser/tree.ts index 16f81a67715..07e8866f0bb 100644 --- a/src/vs/base/parts/tree/browser/tree.ts +++ b/src/vs/base/parts/tree/browser/tree.ts @@ -435,9 +435,9 @@ export /* abstract */ class ContextMenuEvent { export class MouseContextMenuEvent extends ContextMenuEvent { - private originalEvent: Mouse.StandardMouseEvent; + private originalEvent: Mouse.IMouseEvent; - constructor(originalEvent: Mouse.StandardMouseEvent) { + constructor(originalEvent: Mouse.IMouseEvent) { super(originalEvent.posx, originalEvent.posy, originalEvent.target); this.originalEvent = originalEvent; } @@ -474,7 +474,7 @@ export interface IController { /** * Called when an element is clicked. */ - onClick(tree: ITree, element: any, event: Mouse.StandardMouseEvent): boolean; + onClick(tree: ITree, element: any, event: Mouse.IMouseEvent): boolean; /** * Called when an element is requested for a context menu. @@ -499,12 +499,12 @@ export interface IController { /** * Called when a mouse button is pressed down on an element. */ - onMouseDown?(tree: ITree, element: any, event: Mouse.StandardMouseEvent): boolean; + onMouseDown?(tree: ITree, element: any, event: Mouse.IMouseEvent): boolean; /** * Called when a mouse button goes up on an element. */ - onMouseUp?(tree: ITree, element: any, event: Mouse.StandardMouseEvent): boolean; + onMouseUp?(tree: ITree, element: any, event: Mouse.IMouseEvent): boolean; } export enum DragOverEffect { diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts index 67ff07dc25b..d899d2b9e33 100644 --- a/src/vs/base/parts/tree/browser/treeDefaults.ts +++ b/src/vs/base/parts/tree/browser/treeDefaults.ts @@ -140,7 +140,7 @@ export class DefaultController implements _.IController { this.upKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_ENTER, this.onEnter.bind(this)); } - public onMouseDown(tree:_.ITree, element: any, event:mouse.StandardMouseEvent, origin: string = 'mouse'):boolean { + public onMouseDown(tree:_.ITree, element: any, event:mouse.IMouseEvent, origin: string = 'mouse'):boolean { if (this.options.clickBehavior === ClickBehavior.ON_MOUSE_DOWN && event.leftButton) { if (event.target) { if (event.target.tagName && event.target.tagName.toLowerCase() === 'input') { @@ -159,7 +159,7 @@ export class DefaultController implements _.IController { return false; } - public onClick(tree:_.ITree, element: any, event:mouse.StandardMouseEvent):boolean { + public onClick(tree:_.ITree, element: any, event:mouse.IMouseEvent):boolean { var isMac = platform.isMacintosh; // A Ctrl click on the Mac is a context menu event @@ -191,7 +191,7 @@ export class DefaultController implements _.IController { tree.clearFocus(payload); tree.clearSelection(payload); } else { - var isMouseDown = eventish && (eventish).browserEvent && (eventish).browserEvent.type === 'mousedown'; + var isMouseDown = eventish && (eventish).browserEvent && (eventish).browserEvent.type === 'mousedown'; if (!isMouseDown) { eventish.preventDefault(); // we cannot preventDefault onMouseDown because this would break DND otherwise } diff --git a/src/vs/editor/browser/controller/keyboardHandler.ts b/src/vs/editor/browser/controller/keyboardHandler.ts index f4a4802dcea..15548779cfc 100644 --- a/src/vs/editor/browser/controller/keyboardHandler.ts +++ b/src/vs/editor/browser/controller/keyboardHandler.ts @@ -5,11 +5,11 @@ 'use strict'; import * as EditorCommon from 'vs/editor/common/editorCommon'; -import DomUtils = require('vs/base/browser/dom'); -import Browser = require('vs/base/browser/browser'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as DomUtils from 'vs/base/browser/dom'; +import * as Browser from 'vs/base/browser/browser'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import * as Lifecycle from 'vs/base/common/lifecycle'; +import {IDisposable, Disposable, disposeAll} from 'vs/base/common/lifecycle'; import {Range} from 'vs/editor/common/core/range'; import Event, {Emitter} from 'vs/base/common/event'; import {TextAreaHandler} from 'vs/editor/common/controller/textAreaHandler'; @@ -91,7 +91,7 @@ class KeyboardEventWrapper implements IKeyboardEventWrapper { } } -class TextAreaWrapper extends Lifecycle.Disposable implements ITextAreaWrapper { +class TextAreaWrapper extends Disposable implements ITextAreaWrapper { private _textArea: HTMLTextAreaElement; @@ -182,14 +182,14 @@ class TextAreaWrapper extends Lifecycle.Disposable implements ITextAreaWrapper { } -export class KeyboardHandler extends ViewEventHandler implements Lifecycle.IDisposable { +export class KeyboardHandler extends ViewEventHandler implements IDisposable { private context:EditorBrowser.IViewContext; private viewController:EditorBrowser.IViewController; private viewHelper:EditorBrowser.IKeyboardHandlerHelper; private textArea:TextAreaWrapper; private textAreaHandler:TextAreaHandler; - private _toDispose:Lifecycle.IDisposable[]; + private _toDispose:IDisposable[]; private contentLeft:number; private contentWidth:number; @@ -267,7 +267,7 @@ export class KeyboardHandler extends ViewEventHandler implements Lifecycle.IDisp this.context.removeEventHandler(this); this.textAreaHandler.dispose(); this.textArea.dispose(); - this._toDispose = Lifecycle.disposeAll(this._toDispose); + this._toDispose = disposeAll(this._toDispose); } private _getStrategy(): TextAreaStrategy { diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts index 6055573f881..aaec5b11b98 100644 --- a/src/vs/editor/browser/controller/mouseHandler.ts +++ b/src/vs/editor/browser/controller/mouseHandler.ts @@ -4,25 +4,25 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Platform = require('vs/base/common/platform'); -import Browser = require('vs/base/browser/browser'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Mouse = require('vs/base/browser/mouseEvent'); -import DomUtils = require('vs/base/browser/dom'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import MouseTarget = require('vs/editor/browser/controller/mouseTarget'); +import * as Platform from 'vs/base/common/platform'; +import * as Browser from 'vs/base/browser/browser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as DomUtils from 'vs/base/browser/dom'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import {StandardMouseEvent, IMouseEvent} from 'vs/base/browser/mouseEvent'; +import {MouseTargetFactory, IDomNodePosition} from 'vs/editor/browser/controller/mouseTarget'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import Lifecycle = require('vs/base/common/lifecycle'); -import GlobalMouseMoveMonitor = require('vs/base/browser/globalMouseMoveMonitor'); +import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; +import {GlobalMouseMoveMonitor} from 'vs/base/browser/globalMouseMoveMonitor'; import {Position} from 'vs/editor/common/core/position'; import {Selection} from 'vs/editor/common/core/selection'; /** * Merges mouse events when mouse move events are throttled */ -function createMouseMoveEventMerger(mouseTargetFactory:MouseTarget.MouseTargetFactory) { - return function(lastEvent:Mouse.StandardMouseEvent, currentEvent:MouseEvent): Mouse.StandardMouseEvent { - var r = new Mouse.StandardMouseEvent(currentEvent); +function createMouseMoveEventMerger(mouseTargetFactory:MouseTargetFactory) { + return function(lastEvent:IMouseEvent, currentEvent:MouseEvent): IMouseEvent { + var r = new StandardMouseEvent(currentEvent); var targetIsWidget = false; if (mouseTargetFactory) { targetIsWidget = mouseTargetFactory.mouseTargetIsWidget(r); @@ -84,7 +84,7 @@ class EventGateKeeper { } } -export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposable { +export class MouseHandler extends ViewEventHandler implements IDisposable { static CLEAR_MOUSE_DOWN_COUNT_TIME = 400; // ms static MOUSE_MOVE_MINIMUM_TIME = 100; // ms @@ -92,16 +92,16 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa public context:EditorBrowser.IViewContext; public viewController:EditorBrowser.IViewController; public viewHelper:EditorBrowser.IPointerHandlerHelper; - public mouseTargetFactory: MouseTarget.MouseTargetFactory; - public listenersToRemove:Lifecycle.IDisposable[]; - private toDispose:Lifecycle.IDisposable[]; + public mouseTargetFactory: MouseTargetFactory; + public listenersToRemove:IDisposable[]; + private toDispose:IDisposable[]; private hideTextAreaTimeout: number; - private mouseMoveMonitor:GlobalMouseMoveMonitor.GlobalMouseMoveMonitor; + private mouseMoveMonitor:GlobalMouseMoveMonitor; private monitoringStartTargetType: EditorCommon.MouseTargetType; private currentSelection: EditorCommon.IEditorSelection; - private lastMouseEvent: Mouse.StandardMouseEvent; + private lastMouseEvent: IMouseEvent; private lastMouseDownPosition: EditorCommon.IEditorPosition; private lastMouseDownPositionEqualCount: number; private lastMouseDownCount: number; @@ -113,8 +113,8 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa private lastMouseLeaveTime:number; - private _mouseMoveEventHandler: EventGateKeeper; - private _mouseDownThenMoveEventHandler: EventGateKeeper; + private _mouseMoveEventHandler: EventGateKeeper; + private _mouseDownThenMoveEventHandler: EventGateKeeper; constructor(context:EditorBrowser.IViewContext, viewController:EditorBrowser.IViewController, viewHelper:EditorBrowser.IPointerHandlerHelper) { super(); @@ -122,13 +122,13 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa this.context = context; this.viewController = viewController; this.viewHelper = viewHelper; - this.mouseTargetFactory = new MouseTarget.MouseTargetFactory(this.context, viewHelper); + this.mouseTargetFactory = new MouseTargetFactory(this.context, viewHelper); this.listenersToRemove = []; this.hideTextAreaTimeout = -1; this.toDispose = []; - this.mouseMoveMonitor = new GlobalMouseMoveMonitor.GlobalMouseMoveMonitor(); + this.mouseMoveMonitor = new GlobalMouseMoveMonitor(); this.toDispose.push(this.mouseMoveMonitor); this.lastMouseEvent = null; @@ -147,13 +147,13 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa this.listenersToRemove.push(DomUtils.addDisposableListener(this.viewHelper.viewDomNode, 'contextmenu', (e: MouseEvent) => this._onContextMenu(e))); - this._mouseMoveEventHandler = new EventGateKeeper((e) => this._onMouseMove(e), () => !this.viewHelper.isDirty()); + this._mouseMoveEventHandler = new EventGateKeeper((e) => this._onMouseMove(e), () => !this.viewHelper.isDirty()); this.toDispose.push(this._mouseMoveEventHandler); this.listenersToRemove.push(DomUtils.addDisposableThrottledListener(this.viewHelper.viewDomNode, 'mousemove', this._mouseMoveEventHandler.handler, createMouseMoveEventMerger(this.mouseTargetFactory), MouseHandler.MOUSE_MOVE_MINIMUM_TIME)); - this._mouseDownThenMoveEventHandler = new EventGateKeeper((e) => this._onMouseDownThenMove(e), () => !this.viewHelper.isDirty()); + this._mouseDownThenMoveEventHandler = new EventGateKeeper((e) => this._onMouseDownThenMove(e), () => !this.viewHelper.isDirty()); this.toDispose.push(this._mouseDownThenMoveEventHandler); this.listenersToRemove.push(DomUtils.addDisposableListener(this.viewHelper.viewDomNode, 'mouseup', @@ -171,8 +171,8 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa public dispose(): void { this.context.removeEventHandler(this); - this.listenersToRemove = Lifecycle.disposeAll(this.listenersToRemove); - this.toDispose = Lifecycle.disposeAll(this.toDispose); + this.listenersToRemove = disposeAll(this.listenersToRemove); + this.toDispose = disposeAll(this.toDispose); this._unhook(); if (this.hideTextAreaTimeout !== -1) { window.clearTimeout(this.hideTextAreaTimeout); @@ -198,13 +198,13 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa } // --- end event handlers - protected _createMouseTarget(e:Mouse.StandardMouseEvent, testEventTarget:boolean): EditorBrowser.IMouseTarget { + protected _createMouseTarget(e:IMouseEvent, testEventTarget:boolean): EditorBrowser.IMouseTarget { var editorContent = DomUtils.getDomNodePosition(this.viewHelper.viewDomNode); return this.mouseTargetFactory.createMouseTarget(this._layoutInfo, editorContent, e, testEventTarget); } private _onContextMenu(rawEvent: MouseEvent): void { - var e = new Mouse.StandardMouseEvent(rawEvent); + var e = new StandardMouseEvent(rawEvent); var t = this._createMouseTarget(e, true); var mouseEvent: EditorBrowser.IMouseEvent = { event: e, @@ -213,7 +213,7 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa this.viewController.emitContextMenu(mouseEvent); } - private _onMouseMove(e: Mouse.StandardMouseEvent): void { + private _onMouseMove(e: IMouseEvent): void { if (this.mouseMoveMonitor.isMonitoring()) { // In selection/drag operation return; @@ -235,14 +235,14 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa private _onMouseLeave(rawEvent: MouseEvent): void { this.lastMouseLeaveTime = (new Date()).getTime(); var mouseEvent: EditorBrowser.IMouseEvent = { - event: new Mouse.StandardMouseEvent(rawEvent), + event: new StandardMouseEvent(rawEvent), target: null }; this.viewController.emitMouseLeave(mouseEvent); } public _onMouseUp(rawEvent: MouseEvent): void { - var e = new Mouse.StandardMouseEvent(rawEvent); + var e = new StandardMouseEvent(rawEvent); var t = this._createMouseTarget(e, true); var mouseEvent: EditorBrowser.IMouseEvent = { @@ -253,7 +253,7 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa } public _onMouseDown(rawEvent: MouseEvent): void { - var e = new Mouse.StandardMouseEvent(rawEvent); + var e = new StandardMouseEvent(rawEvent); var t = this._createMouseTarget(e, true); var targetIsContent = (t.type === EditorCommon.MouseTargetType.CONTENT_TEXT || t.type === EditorCommon.MouseTargetType.CONTENT_EMPTY); @@ -328,7 +328,7 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa ); } - private _onMouseDownThenMove(e:Mouse.StandardMouseEvent): void { + private _onMouseDownThenMove(e:IMouseEvent): void { this._updateMouse(this.monitoringStartTargetType, e, true); } @@ -339,7 +339,7 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa } } - private _getPositionOutsideEditor(editorContent: MouseTarget.IDomNodePosition, e: Mouse.StandardMouseEvent): EditorCommon.IPosition { + private _getPositionOutsideEditor(editorContent: IDomNodePosition, e: IMouseEvent): EditorCommon.IPosition { var possibleLineNumber: number; if (e.posy < editorContent.top) { @@ -377,7 +377,7 @@ export class MouseHandler extends ViewEventHandler implements Lifecycle.IDisposa return null; } - private _updateMouse(startTargetType:EditorCommon.MouseTargetType, e:Mouse.StandardMouseEvent, inSelectionMode:boolean, setMouseDownCount:number = 0): void { + private _updateMouse(startTargetType:EditorCommon.MouseTargetType, e:IMouseEvent, inSelectionMode:boolean, setMouseDownCount:number = 0): void { e = e || this.lastMouseEvent; this.lastMouseEvent = e; diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts index 7888e30ee72..3cd9840023a 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Mouse = require('vs/base/browser/mouseEvent'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import {IMouseEvent} from 'vs/base/browser/mouseEvent'; import {Range as EditorRange} from 'vs/editor/common/core/range'; import {Position} from 'vs/editor/common/core/position'; @@ -157,7 +157,7 @@ export class MouseTargetFactory { return path.join('/'); } - public mouseTargetIsWidget(e:Mouse.StandardMouseEvent): boolean { + public mouseTargetIsWidget(e:IMouseEvent): boolean { var t:Element = e.target; var path = this.getClassNamePathTo(t, this.viewHelper.viewDomNode); @@ -174,7 +174,7 @@ export class MouseTargetFactory { return false; } - public createMouseTarget(layoutInfo:EditorCommon.IEditorLayoutInfo, editorContent:IDomNodePosition, e:Mouse.StandardMouseEvent, testEventTarget:boolean): EditorBrowser.IMouseTarget { + public createMouseTarget(layoutInfo:EditorCommon.IEditorLayoutInfo, editorContent:IDomNodePosition, e:IMouseEvent, testEventTarget:boolean): EditorBrowser.IMouseTarget { try { var r = this._unsafeCreateMouseTarget(layoutInfo, editorContent, e, testEventTarget); return r; @@ -183,7 +183,7 @@ export class MouseTargetFactory { } } - private _unsafeCreateMouseTarget(layoutInfo:EditorCommon.IEditorLayoutInfo, editorContent:IDomNodePosition, e:Mouse.StandardMouseEvent, testEventTarget:boolean): EditorBrowser.IMouseTarget { + private _unsafeCreateMouseTarget(layoutInfo:EditorCommon.IEditorLayoutInfo, editorContent:IDomNodePosition, e:IMouseEvent, testEventTarget:boolean): EditorBrowser.IMouseTarget { var mouseVerticalOffset = Math.max(0, this.viewHelper.getScrollTop() + (e.posy - editorContent.top)); var mouseContentHorizontalOffset = this.viewHelper.getScrollLeft() + (e.posx - editorContent.left) - layoutInfo.contentLeft; @@ -335,7 +335,7 @@ export class MouseTargetFactory { /** * Most probably WebKit browsers */ - private _doHitTestWithCaretRangeFromPoint(editorContent:IDomNodePosition, e: Mouse.StandardMouseEvent, mouseVerticalOffset: number): IHitTestResult { + private _doHitTestWithCaretRangeFromPoint(editorContent:IDomNodePosition, e: IMouseEvent, mouseVerticalOffset: number): IHitTestResult { // In Chrome, especially on Linux it is possible to click between lines, // so try to adjust the `hity` below so that it lands in the center of a line @@ -396,7 +396,7 @@ export class MouseTargetFactory { /** * Most probably Gecko */ - private _doHitTestWithCaretPositionFromPoint(e: Mouse.StandardMouseEvent): IHitTestResult { + private _doHitTestWithCaretPositionFromPoint(e: IMouseEvent): IHitTestResult { var resultPosition: EditorCommon.IPosition = null; var resultHitTarget: Element = null; @@ -420,7 +420,7 @@ export class MouseTargetFactory { /** * Most probably IE */ - private _doHitTestWithMoveToPoint(e: Mouse.StandardMouseEvent): IHitTestResult { + private _doHitTestWithMoveToPoint(e: IMouseEvent): IHitTestResult { var resultPosition: EditorCommon.IPosition = null; var resultHitTarget: Element = null; @@ -469,7 +469,7 @@ export class MouseTargetFactory { }; } - private _doHitTest(editorContent:IDomNodePosition, e:Mouse.StandardMouseEvent, mouseVerticalOffset: number): IHitTestResult { + private _doHitTest(editorContent:IDomNodePosition, e:IMouseEvent, mouseVerticalOffset: number): IHitTestResult { // State of the art (18.10.2012): // The spec says browsers should support document.caretPositionFromPoint, but nobody implemented it (http://dev.w3.org/csswg/cssom-view/) // Gecko: diff --git a/src/vs/editor/browser/controller/pointerHandler.ts b/src/vs/editor/browser/controller/pointerHandler.ts index cad83ea41e0..bf083a08ba7 100644 --- a/src/vs/editor/browser/controller/pointerHandler.ts +++ b/src/vs/editor/browser/controller/pointerHandler.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Mouse = require('vs/base/browser/mouseEvent'); import DomUtils = require('vs/base/browser/dom'); import Touch = require('vs/base/browser/touch'); import MouseHandler = require('vs/editor/browser/controller/mouseHandler'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); import Lifecycle = require('vs/base/common/lifecycle'); interface IThrottledGestureEvent { diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts index 927dda4b279..eb50ca0656a 100644 --- a/src/vs/editor/browser/editorBrowser.ts +++ b/src/vs/editor/browser/editorBrowser.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import EventEmitter = require('vs/base/common/eventEmitter'); import Lifecycle = require('vs/base/common/lifecycle'); import Mouse = require('vs/base/browser/mouseEvent'); diff --git a/src/vs/editor/browser/editorBrowserExtensions.ts b/src/vs/editor/browser/editorBrowserExtensions.ts index 5e48537057e..14d88e5e8b2 100644 --- a/src/vs/editor/browser/editorBrowserExtensions.ts +++ b/src/vs/editor/browser/editorBrowserExtensions.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Platform = require('vs/platform/platform'); import {IInstantiationService, INewConstructorSignature1} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/browser/standalone/colorizer.ts b/src/vs/editor/browser/standalone/colorizer.ts index 490801a8f4f..c66e6265bc2 100644 --- a/src/vs/editor/browser/standalone/colorizer.ts +++ b/src/vs/editor/browser/standalone/colorizer.ts @@ -6,8 +6,8 @@ import {TPromise} from 'vs/base/common/winjs.base'; import Schedulers = require('vs/base/common/async'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {IModeService} from 'vs/editor/common/services/modeService'; import {IRenderLineOutput, renderLine} from 'vs/editor/common/viewLayout/viewLineRenderer'; diff --git a/src/vs/editor/browser/standalone/simpleServices.ts b/src/vs/editor/browser/standalone/simpleServices.ts index 19125277662..5d47f8ca77e 100644 --- a/src/vs/editor/browser/standalone/simpleServices.ts +++ b/src/vs/editor/browser/standalone/simpleServices.ts @@ -8,8 +8,8 @@ import {TPromise} from 'vs/base/common/winjs.base'; import Errors = require('vs/base/common/errors'); import Network = require('vs/base/common/network'); import EventEmitter = require('vs/base/common/eventEmitter'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Severity from 'vs/base/common/severity'; import Lifecycle = require('vs/base/common/lifecycle'); import KeybindingService = require('vs/platform/keybinding/browser/keybindingServiceImpl'); diff --git a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts index 73d1c7d8445..a0306ddfb42 100644 --- a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts +++ b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts @@ -8,9 +8,9 @@ import {TPromise} from 'vs/base/common/winjs.base'; import CodeEditorWidget = require('vs/editor/browser/widget/codeEditorWidget'); import SimpleServices = require('vs/editor/browser/standalone/simpleServices'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import standaloneServices = require('vs/editor/browser/standalone/standaloneServices'); import URI from 'vs/base/common/uri'; import Lifecycle = require('vs/base/common/lifecycle'); diff --git a/src/vs/editor/browser/standalone/standaloneEditor.ts b/src/vs/editor/browser/standalone/standaloneEditor.ts index 329cec21083..8fc23b18674 100644 --- a/src/vs/editor/browser/standalone/standaloneEditor.ts +++ b/src/vs/editor/browser/standalone/standaloneEditor.ts @@ -9,8 +9,8 @@ import './standaloneSchemas'; import Colorizer = require('vs/editor/browser/standalone/colorizer'); import standaloneCodeEditor = require('vs/editor/browser/standalone/standaloneCodeEditor'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import {ILanguageDef} from 'vs/editor/standalone-languages/types'; import {IJSONSchema} from 'vs/base/common/jsonSchema'; diff --git a/src/vs/editor/browser/standalone/standaloneSchemas.ts b/src/vs/editor/browser/standalone/standaloneSchemas.ts index 10ed7efc5e4..910da85c989 100644 --- a/src/vs/editor/browser/standalone/standaloneSchemas.ts +++ b/src/vs/editor/browser/standalone/standaloneSchemas.ts @@ -5,7 +5,7 @@ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {IJSONSchema} from 'vs/base/common/jsonSchema'; this.MonacoEditorSchemas = this.MonacoEditorSchemas || {}; diff --git a/src/vs/editor/browser/view/viewController.ts b/src/vs/editor/browser/view/viewController.ts index a14d0aa9972..72a3c7d9cd5 100644 --- a/src/vs/editor/browser/view/viewController.ts +++ b/src/vs/editor/browser/view/viewController.ts @@ -5,10 +5,10 @@ 'use strict'; import EventEmitter = require('vs/base/common/eventEmitter'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import Configuration = require('vs/editor/browser/config/configuration'); import Position = require('vs/editor/common/core/position'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; export class ViewController implements EditorBrowser.IViewController { diff --git a/src/vs/editor/browser/view/viewEventDispatcher.ts b/src/vs/editor/browser/view/viewEventDispatcher.ts index d223d74afa8..7491b51dd4b 100644 --- a/src/vs/editor/browser/view/viewEventDispatcher.ts +++ b/src/vs/editor/browser/view/viewEventDispatcher.ts @@ -6,8 +6,8 @@ import EventEmitter = require('vs/base/common/eventEmitter'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class ViewEventDispatcher implements EditorCommon.IViewEventBus { diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index 1c2a0c10af7..36d7394e49b 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/src/vs/editor/browser/view/viewImpl.ts @@ -40,8 +40,8 @@ import {Rulers} from 'vs/editor/browser/viewParts/rulers/rulers'; import Browser = require('vs/base/browser/browser'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import {Range} from 'vs/editor/common/core/range'; import {IKeybindingService, IKeybindingContextKey} from 'vs/platform/keybinding/common/keybindingService'; diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts index f1ff9d9a5d1..c59c129e2ae 100644 --- a/src/vs/editor/browser/view/viewLayer.ts +++ b/src/vs/editor/browser/view/viewLayer.ts @@ -7,8 +7,8 @@ import DomUtils = require('vs/base/browser/dom'); import {ViewPart} from 'vs/editor/browser/view/viewPart'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface IVisibleLineData { getDomNode(): HTMLElement; diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts index 5a94a8e0aa4..61f8a48e9ea 100644 --- a/src/vs/editor/browser/view/viewOverlays.ts +++ b/src/vs/editor/browser/view/viewOverlays.ts @@ -8,8 +8,8 @@ import Browser = require('vs/base/browser/browser'); import DomUtils = require('vs/base/browser/dom'); import {ViewLayer, IVisibleLineData} from 'vs/editor/browser/view/viewLayer'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {StyleMutator} from 'vs/base/browser/styleMutator'; export class ViewOverlays extends ViewLayer { diff --git a/src/vs/editor/browser/view/viewPart.ts b/src/vs/editor/browser/view/viewPart.ts index c3d41622251..a43f44302fd 100644 --- a/src/vs/editor/browser/view/viewPart.ts +++ b/src/vs/editor/browser/view/viewPart.ts @@ -5,7 +5,7 @@ 'use strict'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; export interface IRunner { (): void; diff --git a/src/vs/editor/browser/viewLayout/layoutProvider.ts b/src/vs/editor/browser/viewLayout/layoutProvider.ts index 586f6ac3fcd..b3d9d1dd7c0 100644 --- a/src/vs/editor/browser/viewLayout/layoutProvider.ts +++ b/src/vs/editor/browser/viewLayout/layoutProvider.ts @@ -10,8 +10,8 @@ import {LinesLayout} from 'vs/editor/common/viewLayout/linesLayout'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; import {ScrollManager} from 'vs/editor/browser/viewLayout/scrollManager'; import {EditorScrollable} from 'vs/editor/common/viewLayout/editorScrollable'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class LayoutProvider extends ViewEventHandler implements Lifecycle.IDisposable, EditorBrowser.ILayoutProvider, EditorCommon.IWhitespaceManager { diff --git a/src/vs/editor/browser/viewLayout/scrollManager.ts b/src/vs/editor/browser/viewLayout/scrollManager.ts index db760a1f4e5..529ae3132fd 100644 --- a/src/vs/editor/browser/viewLayout/scrollManager.ts +++ b/src/vs/editor/browser/viewLayout/scrollManager.ts @@ -10,8 +10,8 @@ import DomUtils = require('vs/base/browser/dom'); import Lifecycle = require('vs/base/common/lifecycle'); import {EditorScrollable} from 'vs/editor/common/viewLayout/editorScrollable'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; function addPropertyIfPresent(src:any, dst:any, prop:string): void { if (src.hasOwnProperty(prop)) { diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts index a4cf1721afc..a15955220fa 100644 --- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts +++ b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts @@ -8,8 +8,8 @@ import 'vs/css!./currentLineHighlight'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class CurrentLineHighlightOverlay extends ViewEventHandler implements EditorBrowser.IDynamicViewOverlay { private _context:EditorBrowser.IViewContext; diff --git a/src/vs/editor/browser/viewParts/decorations/decorations.ts b/src/vs/editor/browser/viewParts/decorations/decorations.ts index a1c41a420c7..a4886dd1832 100644 --- a/src/vs/editor/browser/viewParts/decorations/decorations.ts +++ b/src/vs/editor/browser/viewParts/decorations/decorations.ts @@ -7,8 +7,8 @@ import 'vs/css!./decorations'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; interface IRenderResult { [lineNumber:string]:string[]; diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts index fb711b10734..07fcd5fdc75 100644 --- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts +++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts @@ -8,8 +8,8 @@ import 'vs/css!./glyphMargin'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; interface IRenderResult { [lineNumber:string]:string[]; diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts index 9a088e69c53..76793e849a7 100644 --- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts +++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts @@ -8,8 +8,8 @@ import 'vs/css!./lineNumbers'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; import * as Platform from 'vs/base/common/platform'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; interface IRenderResult { [lineNumber:string]:string[]; diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/lines/viewLines.ts index e9a08026304..3fd5116bb3f 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLines.ts +++ b/src/vs/editor/browser/viewParts/lines/viewLines.ts @@ -9,8 +9,8 @@ import Schedulers = require('vs/base/common/async'); import {createLine, ViewLine} from 'vs/editor/browser/viewParts/lines/viewLine'; import {IVisibleLineData, ViewLayer} from 'vs/editor/browser/view/viewLayer'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; import {StyleMutator} from 'vs/base/browser/styleMutator'; diff --git a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts index 31625858b9c..7d27f5d2d2a 100644 --- a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts +++ b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts @@ -7,8 +7,8 @@ import 'vs/css!./linesDecorations'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; interface IRenderResult { [lineNumber:string]:string[]; diff --git a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts index ddc7600dd91..1223acc9239 100644 --- a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts +++ b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts @@ -8,8 +8,8 @@ import 'vs/css!./overlayWidgets'; import {ViewPart} from 'vs/editor/browser/view/viewPart'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {StyleMutator} from 'vs/base/browser/styleMutator'; interface IWidgetData { diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts index 2792f9e7d1e..8e9531271b9 100644 --- a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts +++ b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts @@ -6,8 +6,8 @@ import {OverviewRulerImpl} from 'vs/editor/browser/viewParts/overviewRuler/overviewRulerImpl'; import {ViewPart} from 'vs/editor/browser/view/viewPart'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Themes = require('vs/platform/theme/common/themes'); export class DecorationsOverviewRuler extends ViewPart { diff --git a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts index fb0cac62701..265b8fd544b 100644 --- a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts +++ b/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts @@ -6,8 +6,8 @@ import {OverviewRulerImpl} from 'vs/editor/browser/viewParts/overviewRuler/overviewRulerImpl'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class OverviewRuler extends ViewEventHandler implements EditorBrowser.IOverviewRuler { diff --git a/src/vs/editor/browser/viewParts/overviewRuler/overviewRulerImpl.ts b/src/vs/editor/browser/viewParts/overviewRuler/overviewRulerImpl.ts index c0b7947d880..056481ae300 100644 --- a/src/vs/editor/browser/viewParts/overviewRuler/overviewRulerImpl.ts +++ b/src/vs/editor/browser/viewParts/overviewRuler/overviewRulerImpl.ts @@ -7,8 +7,8 @@ import Browser = require('vs/base/browser/browser'); import {StyleMutator} from 'vs/base/browser/styleMutator'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; interface IColorZone { from: number; diff --git a/src/vs/editor/browser/viewParts/rulers/rulers.ts b/src/vs/editor/browser/viewParts/rulers/rulers.ts index 7bed7b5de33..46e0c1893cd 100644 --- a/src/vs/editor/browser/viewParts/rulers/rulers.ts +++ b/src/vs/editor/browser/viewParts/rulers/rulers.ts @@ -8,8 +8,8 @@ import 'vs/css!./rulers'; import {ViewPart} from 'vs/editor/browser/view/viewPart'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {StyleMutator} from 'vs/base/browser/styleMutator'; export class Rulers extends ViewPart { diff --git a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts index 9ff7aa3bcc7..be953398155 100644 --- a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts +++ b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts @@ -9,8 +9,8 @@ import 'vs/css!./scrollDecoration'; import DomUtils = require('vs/base/browser/dom'); import {ViewPart} from 'vs/editor/browser/view/viewPart'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {StyleMutator} from 'vs/base/browser/styleMutator'; export class ScrollDecorationViewPart extends ViewPart { diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts index fe754ea73c6..ba7f84332d6 100644 --- a/src/vs/editor/browser/viewParts/selections/selections.ts +++ b/src/vs/editor/browser/viewParts/selections/selections.ts @@ -7,8 +7,8 @@ import 'vs/css!./selections'; import {ViewEventHandler} from 'vs/editor/common/viewModel/viewEventHandler'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; type HorizontalRange = EditorCommon.HorizontalRange; type LineVisibleRanges = EditorCommon.LineVisibleRanges; diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts index 707e653a898..a6971c143c0 100644 --- a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts +++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {StyleMutator} from 'vs/base/browser/styleMutator'; export class ViewCursor { diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts index 085c2e2b53c..1f621051827 100644 --- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts +++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts @@ -10,8 +10,8 @@ import Browser = require('vs/base/browser/browser'); import {ViewCursor} from 'vs/editor/browser/viewParts/viewCursors/viewCursor'; import {ViewPart} from 'vs/editor/browser/view/viewPart'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; enum RenderType { Hidden, diff --git a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts index 62e794ba9e5..4b99571c3c8 100644 --- a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts +++ b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts @@ -7,8 +7,8 @@ import errors = require('vs/base/common/errors'); import {ViewPart} from 'vs/editor/browser/view/viewPart'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {StyleMutator} from 'vs/base/browser/styleMutator'; export interface IMyViewZone { diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index 9b6a9120f21..58b81f078b8 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -12,8 +12,8 @@ import Objects = require('vs/base/common/objects'); import CodeEditorWidget = require('vs/editor/browser/widget/codeEditorWidget'); import DomUtils = require('vs/base/browser/dom'); import EventEmitter = require('vs/base/common/eventEmitter'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import Actions = require('vs/base/common/actions'); import Sash = require('vs/base/browser/ui/sash/sash'); import ViewLineParts = require('vs/editor/common/viewLayout/viewLineParts'); diff --git a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts index 4b17c2c552e..bcfa97ddfa7 100644 --- a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts +++ b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts @@ -5,8 +5,8 @@ 'use strict'; import CodeEditorWidget = require('vs/editor/browser/widget/codeEditorWidget'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Objects = require('vs/base/common/objects'); import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/editor/common/commands/replaceCommand.ts b/src/vs/editor/common/commands/replaceCommand.ts index fbedfa21fbd..f3631fbcdba 100644 --- a/src/vs/editor/common/commands/replaceCommand.ts +++ b/src/vs/editor/common/commands/replaceCommand.ts @@ -5,7 +5,7 @@ 'use strict'; import {Selection} from 'vs/editor/common/core/selection'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class ReplaceCommand implements EditorCommon.ICommand { diff --git a/src/vs/editor/common/commands/shiftCommand.ts b/src/vs/editor/common/commands/shiftCommand.ts index 957f9bc999b..0928efd4cfc 100644 --- a/src/vs/editor/common/commands/shiftCommand.ts +++ b/src/vs/editor/common/commands/shiftCommand.ts @@ -7,7 +7,7 @@ import Strings = require('vs/base/common/strings'); import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {CursorMoveHelper} from 'vs/editor/common/controller/cursorMoveHelper'; import {getRawEnterActionAtPosition} from 'vs/editor/common/modes/supports/onEnter'; diff --git a/src/vs/editor/common/commands/surroundSelectionCommand.ts b/src/vs/editor/common/commands/surroundSelectionCommand.ts index 41863c4e878..76dcbc86276 100644 --- a/src/vs/editor/common/commands/surroundSelectionCommand.ts +++ b/src/vs/editor/common/commands/surroundSelectionCommand.ts @@ -6,7 +6,7 @@ import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class SurroundSelectionCommand implements EditorCommon.ICommand { private _range: EditorCommon.IEditorSelection; diff --git a/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts b/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts index e41ba373f17..4d7a04566d7 100644 --- a/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts +++ b/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts @@ -6,7 +6,7 @@ import {Range} from 'vs/editor/common/core/range'; import {EditOperation} from 'vs/editor/common/core/editOperation'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Strings = require('vs/base/common/strings'); export class TrimTrailingWhitespaceCommand implements EditorCommon.ICommand { diff --git a/src/vs/editor/common/config/config.ts b/src/vs/editor/common/config/config.ts index 572d5caa808..9d46fc1f50c 100644 --- a/src/vs/editor/common/config/config.ts +++ b/src/vs/editor/common/config/config.ts @@ -9,7 +9,7 @@ import {KbExpr, IKeybindings} from 'vs/platform/keybinding/common/keybindingServ import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; import {IEditorService} from 'vs/platform/editor/common/editor'; import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; export function findFocusedEditor(commandId: string, accessor: ServicesAccessor, args: any, complain: boolean): EditorCommon.ICommonCodeEditor { diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts index 09dd1ccb52e..f3145d5b44c 100644 --- a/src/vs/editor/common/controller/cursor.ts +++ b/src/vs/editor/common/controller/cursor.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {EventEmitter} from 'vs/base/common/eventEmitter'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; @@ -13,7 +13,7 @@ import {ReplaceCommand} from 'vs/editor/common/commands/replaceCommand'; import {OneCursor, OneCursorOp, IViewModelHelper, IOneCursorOperationContext, IPostOperationRunnable} from 'vs/editor/common/controller/oneCursor'; import {DispatcherEvent} from 'vs/editor/common/controller/handlerDispatcher'; import {CursorCollection, ICursorCollectionState} from 'vs/editor/common/controller/cursorCollection'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Errors = require('vs/base/common/errors'); import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; diff --git a/src/vs/editor/common/controller/cursorCollection.ts b/src/vs/editor/common/controller/cursorCollection.ts index fe78aafd2d3..610de67018b 100644 --- a/src/vs/editor/common/controller/cursorCollection.ts +++ b/src/vs/editor/common/controller/cursorCollection.ts @@ -7,7 +7,7 @@ import {Selection} from 'vs/editor/common/core/selection'; import {OneCursor, IOneCursorState, IModeConfiguration, IViewModelHelper} from 'vs/editor/common/controller/oneCursor'; import {IAutoClosingPair} from 'vs/editor/common/modes'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Errors = require('vs/base/common/errors'); export interface ICursorCollectionState { diff --git a/src/vs/editor/common/controller/cursorMoveHelper.ts b/src/vs/editor/common/controller/cursorMoveHelper.ts index 33e43385741..e81cf15feac 100644 --- a/src/vs/editor/common/controller/cursorMoveHelper.ts +++ b/src/vs/editor/common/controller/cursorMoveHelper.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface IMoveResult { lineNumber:number; diff --git a/src/vs/editor/common/controller/handlerDispatcher.ts b/src/vs/editor/common/controller/handlerDispatcher.ts index 01335232d41..c8352b73330 100644 --- a/src/vs/editor/common/controller/handlerDispatcher.ts +++ b/src/vs/editor/common/controller/handlerDispatcher.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class DispatcherEvent implements EditorCommon.IDispatcherEvent { diff --git a/src/vs/editor/common/controller/oneCursor.ts b/src/vs/editor/common/controller/oneCursor.ts index 7e933bd0d17..53fc7321043 100644 --- a/src/vs/editor/common/controller/oneCursor.ts +++ b/src/vs/editor/common/controller/oneCursor.ts @@ -13,7 +13,7 @@ import {SurroundSelectionCommand} from 'vs/editor/common/commands/surroundSelect import {Selection} from 'vs/editor/common/core/selection'; import {IndentAction,IElectricAction} from 'vs/editor/common/modes'; import {CursorMoveHelper, ICursorMoveHelperModel, IMoveResult} from 'vs/editor/common/controller/cursorMoveHelper'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Errors = require('vs/base/common/errors'); import {getEnterActionAtPosition} from 'vs/editor/common/modes/supports/onEnter'; diff --git a/src/vs/editor/common/core/editOperation.ts b/src/vs/editor/common/core/editOperation.ts index b550e5d4ff0..14e57212a5b 100644 --- a/src/vs/editor/common/core/editOperation.ts +++ b/src/vs/editor/common/core/editOperation.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; export class EditOperation { diff --git a/src/vs/editor/common/core/editorState.ts b/src/vs/editor/common/core/editorState.ts index 438f0f952f3..e4bc930bc2d 100644 --- a/src/vs/editor/common/core/editorState.ts +++ b/src/vs/editor/common/core/editorState.ts @@ -5,7 +5,7 @@ 'use strict'; import Strings = require('vs/base/common/strings'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class EditorState implements EditorCommon.ICodeEditorState { diff --git a/src/vs/editor/common/core/position.ts b/src/vs/editor/common/core/position.ts index a0b8e7e1af6..2c47dbb7f72 100644 --- a/src/vs/editor/common/core/position.ts +++ b/src/vs/editor/common/core/position.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class Position implements EditorCommon.IEditorPosition { diff --git a/src/vs/editor/common/core/range.ts b/src/vs/editor/common/core/range.ts index f1625a43a25..241c1677752 100644 --- a/src/vs/editor/common/core/range.ts +++ b/src/vs/editor/common/core/range.ts @@ -6,7 +6,7 @@ 'use strict'; import {Position} from 'vs/editor/common/core/position'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class Range implements EditorCommon.IEditorRange { diff --git a/src/vs/editor/common/core/selection.ts b/src/vs/editor/common/core/selection.ts index eac5c4d2aeb..b13892f6bae 100644 --- a/src/vs/editor/common/core/selection.ts +++ b/src/vs/editor/common/core/selection.ts @@ -5,7 +5,7 @@ 'use strict'; import {Range} from 'vs/editor/common/core/range'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class Selection extends Range implements EditorCommon.IEditorSelection { public selectionStartLineNumber: number; diff --git a/src/vs/editor/common/diff/diffComputer.ts b/src/vs/editor/common/diff/diffComputer.ts index dd3480eb581..9c64b935b9e 100644 --- a/src/vs/editor/common/diff/diffComputer.ts +++ b/src/vs/editor/common/diff/diffComputer.ts @@ -6,7 +6,7 @@ import {ISequence, IDiffChange, LcsDiff} from 'vs/base/common/diff/diff'; import Strings = require('vs/base/common/strings'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; var MAXIMUM_RUN_TIME = 5000; // 5 seconds var MINIMUM_MATCHING_CHARACTER_LENGTH = 3; diff --git a/src/vs/editor/common/diff/nullDiffComputer.ts b/src/vs/editor/common/diff/nullDiffComputer.ts index 705a69931d1..419ed843ebe 100644 --- a/src/vs/editor/common/diff/nullDiffComputer.ts +++ b/src/vs/editor/common/diff/nullDiffComputer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class DiffComputer { diff --git a/src/vs/editor/common/editorAction.ts b/src/vs/editor/common/editorAction.ts index b3ce3fa332e..f97b55674be 100644 --- a/src/vs/editor/common/editorAction.ts +++ b/src/vs/editor/common/editorAction.ts @@ -6,8 +6,8 @@ import {Action} from 'vs/base/common/actions'; import {TPromise} from 'vs/base/common/winjs.base'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import Strings = require('vs/base/common/strings'); import editorActionEnablement = require('vs/editor/common/editorActionEnablement'); import {INullService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/common/editorActionEnablement.ts b/src/vs/editor/common/editorActionEnablement.ts index 2b69600d011..04efd3d636d 100644 --- a/src/vs/editor/common/editorActionEnablement.ts +++ b/src/vs/editor/common/editorActionEnablement.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; export enum Behaviour { diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index 7d63656fa40..7d0acb8809d 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -5,7 +5,7 @@ 'use strict'; import {IEventEmitter, ListenerUnbind} from 'vs/base/common/eventEmitter'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import TokensBinaryEncoding = require('vs/editor/common/model/tokensBinaryEncoding'); import {IInstantiationService, INewConstructorSignature1, INewConstructorSignature2} from 'vs/platform/instantiation/common/instantiation'; import {IAction} from 'vs/base/common/actions'; diff --git a/src/vs/editor/common/editorCommonExtensions.ts b/src/vs/editor/common/editorCommonExtensions.ts index c11fba2006f..b7957096e11 100644 --- a/src/vs/editor/common/editorCommonExtensions.ts +++ b/src/vs/editor/common/editorCommonExtensions.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {onUnexpectedError, illegalArgument} from 'vs/base/common/errors'; import URI from 'vs/base/common/uri'; import {Position} from 'vs/editor/common/core/position'; diff --git a/src/vs/editor/common/model/editStack.ts b/src/vs/editor/common/model/editStack.ts index 9170392f11d..da33decbf9b 100644 --- a/src/vs/editor/common/model/editStack.ts +++ b/src/vs/editor/common/model/editStack.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Errors = require('vs/base/common/errors'); interface IEditOperation { diff --git a/src/vs/editor/common/model/editableTextModel.ts b/src/vs/editor/common/model/editableTextModel.ts index 314245f9fef..8db4eb5d3be 100644 --- a/src/vs/editor/common/model/editableTextModel.ts +++ b/src/vs/editor/common/model/editableTextModel.ts @@ -10,7 +10,7 @@ import {EditStack} from 'vs/editor/common/model/editStack'; import {ModelLine, ILineEdit, ILineMarker} from 'vs/editor/common/model/modelLine'; import {TextModelWithDecorations, DeferredEventsBuilder} from 'vs/editor/common/model/textModelWithDecorations'; import {IMode} from 'vs/editor/common/modes'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface IDeltaSingleEditOperation { original: IValidatedEditOperation; diff --git a/src/vs/editor/common/model/mirrorModel.ts b/src/vs/editor/common/model/mirrorModel.ts index 8c048cf0bb0..cb812b3a42e 100644 --- a/src/vs/editor/common/model/mirrorModel.ts +++ b/src/vs/editor/common/model/mirrorModel.ts @@ -10,7 +10,7 @@ import {IMode} from 'vs/editor/common/modes'; import {TextModel} from 'vs/editor/common/model/textModel'; import {TextModelWithTokens} from 'vs/editor/common/model/textModelWithTokens'; import {ModelLine} from 'vs/editor/common/model/modelLine'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IResourceService} from 'vs/editor/common/services/resourceService'; import URI from 'vs/base/common/uri'; import {disposeAll} from 'vs/base/common/lifecycle'; diff --git a/src/vs/editor/common/model/model.ts b/src/vs/editor/common/model/model.ts index 0e6626b76e9..3db982ad430 100644 --- a/src/vs/editor/common/model/model.ts +++ b/src/vs/editor/common/model/model.ts @@ -8,7 +8,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {IMode} from 'vs/editor/common/modes'; import {TextModel} from 'vs/editor/common/model/textModel'; import {EditableTextModel} from 'vs/editor/common/model/editableTextModel'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import URI from 'vs/base/common/uri'; // The hierarchy is: diff --git a/src/vs/editor/common/model/modelLine.ts b/src/vs/editor/common/model/modelLine.ts index 1892ab87957..866169d9232 100644 --- a/src/vs/editor/common/model/modelLine.ts +++ b/src/vs/editor/common/model/modelLine.ts @@ -5,8 +5,8 @@ 'use strict'; import Strings = require('vs/base/common/strings'); -import Modes = require('vs/editor/common/modes'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as Modes from 'vs/editor/common/modes'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface ILineEdit { startColumn: number; diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 6f332ea1640..e48d5749726 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -9,7 +9,7 @@ import Strings = require('vs/base/common/strings'); import {Position} from 'vs/editor/common/core/position'; import {Range} from 'vs/editor/common/core/range'; import {ModelLine} from 'vs/editor/common/model/modelLine'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Platform = require('vs/base/common/platform'); var __space = ' '.charCodeAt(0); diff --git a/src/vs/editor/common/model/textModelWithDecorations.ts b/src/vs/editor/common/model/textModelWithDecorations.ts index f0f93838196..20d680db5fa 100644 --- a/src/vs/editor/common/model/textModelWithDecorations.ts +++ b/src/vs/editor/common/model/textModelWithDecorations.ts @@ -8,7 +8,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; import Strings = require('vs/base/common/strings'); import {IMode} from 'vs/editor/common/modes'; import {TextModelWithTrackedRanges} from 'vs/editor/common/model/textModelWithTrackedRanges'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; import Errors = require('vs/base/common/errors'); import {IdGenerator} from 'vs/editor/common/core/idGenerator'; diff --git a/src/vs/editor/common/model/textModelWithMarkers.ts b/src/vs/editor/common/model/textModelWithMarkers.ts index 9162f16c093..293d25a1e44 100644 --- a/src/vs/editor/common/model/textModelWithMarkers.ts +++ b/src/vs/editor/common/model/textModelWithMarkers.ts @@ -9,7 +9,7 @@ import {IMode} from 'vs/editor/common/modes'; import {Position} from 'vs/editor/common/core/position'; import {TextModelWithTokens} from 'vs/editor/common/model/textModelWithTokens'; import {ModelLine, ILineMarker} from 'vs/editor/common/model/modelLine'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IdGenerator} from 'vs/editor/common/core/idGenerator'; export interface IMarkerIdToMarkerMap { diff --git a/src/vs/editor/common/model/textModelWithTokens.ts b/src/vs/editor/common/model/textModelWithTokens.ts index b5d1cbd6af4..447df9b2956 100644 --- a/src/vs/editor/common/model/textModelWithTokens.ts +++ b/src/vs/editor/common/model/textModelWithTokens.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import Timer = require('vs/base/common/timer'); import {NullMode, NullState, nullTokenize} from 'vs/editor/common/modes/nullMode'; @@ -13,8 +13,8 @@ import {TokenIterator} from 'vs/editor/common/model/tokenIterator'; import {ModelLine} from 'vs/editor/common/model/modelLine'; import {TextModel} from 'vs/editor/common/model/textModel'; import {DefaultConfig} from 'vs/editor/common/config/defaultConfig'; -import Modes = require('vs/editor/common/modes'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as Modes from 'vs/editor/common/modes'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {RunOnceScheduler} from 'vs/base/common/async'; import {Arrays} from 'vs/editor/common/core/arrays'; import Errors = require('vs/base/common/errors'); diff --git a/src/vs/editor/common/model/textModelWithTokensHelpers.ts b/src/vs/editor/common/model/textModelWithTokensHelpers.ts index a610a58b258..6bf34cd8e83 100644 --- a/src/vs/editor/common/model/textModelWithTokensHelpers.ts +++ b/src/vs/editor/common/model/textModelWithTokensHelpers.ts @@ -5,8 +5,8 @@ 'use strict'; import {NullMode} from 'vs/editor/common/modes/nullMode'; -import Modes = require('vs/editor/common/modes'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as Modes from 'vs/editor/common/modes'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Arrays} from 'vs/editor/common/core/arrays'; export interface ITextSource { diff --git a/src/vs/editor/common/model/textModelWithTrackedRanges.ts b/src/vs/editor/common/model/textModelWithTrackedRanges.ts index 7597f22b7fb..2ca886d3b64 100644 --- a/src/vs/editor/common/model/textModelWithTrackedRanges.ts +++ b/src/vs/editor/common/model/textModelWithTrackedRanges.ts @@ -10,7 +10,7 @@ import {Range} from 'vs/editor/common/core/range'; import {TextModelWithMarkers, INewMarker} from 'vs/editor/common/model/textModelWithMarkers'; import {FullModelRetokenizer, IRetokenizeRequest} from 'vs/editor/common/model/textModelWithTokens'; import {ILineMarker} from 'vs/editor/common/model/modelLine'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IdGenerator} from 'vs/editor/common/core/idGenerator'; interface ITrackedRange { diff --git a/src/vs/editor/common/model/tokenIterator.ts b/src/vs/editor/common/model/tokenIterator.ts index 02e04a84e62..5877f3fa1ae 100644 --- a/src/vs/editor/common/model/tokenIterator.ts +++ b/src/vs/editor/common/model/tokenIterator.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; var getStartIndex = EditorCommon.LineTokensBinaryEncoding.getStartIndex; var inflate = EditorCommon.LineTokensBinaryEncoding.inflate; diff --git a/src/vs/editor/common/model/tokensBinaryEncoding.ts b/src/vs/editor/common/model/tokensBinaryEncoding.ts index 9589754ba55..50dcb71d8f8 100644 --- a/src/vs/editor/common/model/tokensBinaryEncoding.ts +++ b/src/vs/editor/common/model/tokensBinaryEncoding.ts @@ -5,8 +5,8 @@ 'use strict'; import Strings = require('vs/base/common/strings'); -import Modes = require('vs/editor/common/modes'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as Modes from 'vs/editor/common/modes'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Errors = require('vs/base/common/errors'); class InflatedToken implements Modes.IToken { diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 3ae02b87974..5d3030fe35e 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -7,7 +7,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {IMatch} from 'vs/base/common/filters'; import {IMarker} from 'vs/platform/markers/common/markers'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; import URI from 'vs/base/common/uri'; import {IDisposable} from 'vs/base/common/lifecycle'; diff --git a/src/vs/editor/common/modes/TMState.ts b/src/vs/editor/common/modes/TMState.ts index 1216dc774c7..cc908f71565 100644 --- a/src/vs/editor/common/modes/TMState.ts +++ b/src/vs/editor/common/modes/TMState.ts @@ -5,7 +5,7 @@ 'use strict'; import {AbstractState} from 'vs/editor/common/modes/abstractState'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {StackElement} from 'vscode-textmate'; diff --git a/src/vs/editor/common/modes/abstractMode.ts b/src/vs/editor/common/modes/abstractMode.ts index 09a80a9d2e6..0eb9b3a88fd 100644 --- a/src/vs/editor/common/modes/abstractMode.ts +++ b/src/vs/editor/common/modes/abstractMode.ts @@ -7,8 +7,8 @@ import {EventEmitter} from 'vs/base/common/eventEmitter'; import {NullMode} from 'vs/editor/common/modes/nullMode'; import {TextualSuggestSupport} from 'vs/editor/common/modes/supports/suggestSupport'; -import Modes = require('vs/editor/common/modes'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as Modes from 'vs/editor/common/modes'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IDisposable} from 'vs/base/common/lifecycle'; import {TPromise} from 'vs/base/common/winjs.base'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/common/modes/abstractState.ts b/src/vs/editor/common/modes/abstractState.ts index 45892e6c1af..0f75fe2ec65 100644 --- a/src/vs/editor/common/modes/abstractState.ts +++ b/src/vs/editor/common/modes/abstractState.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; export class AbstractState implements Modes.IState { diff --git a/src/vs/editor/common/modes/modesRegistry.ts b/src/vs/editor/common/modes/modesRegistry.ts index c830b0dc982..a230967b707 100644 --- a/src/vs/editor/common/modes/modesRegistry.ts +++ b/src/vs/editor/common/modes/modesRegistry.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {Registry} from 'vs/platform/platform'; import {ILanguageExtensionPoint} from 'vs/editor/common/services/modeService'; import Event, {Emitter} from 'vs/base/common/event'; diff --git a/src/vs/editor/common/modes/monarch/monarch.ts b/src/vs/editor/common/modes/monarch/monarch.ts index 8df77a4b0b2..c2dd6d5feb8 100644 --- a/src/vs/editor/common/modes/monarch/monarch.ts +++ b/src/vs/editor/common/modes/monarch/monarch.ts @@ -11,7 +11,7 @@ import {AbstractMode} from 'vs/editor/common/modes/abstractMode'; import {ILexer} from 'vs/editor/common/modes/monarch/monarchCommon'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import MonarchDefinition = require('vs/editor/common/modes/monarch/monarchDefinition'); import {createTokenizationSupport} from 'vs/editor/common/modes/monarch/monarchLexer'; import {IModeService} from 'vs/editor/common/services/modeService'; diff --git a/src/vs/editor/common/modes/monarch/monarchCommon.ts b/src/vs/editor/common/modes/monarch/monarchCommon.ts index 4513110ca3f..ee498ab5ff6 100644 --- a/src/vs/editor/common/modes/monarch/monarchCommon.ts +++ b/src/vs/editor/common/modes/monarch/monarchCommon.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; /* * This module exports common types and functionality shared between diff --git a/src/vs/editor/common/modes/monarch/monarchCompile.ts b/src/vs/editor/common/modes/monarch/monarchCompile.ts index 4d6e79a88de..3df71f9dd23 100644 --- a/src/vs/editor/common/modes/monarch/monarchCompile.ts +++ b/src/vs/editor/common/modes/monarch/monarchCompile.ts @@ -11,7 +11,7 @@ import MonarchTypes = require('vs/editor/common/modes/monarch/monarchTypes'); import MonarchCommonTypes = require('vs/editor/common/modes/monarch/monarchCommon'); -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import Objects = require('vs/base/common/objects'); /* diff --git a/src/vs/editor/common/modes/monarch/monarchDefinition.ts b/src/vs/editor/common/modes/monarch/monarchDefinition.ts index da485435354..cd4be557f03 100644 --- a/src/vs/editor/common/modes/monarch/monarchDefinition.ts +++ b/src/vs/editor/common/modes/monarch/monarchDefinition.ts @@ -11,7 +11,7 @@ import MonarchCommonTypes = require('vs/editor/common/modes/monarch/monarchCommon'); import {IModelService} from 'vs/editor/common/services/modelService'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {CharacterPair, IRichEditConfiguration} from 'vs/editor/common/modes/supports/richEditSupport'; import {TextualAndPredefinedResultSuggestSupport, PredefinedResultSuggestSupport} from 'vs/editor/common/modes/supports/suggestSupport'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; diff --git a/src/vs/editor/common/modes/monarch/monarchLexer.ts b/src/vs/editor/common/modes/monarch/monarchLexer.ts index 4a60fdcb92e..42d7d9a22e5 100644 --- a/src/vs/editor/common/modes/monarch/monarchLexer.ts +++ b/src/vs/editor/common/modes/monarch/monarchLexer.ts @@ -12,7 +12,7 @@ import {AbstractState} from 'vs/editor/common/modes/abstractState'; import {LineStream} from 'vs/editor/common/modes/lineStream'; import MonarchCommonTypes = require('vs/editor/common/modes/monarch/monarchCommon'); -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {IModeService} from 'vs/editor/common/services/modeService'; import {TokenizationSupport, IEnteringNestedModeData} from 'vs/editor/common/modes/supports/tokenizationSupport'; diff --git a/src/vs/editor/common/modes/monarch/monarchTypes.ts b/src/vs/editor/common/modes/monarch/monarchTypes.ts index 6d5bbaba27e..a148362f2f2 100644 --- a/src/vs/editor/common/modes/monarch/monarchTypes.ts +++ b/src/vs/editor/common/modes/monarch/monarchTypes.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; /* * Interface types for Monarch language definitions diff --git a/src/vs/editor/common/modes/nullMode.ts b/src/vs/editor/common/modes/nullMode.ts index ae22a418e6b..1831698c2ff 100644 --- a/src/vs/editor/common/modes/nullMode.ts +++ b/src/vs/editor/common/modes/nullMode.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; export class NullState implements Modes.IState { diff --git a/src/vs/editor/common/modes/supports.ts b/src/vs/editor/common/modes/supports.ts index 2abbbd42e6c..b059a76830f 100644 --- a/src/vs/editor/common/modes/supports.ts +++ b/src/vs/editor/common/modes/supports.ts @@ -5,7 +5,7 @@ 'use strict'; import Strings = require('vs/base/common/strings'); -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {Arrays} from 'vs/editor/common/core/arrays'; import * as EditorCommon from 'vs/editor/common/editorCommon'; diff --git a/src/vs/editor/common/modes/textToHtmlTokenizer.ts b/src/vs/editor/common/modes/textToHtmlTokenizer.ts index 48ca081ee94..15ccc1d3d62 100644 --- a/src/vs/editor/common/modes/textToHtmlTokenizer.ts +++ b/src/vs/editor/common/modes/textToHtmlTokenizer.ts @@ -6,7 +6,7 @@ import Strings = require('vs/base/common/strings'); import {NullState, nullTokenize} from 'vs/editor/common/modes/nullMode'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; export function tokenizeToHtmlContent(text: string, mode: Modes.IMode): IHTMLContentElement { diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts index 155e8d37e40..a22ed4d025f 100644 --- a/src/vs/editor/common/services/editorSimpleWorker.ts +++ b/src/vs/editor/common/services/editorSimpleWorker.ts @@ -5,14 +5,14 @@ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {TPromise} from 'vs/base/common/winjs.base'; import {IRequestHandler} from 'vs/base/common/worker/simpleWorker'; import {EditorSimpleWorker, IRawModelData} from 'vs/editor/common/services/editorSimpleWorkerCommon'; import {MirrorModel2} from 'vs/editor/common/model/mirrorModel2'; import URI from 'vs/base/common/uri'; import {DiffComputer} from 'vs/editor/common/diff/diffComputer'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {computeLinks} from 'vs/editor/common/modes/linkComputer'; import {DefaultFilter} from 'vs/editor/common/modes/modesFilters'; import {WordHelper} from 'vs/editor/common/model/textModelWithTokensHelpers'; diff --git a/src/vs/editor/common/services/editorSimpleWorkerCommon.ts b/src/vs/editor/common/services/editorSimpleWorkerCommon.ts index 8ebeaef2a22..81d5ec83d1d 100644 --- a/src/vs/editor/common/services/editorSimpleWorkerCommon.ts +++ b/src/vs/editor/common/services/editorSimpleWorkerCommon.ts @@ -5,8 +5,8 @@ 'use strict'; import {TPromise} from 'vs/base/common/winjs.base'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; export interface IRawModelData { url:string; diff --git a/src/vs/editor/common/services/editorWorkerService.ts b/src/vs/editor/common/services/editorWorkerService.ts index 784aa1ead27..f399b712631 100644 --- a/src/vs/editor/common/services/editorWorkerService.ts +++ b/src/vs/editor/common/services/editorWorkerService.ts @@ -7,8 +7,8 @@ import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; export var ID_EDITOR_WORKER_SERVICE = 'workerService'; export var IEditorWorkerService = createDecorator(ID_EDITOR_WORKER_SERVICE); diff --git a/src/vs/editor/common/services/editorWorkerServiceImpl.ts b/src/vs/editor/common/services/editorWorkerServiceImpl.ts index 5b2b4158a8d..6f5fe6d5f53 100644 --- a/src/vs/editor/common/services/editorWorkerServiceImpl.ts +++ b/src/vs/editor/common/services/editorWorkerServiceImpl.ts @@ -7,14 +7,14 @@ import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IModelService} from 'vs/editor/common/services/modelService'; import {Disposable, IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import {SimpleWorkerClient} from 'vs/base/common/worker/simpleWorker'; import {DefaultWorkerFactory} from 'vs/base/worker/defaultWorkerFactory'; import {EditorSimpleWorker} from 'vs/editor/common/services/editorSimpleWorkerCommon'; import {IntervalTimer} from 'vs/base/common/async'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {WordHelper} from 'vs/editor/common/model/textModelWithTokensHelpers'; /** diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts index 1749d3737c6..3cfa4f6e4e8 100644 --- a/src/vs/editor/common/services/modeService.ts +++ b/src/vs/editor/common/services/modeService.ts @@ -6,7 +6,7 @@ import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; import {TPromise} from 'vs/base/common/winjs.base'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import MonarchTypes = require('vs/editor/common/modes/monarch/monarchTypes'); import {IDisposable} from 'vs/base/common/lifecycle'; import {IRichEditConfiguration} from 'vs/editor/common/modes/supports/richEditSupport'; diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts index fdb7385cf75..1d9f1c08eab 100644 --- a/src/vs/editor/common/services/modeServiceImpl.ts +++ b/src/vs/editor/common/services/modeServiceImpl.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {IModeService, IModeLookupResult, ILanguageExtensionPoint} from 'vs/editor/common/services/modeService'; import {IModelService} from 'vs/editor/common/services/modelService'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {IPluginService} from 'vs/platform/plugins/common/plugins'; import {FrankensteinMode} from 'vs/editor/common/modes/abstractMode'; import {LanguagesRegistry} from 'vs/editor/common/services/languagesRegistry'; diff --git a/src/vs/editor/common/services/modelService.ts b/src/vs/editor/common/services/modelService.ts index 90c701caa4f..55442cc369d 100644 --- a/src/vs/editor/common/services/modelService.ts +++ b/src/vs/editor/common/services/modelService.ts @@ -6,8 +6,8 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import Event from 'vs/base/common/event'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts index 0d07d9834bd..1254f5877f3 100644 --- a/src/vs/editor/common/services/modelServiceImpl.ts +++ b/src/vs/editor/common/services/modelServiceImpl.ts @@ -9,8 +9,8 @@ import {IModeService} from 'vs/editor/common/services/modeService'; import {IMarker, IMarkerService} from 'vs/platform/markers/common/markers'; import {IMirrorModelEvents, MirrorModel} from 'vs/editor/common/model/mirrorModel'; import {Range} from 'vs/editor/common/core/range'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {IResourceService} from 'vs/editor/common/services/resourceService'; import {IModelService} from 'vs/editor/common/services/modelService'; import {Remotable, IThreadService, ThreadAffinity} from 'vs/platform/thread/common/thread'; diff --git a/src/vs/editor/common/services/resourceService.ts b/src/vs/editor/common/services/resourceService.ts index ab8b0235ff5..4688ddfefbd 100644 --- a/src/vs/editor/common/services/resourceService.ts +++ b/src/vs/editor/common/services/resourceService.ts @@ -6,7 +6,7 @@ import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; import {ListenerUnbind, ListenerCallback, IEmitterEvent} from 'vs/base/common/eventEmitter'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import URI from 'vs/base/common/uri'; import {IDisposable} from 'vs/base/common/lifecycle'; diff --git a/src/vs/editor/common/services/resourceServiceImpl.ts b/src/vs/editor/common/services/resourceServiceImpl.ts index 96965b51689..e1c2ecfe691 100644 --- a/src/vs/editor/common/services/resourceServiceImpl.ts +++ b/src/vs/editor/common/services/resourceServiceImpl.ts @@ -5,7 +5,7 @@ 'use strict'; import {EventEmitter, IEmitterEvent, ListenerUnbind, ListenerCallback} from 'vs/base/common/eventEmitter'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IResourceService, ResourceEvents, IResourceChangedEvent, IResourceAddedEvent, IResourceRemovedEvent} from 'vs/editor/common/services/resourceService'; import {IDisposable} from 'vs/base/common/lifecycle'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/editor/common/viewLayout/editorScrollable.ts b/src/vs/editor/common/viewLayout/editorScrollable.ts index abf0c0d9fe6..76fea5f7f21 100644 --- a/src/vs/editor/common/viewLayout/editorScrollable.ts +++ b/src/vs/editor/common/viewLayout/editorScrollable.ts @@ -7,7 +7,7 @@ import {EventEmitter} from 'vs/base/common/eventEmitter'; import {IDisposable} from 'vs/base/common/lifecycle'; import {IScrollable} from 'vs/base/common/scrollable'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class EditorScrollable extends EventEmitter implements IScrollable { diff --git a/src/vs/editor/common/viewLayout/linesLayout.ts b/src/vs/editor/common/viewLayout/linesLayout.ts index d8009f21ff5..4b878857d0f 100644 --- a/src/vs/editor/common/viewLayout/linesLayout.ts +++ b/src/vs/editor/common/viewLayout/linesLayout.ts @@ -5,7 +5,7 @@ 'use strict'; import {VerticalObjects} from 'vs/editor/common/viewLayout/verticalObjects'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; /** * Layouting of objects that take vertical space (by having a height) and push down other objects. diff --git a/src/vs/editor/common/viewLayout/verticalObjects.ts b/src/vs/editor/common/viewLayout/verticalObjects.ts index c0130a21a68..bbd51d58171 100644 --- a/src/vs/editor/common/viewLayout/verticalObjects.ts +++ b/src/vs/editor/common/viewLayout/verticalObjects.ts @@ -5,7 +5,7 @@ 'use strict'; import {WhitespaceComputer} from 'vs/editor/common/viewLayout/whitespaceComputer'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; /** * Layouting of objects that take vertical space (by having a height) and push down other objects. diff --git a/src/vs/editor/common/viewLayout/viewLineParts.ts b/src/vs/editor/common/viewLayout/viewLineParts.ts index 4bf64f09afb..90841b54f65 100644 --- a/src/vs/editor/common/viewLayout/viewLineParts.ts +++ b/src/vs/editor/common/viewLayout/viewLineParts.ts @@ -6,7 +6,7 @@ import Strings = require('vs/base/common/strings'); import {Arrays} from 'vs/editor/common/core/arrays'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface ILineParts { diff --git a/src/vs/editor/common/viewLayout/whitespaceComputer.ts b/src/vs/editor/common/viewLayout/whitespaceComputer.ts index a2875429f3f..01317080de2 100644 --- a/src/vs/editor/common/viewLayout/whitespaceComputer.ts +++ b/src/vs/editor/common/viewLayout/whitespaceComputer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; /** * Represent whitespaces in between lines and provide fast CRUD management methods. diff --git a/src/vs/editor/common/viewModel/characterHardWrappingLineMapper.ts b/src/vs/editor/common/viewModel/characterHardWrappingLineMapper.ts index 14cc6c8a224..8b9d50c51f4 100644 --- a/src/vs/editor/common/viewModel/characterHardWrappingLineMapper.ts +++ b/src/vs/editor/common/viewModel/characterHardWrappingLineMapper.ts @@ -7,7 +7,7 @@ import Strings = require('vs/base/common/strings'); import {ILineMapperFactory, ILineMapping, IOutputPosition} from 'vs/editor/common/viewModel/splitLinesCollection'; import {PrefixSumComputer} from 'vs/editor/common/viewModel/prefixSumComputer'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; var throwawayIndexOfResult = { index: -1, diff --git a/src/vs/editor/common/viewModel/filteredLineTokens.ts b/src/vs/editor/common/viewModel/filteredLineTokens.ts index 2e56305841e..a258db3ff64 100644 --- a/src/vs/editor/common/viewModel/filteredLineTokens.ts +++ b/src/vs/editor/common/viewModel/filteredLineTokens.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Arrays} from 'vs/editor/common/core/arrays'; export class FilteredLineTokens implements EditorCommon.IViewLineTokens { diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts index cecb9a5bc64..9dc52131b50 100644 --- a/src/vs/editor/common/viewModel/splitLinesCollection.ts +++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts @@ -9,7 +9,7 @@ import {Range} from 'vs/editor/common/core/range'; import {PrefixSumComputer, IPrefixSumIndexOfResult} from 'vs/editor/common/viewModel/prefixSumComputer'; import {FilteredLineTokens, IdentityFilteredLineTokens} from 'vs/editor/common/viewModel/filteredLineTokens'; import {ILinesCollection} from 'vs/editor/common/viewModel/viewModel'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface IOutputPosition { outputLineIndex: number; diff --git a/src/vs/editor/common/viewModel/viewEventHandler.ts b/src/vs/editor/common/viewModel/viewEventHandler.ts index 065c43d37c7..e340de51258 100644 --- a/src/vs/editor/common/viewModel/viewEventHandler.ts +++ b/src/vs/editor/common/viewModel/viewEventHandler.ts @@ -5,7 +5,7 @@ 'use strict'; import EventEmitter = require('vs/base/common/eventEmitter'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export class ViewEventHandler { diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts index 11f79715084..e7a8747b49c 100644 --- a/src/vs/editor/common/viewModel/viewModel.ts +++ b/src/vs/editor/common/viewModel/viewModel.ts @@ -12,7 +12,7 @@ import {ViewModelDecorations} from 'vs/editor/common/viewModel/viewModelDecorati import {ViewModelCursors} from 'vs/editor/common/viewModel/viewModelCursors'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import {Position} from 'vs/editor/common/core/position'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface ILinesCollection { setTabSize(newTabSize:number, emit:(evenType:string, payload:any)=>void): boolean; diff --git a/src/vs/editor/common/viewModel/viewModelCursors.ts b/src/vs/editor/common/viewModel/viewModelCursors.ts index 5a7157abc58..ab5955c97a3 100644 --- a/src/vs/editor/common/viewModel/viewModelCursors.ts +++ b/src/vs/editor/common/viewModel/viewModelCursors.ts @@ -6,7 +6,7 @@ import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface IConverter { validateViewPosition(viewLineNumber:number, viewColumn:number, modelPosition:EditorCommon.IEditorPosition): EditorCommon.IEditorPosition; diff --git a/src/vs/editor/common/viewModel/viewModelDecorations.ts b/src/vs/editor/common/viewModel/viewModelDecorations.ts index 76e40b814c6..89c4433c943 100644 --- a/src/vs/editor/common/viewModel/viewModelDecorations.ts +++ b/src/vs/editor/common/viewModel/viewModelDecorations.ts @@ -5,7 +5,7 @@ 'use strict'; import {Range} from 'vs/editor/common/core/range'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IDisposable} from 'vs/base/common/lifecycle'; export interface IModelRangeToViewRangeConverter { diff --git a/src/vs/editor/common/worker/validationHelper.ts b/src/vs/editor/common/worker/validationHelper.ts index a214290ee9e..9b05c31b82c 100644 --- a/src/vs/editor/common/worker/validationHelper.ts +++ b/src/vs/editor/common/worker/validationHelper.ts @@ -5,7 +5,7 @@ 'use strict'; import {IEmitterEvent} from 'vs/base/common/eventEmitter'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IResourceService, ResourceEvents, IResourceAddedEvent, IResourceRemovedEvent} from 'vs/editor/common/services/resourceService'; import {RunOnceScheduler} from 'vs/base/common/async'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/editor/contrib/accessibility/browser/accessibility.ts b/src/vs/editor/contrib/accessibility/browser/accessibility.ts index e6b588fcb1c..cb1ae38b9d2 100644 --- a/src/vs/editor/contrib/accessibility/browser/accessibility.ts +++ b/src/vs/editor/contrib/accessibility/browser/accessibility.ts @@ -12,10 +12,10 @@ import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import {Disposable} from 'vs/base/common/lifecycle'; import {Widget} from 'vs/base/browser/ui/widget'; import {clearNode} from 'vs/base/browser/dom'; diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts index d80fce6bbd5..d09dcb303dd 100644 --- a/src/vs/editor/contrib/clipboard/browser/clipboard.ts +++ b/src/vs/editor/contrib/clipboard/browser/clipboard.ts @@ -6,14 +6,14 @@ 'use strict'; import 'vs/css!./clipboard'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; import Lifecycle = require('vs/base/common/lifecycle'); import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; import Browser = require('vs/base/browser/browser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import config = require('vs/editor/common/config/config'); import {IKeybindings} from 'vs/platform/keybinding/common/keybindingService'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/contrib/color/browser/color.ts b/src/vs/editor/contrib/color/browser/color.ts index 02ca1ecfa3a..0912c7be69e 100644 --- a/src/vs/editor/contrib/color/browser/color.ts +++ b/src/vs/editor/contrib/color/browser/color.ts @@ -12,7 +12,7 @@ import schedulers = require('vs/base/common/async'); import dom = require('vs/base/browser/dom'); import errors = require('vs/base/common/errors'); import strings = require('vs/base/common/strings'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/contrib/comment/common/blockCommentCommand.ts b/src/vs/editor/contrib/comment/common/blockCommentCommand.ts index 9811d51470b..f4dcbc8c42d 100644 --- a/src/vs/editor/contrib/comment/common/blockCommentCommand.ts +++ b/src/vs/editor/contrib/comment/common/blockCommentCommand.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {Range} from 'vs/editor/common/core/range'; import {Position} from 'vs/editor/common/core/position'; import {Selection} from 'vs/editor/common/core/selection'; diff --git a/src/vs/editor/contrib/comment/common/comment.ts b/src/vs/editor/contrib/comment/common/comment.ts index 65df42033bb..b45ed513e3c 100644 --- a/src/vs/editor/contrib/comment/common/comment.ts +++ b/src/vs/editor/contrib/comment/common/comment.ts @@ -4,13 +4,13 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import LineCommentCommand = require('./lineCommentCommand'); import BlockCommentCommand = require('./blockCommentCommand'); import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/comment/common/lineCommentCommand.ts b/src/vs/editor/contrib/comment/common/lineCommentCommand.ts index e090516f561..ccd6dee7fdf 100644 --- a/src/vs/editor/contrib/comment/common/lineCommentCommand.ts +++ b/src/vs/editor/contrib/comment/common/lineCommentCommand.ts @@ -6,8 +6,8 @@ import BlockCommentCommand = require('./blockCommentCommand'); import Strings = require('vs/base/common/strings'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {Range} from 'vs/editor/common/core/range'; import {Position} from 'vs/editor/common/core/position'; import {Selection} from 'vs/editor/common/core/selection'; diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts index f567c09e56d..e9965727580 100644 --- a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts +++ b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import DOM = require('vs/base/browser/dom'); import {TPromise} from 'vs/base/common/winjs.base'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Actions = require('vs/base/common/actions'); import ActionBar = require('vs/base/browser/ui/actionbar/actionbar'); import Lifecycle = require('vs/base/common/lifecycle'); diff --git a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts index ef6e65dac8d..514335adea5 100644 --- a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts +++ b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts @@ -6,11 +6,11 @@ 'use strict'; import 'vs/css!./defineKeybinding'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import DomUtils = require('vs/base/browser/dom'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {disposeAll, IDisposable} from 'vs/base/common/lifecycle'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; diff --git a/src/vs/editor/contrib/diffNavigator/common/diffNavigator.ts b/src/vs/editor/contrib/diffNavigator/common/diffNavigator.ts index 06cbcf62f76..6540073b80b 100644 --- a/src/vs/editor/contrib/diffNavigator/common/diffNavigator.ts +++ b/src/vs/editor/contrib/diffNavigator/common/diffNavigator.ts @@ -6,7 +6,7 @@ import Events = require('vs/base/common/eventEmitter'); import Assert = require('vs/base/common/assert'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Objects = require('vs/base/common/objects'); import {Range} from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/find/common/replaceAllCommand.ts b/src/vs/editor/contrib/find/common/replaceAllCommand.ts index 9aa7b78d0a4..d3714e38c03 100644 --- a/src/vs/editor/contrib/find/common/replaceAllCommand.ts +++ b/src/vs/editor/contrib/find/common/replaceAllCommand.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts index 07898e79289..d9e9b360f9d 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/browser/folding.ts @@ -7,7 +7,7 @@ 'use strict'; import {RunOnceScheduler} from 'vs/base/common/async'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IMouseEvent, ICodeEditor} from 'vs/editor/browser/editorBrowser'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; @@ -18,7 +18,7 @@ import {IFoldingRange, toString as rangeToString} from 'vs/editor/contrib/foldin import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; import {EditorAction} from 'vs/editor/common/editorAction'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; let log = function(msg: string) { //console.log(msg); diff --git a/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts b/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts index 6560c32d0a7..4aa34d72a3f 100644 --- a/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts +++ b/src/vs/editor/contrib/folding/common/indentFoldStrategy.ts @@ -5,7 +5,7 @@ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IFoldingRange} from 'vs/editor/contrib/folding/common/foldingRange'; export function computeRanges(model: EditorCommon.IModel, tabSize: number, minimumRangeSize: number = 1): IFoldingRange[] { diff --git a/src/vs/editor/contrib/format/common/formatActions.ts b/src/vs/editor/contrib/format/common/formatActions.ts index f2b5e42bd92..90f5e8afdfd 100644 --- a/src/vs/editor/contrib/format/common/formatActions.ts +++ b/src/vs/editor/contrib/format/common/formatActions.ts @@ -5,10 +5,10 @@ 'use strict'; import {TPromise} from 'vs/base/common/winjs.base'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import lifecycle = require('vs/base/common/lifecycle'); import arrays = require('vs/base/common/arrays'); -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; import formatCommand = require('./formatCommand'); diff --git a/src/vs/editor/contrib/format/common/formatCommand.ts b/src/vs/editor/contrib/format/common/formatCommand.ts index d0cbb42a067..afe34bb0a1f 100644 --- a/src/vs/editor/contrib/format/common/formatCommand.ts +++ b/src/vs/editor/contrib/format/common/formatCommand.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Strings = require('vs/base/common/strings'); import {Range} from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/format/test/common/formatCommand.test.ts b/src/vs/editor/contrib/format/test/common/formatCommand.test.ts index efc8e44558d..4b1d3f260ff 100644 --- a/src/vs/editor/contrib/format/test/common/formatCommand.test.ts +++ b/src/vs/editor/contrib/format/test/common/formatCommand.test.ts @@ -10,7 +10,7 @@ import TU = require('vs/editor/test/common/commands/commandTestUtils'); import {EditOperationsCommand} from 'vs/editor/contrib/format/common/formatCommand'; import {Selection} from 'vs/editor/common/core/selection'; import {Model} from 'vs/editor/common/model/model'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text:string[]): EditorCommon.ISingleEditOperation { return { diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts index d493674f828..4d158918d27 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts +++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./goToDeclaration'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import Severity from 'vs/base/common/severity'; import * as Platform from 'vs/base/common/platform'; import * as Browser from 'vs/base/browser/browser'; @@ -20,9 +20,9 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import EventEmitter = require('vs/base/common/eventEmitter'); import HtmlContent = require('vs/base/common/htmlContent'); import {tokenizeToHtmlContent} from 'vs/editor/common/modes/textToHtmlTokenizer'; diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts index c954ba94339..71110c8a925 100644 --- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./gotoError'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import lifecycle = require('vs/base/common/lifecycle'); import strings = require('vs/base/common/strings'); import Errors = require('vs/base/common/errors'); @@ -18,9 +18,9 @@ import ZoneWidget = require('vs/editor/contrib/zoneWidget/browser/zoneWidget'); import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import HtmlContentRenderer = require('vs/base/browser/htmlContentRenderer'); import {Emitter} from 'vs/base/common/event'; import {Position} from 'vs/editor/common/core/position'; diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts index 4c5201ddeda..febf3d3870b 100644 --- a/src/vs/editor/contrib/hover/browser/hover.ts +++ b/src/vs/editor/contrib/hover/browser/hover.ts @@ -6,14 +6,14 @@ 'use strict'; import 'vs/css!./hover'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import EventEmitter = require('vs/base/common/eventEmitter'); import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {Range} from 'vs/editor/common/core/range'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; import Platform = require('vs/base/common/platform'); import ModesContentHover = require('./modesContentHover'); diff --git a/src/vs/editor/contrib/hover/browser/hoverWidgets.ts b/src/vs/editor/contrib/hover/browser/hoverWidgets.ts index f0df7ab6724..dcb84a0eba8 100644 --- a/src/vs/editor/contrib/hover/browser/hoverWidgets.ts +++ b/src/vs/editor/contrib/hover/browser/hoverWidgets.ts @@ -7,8 +7,8 @@ import lifecycle = require('vs/base/common/lifecycle'); import {CommonKeybindings} from 'vs/base/common/keyCodes'; import dom = require('vs/base/browser/dom'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Position} from 'vs/editor/common/core/position'; import {StyleMutator} from 'vs/base/browser/styleMutator'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; diff --git a/src/vs/editor/contrib/hover/browser/modesContentHover.ts b/src/vs/editor/contrib/hover/browser/modesContentHover.ts index 4ae7a393483..2e2e1c677da 100644 --- a/src/vs/editor/contrib/hover/browser/modesContentHover.ts +++ b/src/vs/editor/contrib/hover/browser/modesContentHover.ts @@ -6,11 +6,11 @@ import 'vs/css!vs/base/browser/ui/progressbar/progressbar'; import URI from 'vs/base/common/uri'; -import nls = require('vs/nls'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as nls from 'vs/nls'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {TPromise} from 'vs/base/common/winjs.base'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import HoverOperation = require('./hoverOperation'); import HoverWidget = require('./hoverWidgets'); import {renderHtml} from 'vs/base/browser/htmlContentRenderer'; diff --git a/src/vs/editor/contrib/hover/browser/modesGlyphHover.ts b/src/vs/editor/contrib/hover/browser/modesGlyphHover.ts index 1ef0d059498..b49bd28b121 100644 --- a/src/vs/editor/contrib/hover/browser/modesGlyphHover.ts +++ b/src/vs/editor/contrib/hover/browser/modesGlyphHover.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import HoverOperation = require('./hoverOperation'); import HoverWidget = require('./hoverWidgets'); diff --git a/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts b/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts index 62bc635be55..e407569d6dd 100644 --- a/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts +++ b/src/vs/editor/contrib/iPadShowKeyboard/browser/iPadShowKeyboard.ts @@ -9,8 +9,8 @@ import 'vs/css!./iPadShowKeyboard'; import Browser = require('vs/base/browser/browser'); import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import DomUtils = require('vs/base/browser/dom'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Lifecycle = require('vs/base/common/lifecycle'); import {INullService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts index 9c540ac38c0..7fb05bba190 100644 --- a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts +++ b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import InPlaceReplaceCommand = require('./inPlaceReplaceCommand'); import {Range} from 'vs/editor/common/core/range'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplaceCommand.ts b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplaceCommand.ts index 63d1c31159e..353ee860bd0 100644 --- a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplaceCommand.ts +++ b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplaceCommand.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Selection} from 'vs/editor/common/core/selection'; export class InPlaceReplaceCommand implements EditorCommon.ICommand { diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/common/indentation.ts index 932fde6fc90..cbd8d298088 100644 --- a/src/vs/editor/contrib/indentation/common/indentation.ts +++ b/src/vs/editor/contrib/indentation/common/indentation.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IndentationToTabsCommand, IndentationToSpacesCommand} from 'vs/editor/contrib/indentation/common/indentationCommands'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/contrib/indentation/common/indentationCommands.ts b/src/vs/editor/contrib/indentation/common/indentationCommands.ts index f11028e4ebd..4b3d162809b 100644 --- a/src/vs/editor/contrib/indentation/common/indentationCommands.ts +++ b/src/vs/editor/contrib/indentation/common/indentationCommands.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import {Range} from 'vs/editor/common/core/range'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; function getIndentationEditOperations(model: EditorCommon.ITokenizedModel, builder: EditorCommon.IEditOperationBuilder, tabSize: number, tabsToSpaces: boolean): void { if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) { diff --git a/src/vs/editor/contrib/linesOperations/common/copyLinesCommand.ts b/src/vs/editor/contrib/linesOperations/common/copyLinesCommand.ts index 892ad7dc0ea..ef2f1694db3 100644 --- a/src/vs/editor/contrib/linesOperations/common/copyLinesCommand.ts +++ b/src/vs/editor/contrib/linesOperations/common/copyLinesCommand.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; diff --git a/src/vs/editor/contrib/linesOperations/common/deleteLinesCommand.ts b/src/vs/editor/contrib/linesOperations/common/deleteLinesCommand.ts index c152ebd346a..4e08471427f 100644 --- a/src/vs/editor/contrib/linesOperations/common/deleteLinesCommand.ts +++ b/src/vs/editor/contrib/linesOperations/common/deleteLinesCommand.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; diff --git a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts index 6f3eab7639a..ea3bd67339c 100644 --- a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts +++ b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, HandlerEditorAction} from 'vs/editor/common/editorAction'; import CopyLinesCommand = require('./copyLinesCommand'); import DeleteLinesCommand = require('./deleteLinesCommand'); import MoveLinesCommand = require('./moveLinesCommand'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {TrimTrailingWhitespaceCommand} from 'vs/editor/common/commands/trimTrailingWhitespaceCommand'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts b/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts index e9cdadfe3a0..836762a2571 100644 --- a/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts +++ b/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; diff --git a/src/vs/editor/contrib/links/browser/links.ts b/src/vs/editor/contrib/links/browser/links.ts index e525861c834..b3a59bb4a57 100644 --- a/src/vs/editor/contrib/links/browser/links.ts +++ b/src/vs/editor/contrib/links/browser/links.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./links'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import Platform = require('vs/base/common/platform'); import Errors = require('vs/base/common/errors'); @@ -15,9 +15,9 @@ import Keyboard = require('vs/base/browser/keyboardEvent'); import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; import EventEmitter = require('vs/base/common/eventEmitter'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {IEditorService, IResourceInput} from 'vs/platform/editor/common/editor'; import {IMessageService} from 'vs/platform/message/common/message'; import Severity from 'vs/base/common/severity'; diff --git a/src/vs/editor/contrib/multicursor/common/multicursor.ts b/src/vs/editor/contrib/multicursor/common/multicursor.ts index 19ab427da07..896bd2080e4 100644 --- a/src/vs/editor/contrib/multicursor/common/multicursor.ts +++ b/src/vs/editor/contrib/multicursor/common/multicursor.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {TPromise} from 'vs/base/common/winjs.base'; import {EditorAction, HandlerEditorAction} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts b/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts index 96bb4930c39..a061c3e5667 100644 --- a/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts +++ b/src/vs/editor/contrib/outlineMarker/browser/outlineMarker.ts @@ -10,9 +10,9 @@ import {TPromise} from 'vs/base/common/winjs.base'; import lifecycle = require('vs/base/common/lifecycle'); import schedulers = require('vs/base/common/async'); import errors = require('vs/base/common/errors'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {Range} from 'vs/editor/common/core/range'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts index 90a14a9310b..0963a33601e 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import Model = require('./parameterHintsModel'); import Widget = require('./parameterHintsWidget'); import {TPromise} from 'vs/base/common/winjs.base'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction} from 'vs/editor/common/editorAction'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IKeybindingService, IKeybindingContextKey} from 'vs/platform/keybinding/common/keybindingService'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts index dec6f21e791..263639e7c11 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.ts @@ -8,8 +8,8 @@ import {TPromise} from 'vs/base/common/winjs.base'; import lifecycle = require('vs/base/common/lifecycle'); import async = require('vs/base/common/async'); import events = require('vs/base/common/eventEmitter'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {ParameterHintsRegistry, getParameterHints} from '../common/parameterHints'; function equalsArr(a: T[], b:T[], equalsFn:(a:T,b:T)=>boolean): boolean { diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts index c0245f31210..9e7a9813067 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts @@ -10,9 +10,9 @@ import {TPromise} from 'vs/base/common/winjs.base'; import lifecycle = require('vs/base/common/lifecycle'); import Builder = require('vs/base/browser/builder'); import Model = require('./parameterHintsModel'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import EventEmitter = require('vs/base/common/eventEmitter'); var $ = Builder.$; diff --git a/src/vs/editor/contrib/quickFix/browser/lightBulpWidget.ts b/src/vs/editor/contrib/quickFix/browser/lightBulpWidget.ts index 7448ec8f8d7..cb1e0244872 100644 --- a/src/vs/editor/contrib/quickFix/browser/lightBulpWidget.ts +++ b/src/vs/editor/contrib/quickFix/browser/lightBulpWidget.ts @@ -5,8 +5,8 @@ 'use strict'; import lifecycle = require('vs/base/common/lifecycle'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import DomUtils = require('vs/base/browser/dom'); class LightBulpWidget implements EditorBrowser.IContentWidget, lifecycle.IDisposable { diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.ts b/src/vs/editor/contrib/quickFix/browser/quickFix.ts index 7787fc03539..ff7ebf2fbf2 100644 --- a/src/vs/editor/contrib/quickFix/browser/quickFix.ts +++ b/src/vs/editor/contrib/quickFix/browser/quickFix.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {onUnexpectedError} from 'vs/base/common/errors'; import quickFixSelectionWidget = require('./quickFixSelectionWidget'); import quickFixModel = require('./quickFixModel'); @@ -13,8 +13,8 @@ import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction} from 'vs/editor/common/editorAction'; import Severity from 'vs/base/common/severity'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IKeybindingService, IKeybindingContextKey} from 'vs/platform/keybinding/common/keybindingService'; import {IMarkerService} from 'vs/platform/markers/common/markers'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts b/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts index 0f9fa159d43..5e6ac9e7882 100644 --- a/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts +++ b/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts @@ -7,10 +7,10 @@ import {TPromise} from 'vs/base/common/winjs.base'; import events = require('vs/base/common/eventEmitter'); import timer = require('vs/base/common/timer'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import lifecycle = require('vs/base/common/lifecycle'); import URI from 'vs/base/common/uri'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import arrays = require('vs/base/common/arrays'); import schedulers = require('vs/base/common/async'); import errors = require('vs/base/common/errors'); diff --git a/src/vs/editor/contrib/quickFix/browser/quickFixSelectionWidget.ts b/src/vs/editor/contrib/quickFix/browser/quickFixSelectionWidget.ts index 0a99767866f..bcf7ffb100e 100644 --- a/src/vs/editor/contrib/quickFix/browser/quickFixSelectionWidget.ts +++ b/src/vs/editor/contrib/quickFix/browser/quickFixSelectionWidget.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./quickFix'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import Errors = require('vs/base/common/errors'); import dom = require('vs/base/browser/dom'); @@ -15,8 +15,8 @@ import TreeImpl = require('vs/base/parts/tree/browser/treeImpl'); import TreeDefaults = require('vs/base/parts/tree/browser/treeDefaults'); import QuickFixModel = require('./quickFixModel'); import Mouse = require('vs/base/browser/mouseEvent'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import EventEmitter = require('vs/base/common/eventEmitter'); import Timer = require('vs/base/common/timer'); import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; @@ -106,7 +106,7 @@ class DataSource implements Tree.IDataSource { class Controller extends TreeDefaults.DefaultController { - /* protected */ public onLeftClick(tree:Tree.ITree, element:any, event:Mouse.StandardMouseEvent):boolean { + /* protected */ public onLeftClick(tree:Tree.ITree, element:any, event:Mouse.IMouseEvent):boolean { event.preventDefault(); event.stopPropagation(); diff --git a/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts b/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts index a6410de785d..9a87932be80 100644 --- a/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts +++ b/src/vs/editor/contrib/quickOpen/browser/editorQuickOpen.ts @@ -7,8 +7,8 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import QuickOpenEditorWidget = require('./quickOpenEditorWidget'); import QuickOpenModel = require('vs/base/parts/quickopen/browser/quickOpenModel'); import QuickOpen = require('vs/base/parts/quickopen/common/quickOpen'); diff --git a/src/vs/editor/contrib/quickOpen/browser/gotoLine.contribution.ts b/src/vs/editor/contrib/quickOpen/browser/gotoLine.contribution.ts index 4ae168494c6..4d577ae882e 100644 --- a/src/vs/editor/contrib/quickOpen/browser/gotoLine.contribution.ts +++ b/src/vs/editor/contrib/quickOpen/browser/gotoLine.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import GotoLine = require('./gotoLine'); import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts index e96b57e90a0..f6a58889b7a 100644 --- a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts +++ b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts @@ -6,9 +6,9 @@ 'use strict'; import 'vs/css!./gotoLine'; -import nls = require('vs/nls'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as nls from 'vs/nls'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import QuickOpenModel = require('vs/base/parts/quickopen/browser/quickOpenModel'); import QuickOpen = require('vs/base/parts/quickopen/common/quickOpen'); import EditorQuickOpen = require('./editorQuickOpen'); diff --git a/src/vs/editor/contrib/quickOpen/browser/quickCommand.contribution.ts b/src/vs/editor/contrib/quickOpen/browser/quickCommand.contribution.ts index 3feebd72eac..f2de27859ca 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickCommand.contribution.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickCommand.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import Browser = require('vs/base/browser/browser'); import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import QuickCommand = require('./quickCommand'); diff --git a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts index 4670939a181..19c53709957 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts @@ -5,9 +5,9 @@ 'use strict'; import {TPromise} from 'vs/base/common/winjs.base'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import Errors = require('vs/base/common/errors'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import QuickOpenModel = require('vs/base/parts/quickopen/browser/quickOpenModel'); import QuickOpen = require('vs/base/parts/quickopen/common/quickOpen'); import Strings = require('vs/base/common/strings'); diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOpenEditorWidget.ts b/src/vs/editor/contrib/quickOpen/browser/quickOpenEditorWidget.ts index ad704174cc4..dca06dbfd0b 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickOpenEditorWidget.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickOpenEditorWidget.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import Builder = require('vs/base/browser/builder'); import QuickOpenWidget = require('vs/base/parts/quickopen/browser/quickOpenWidget'); import QuickOpenModel = require('vs/base/parts/quickopen/browser/quickOpenModel'); diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOutline.contribution.ts b/src/vs/editor/contrib/quickOpen/browser/quickOutline.contribution.ts index cfbb4272679..c327750e112 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickOutline.contribution.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickOutline.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import QuickOutline = require('./quickOutline'); import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; @@ -12,5 +12,5 @@ import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; // Contribute "Quick Outline" to context menu CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(QuickOutline.QuickOutlineAction, QuickOutline.QuickOutlineAction.ID, nls.localize('label', "Go to Symbol..."), { context: ContextKey.EditorFocus, - primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_O + primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_O })); diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts index 10248143ae7..3426d278d29 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts @@ -7,13 +7,13 @@ 'use strict'; import 'vs/css!./quickOutline'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import Arrays = require('vs/base/common/arrays'); import {TPromise} from 'vs/base/common/winjs.base'; import Errors = require('vs/base/common/errors'); import Strings = require('vs/base/common/strings'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import Filters = require('vs/base/common/filters'); import QuickOpenModel = require('vs/base/parts/quickopen/browser/quickOpenModel'); import QuickOpen = require('vs/base/parts/quickopen/common/quickOpen'); diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts index 0bec0bbcdb7..9cb8a842333 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts @@ -4,18 +4,18 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {isFalsyOrEmpty} from 'vs/base/common/arrays'; import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; import Severity from 'vs/base/common/severity'; import lifecycle = require('vs/base/common/lifecycle'); import errors = require('vs/base/common/errors'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Range} from 'vs/editor/common/core/range'; import {Position} from 'vs/editor/common/core/position'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts index defe9d0c171..fdd17a76560 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts @@ -5,7 +5,7 @@ 'use strict'; import 'vs/css!./referenceSearchWidget'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import URI from 'vs/base/common/uri'; import collections = require('vs/base/common/collections'); import lifecycle = require('vs/base/common/lifecycle'); @@ -24,8 +24,8 @@ import treeWidget = require('vs/base/parts/tree/browser/treeImpl'); import treeDefaults = require('vs/base/parts/tree/browser/treeDefaults'); import leftRightWidget = require('vs/base/browser/ui/leftRightWidget/leftRightWidget'); import countBadge = require('vs/base/browser/ui/countBadge/countBadge'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; import {DefaultConfig} from 'vs/editor/common/config/defaultConfig'; import embeddedCodeEditorWidget = require('vs/editor/browser/widget/embeddedCodeEditorWidget'); import codeEditorModel = require('vs/editor/common/model/model'); @@ -206,7 +206,7 @@ class Controller extends treeDefaults.DefaultController { OPEN_TO_SIDE: 'events/custom/opentoside' }; - public onMouseDown(tree:tree.ITree, element:any, event:mouse.StandardMouseEvent):boolean { + public onMouseDown(tree:tree.ITree, element:any, event:mouse.IMouseEvent):boolean { if (event.leftButton) { if (element instanceof model.FileReferences) { event.preventDefault(); @@ -228,7 +228,7 @@ class Controller extends treeDefaults.DefaultController { return false; } - public onClick(tree:tree.ITree, element:any, event:mouse.StandardMouseEvent):boolean { + public onClick(tree:tree.ITree, element:any, event:mouse.IMouseEvent):boolean { if (event.leftButton) { return false; // Already handled by onMouseDown } diff --git a/src/vs/editor/contrib/rename/browser/renameModel.ts b/src/vs/editor/contrib/rename/browser/renameModel.ts index bff9a2d0bb6..a6edc4ad564 100644 --- a/src/vs/editor/contrib/rename/browser/renameModel.ts +++ b/src/vs/editor/contrib/rename/browser/renameModel.ts @@ -6,11 +6,11 @@ import {TPromise} from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import arrays = require('vs/base/common/arrays'); import collections = require('vs/base/common/collections'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; import {IEditorService} from 'vs/platform/editor/common/editor'; diff --git a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts index 924e28a6570..1afaef009a3 100644 --- a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts +++ b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts index 279caa03e98..984ec0357df 100644 --- a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts +++ b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import Arrays = require('vs/base/common/arrays'); import {TPromise} from 'vs/base/common/winjs.base'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; import TokenSelectionSupport = require('./tokenSelectionSupport'); diff --git a/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts b/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts index 88ca133fd13..83cf7a05bfc 100644 --- a/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts +++ b/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts @@ -7,8 +7,8 @@ import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; import tokenTree = require('./tokenTree'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {IModelService} from 'vs/editor/common/services/modelService'; import {Range} from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/smartSelect/common/tokenTree.ts b/src/vs/editor/contrib/smartSelect/common/tokenTree.ts index f637bd2a0e3..d127f01a568 100644 --- a/src/vs/editor/contrib/smartSelect/common/tokenTree.ts +++ b/src/vs/editor/contrib/smartSelect/common/tokenTree.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; +import * as Modes from 'vs/editor/common/modes'; import {Range} from 'vs/editor/common/core/range'; import {Position} from 'vs/editor/common/core/position'; import {ignoreBracketsInToken} from 'vs/editor/common/modes/supports'; diff --git a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts index a00e0a7537e..0f3a152d82a 100644 --- a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts +++ b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts @@ -6,7 +6,7 @@ import 'vs/languages/javascript/common/javascript.contribution'; import assert = require('assert'); -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import modesUtil = require('vs/editor/test/common/modesUtil'); import {createMockModelService} from 'vs/editor/test/common/servicesTestUtils'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/editor/contrib/snippet/common/snippet.ts b/src/vs/editor/contrib/snippet/common/snippet.ts index 071a00e2de6..3461a9f58e4 100644 --- a/src/vs/editor/contrib/snippet/common/snippet.ts +++ b/src/vs/editor/contrib/snippet/common/snippet.ts @@ -7,7 +7,7 @@ import Collections = require('vs/base/common/collections'); import Strings = require('vs/base/common/strings'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import EventEmitter = require('vs/base/common/eventEmitter'); import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; import {Range} from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts index 9f06e9e2101..7a55563d5c5 100644 --- a/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts +++ b/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts b/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts index ef4a24c9f1f..d0848c4519f 100644 --- a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts +++ b/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {EditorAction, Behaviour} from 'vs/editor/common/editorAction'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts b/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts index e18080c7cf5..a932af1dd35 100644 --- a/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts +++ b/src/vs/editor/contrib/workerStatusReporter/browser/workerStatusReporter.ts @@ -7,8 +7,8 @@ 'use strict'; import 'vs/css!./workerStatusReporter'; -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Browser = require('vs/base/browser/browser'); import lifecycle = require('vs/base/common/lifecycle'); import {IThreadService, IThreadServiceStatusListener, IThreadServiceStatus} from 'vs/platform/thread/common/thread'; diff --git a/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.ts b/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.ts index 407d5d5c599..49e37241e33 100644 --- a/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.ts +++ b/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.ts @@ -6,15 +6,15 @@ 'use strict'; import 'vs/css!./peekViewWidget'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import actionbar = require('vs/base/browser/ui/actionbar/actionbar'); import actions = require('vs/base/common/actions'); import strings = require('vs/base/common/strings'); import builder = require('vs/base/browser/builder'); import dom = require('vs/base/browser/dom'); import zoneWidget = require('./zoneWidget'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService'; import {createDecorator, ServiceIdentifier, ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts index 53066bea99d..f4be4e27a2c 100644 --- a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts +++ b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts @@ -9,8 +9,8 @@ import 'vs/css!./zoneWidget'; import domUtils = require('vs/base/browser/dom'); import Objects = require('vs/base/common/objects'); import Events = require('vs/base/common/eventEmitter'); -import EditorBrowser = require('vs/editor/browser/editorBrowser'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; +import * as EditorCommon from 'vs/editor/common/editorCommon'; export interface IOptions { showFrame?: boolean; diff --git a/src/vs/editor/node/textMate/TMSnippets.ts b/src/vs/editor/node/textMate/TMSnippets.ts index b201ca5fd10..053b87e9569 100644 --- a/src/vs/editor/node/textMate/TMSnippets.ts +++ b/src/vs/editor/node/textMate/TMSnippets.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {TPromise} from 'vs/base/common/winjs.base'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import snippets = require('vs/editor/contrib/snippet/common/snippet'); import json = require('vs/base/common/json'); import paths = require('vs/base/common/paths'); diff --git a/src/vs/editor/node/textMate/TMSyntax.ts b/src/vs/editor/node/textMate/TMSyntax.ts index 89e9671a044..f98034119d7 100644 --- a/src/vs/editor/node/textMate/TMSyntax.ts +++ b/src/vs/editor/node/textMate/TMSyntax.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import paths = require('vs/base/common/paths'); import errors = require('vs/base/common/errors'); -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import supports = require('vs/editor/common/modes/supports'); import collections = require('vs/base/common/collections'); import textMate = require('vscode-textmate'); diff --git a/src/vs/editor/test/common/commands/commandTestUtils.ts b/src/vs/editor/test/common/commands/commandTestUtils.ts index b361a4a6db7..71d0fbaad3d 100644 --- a/src/vs/editor/test/common/commands/commandTestUtils.ts +++ b/src/vs/editor/test/common/commands/commandTestUtils.ts @@ -9,7 +9,7 @@ import {Model} from 'vs/editor/common/model/model'; import {Range} from 'vs/editor/common/core/range'; import {Selection} from 'vs/editor/common/core/selection'; import {Cursor} from 'vs/editor/common/controller/cursor'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IMode} from 'vs/editor/common/modes'; import {MockConfiguration} from 'vs/editor/test/common/mocks/mockConfiguration'; diff --git a/src/vs/editor/test/common/commands/shiftCommand.test.ts b/src/vs/editor/test/common/commands/shiftCommand.test.ts index 1df07f4cbd3..f4198b9ad63 100644 --- a/src/vs/editor/test/common/commands/shiftCommand.test.ts +++ b/src/vs/editor/test/common/commands/shiftCommand.test.ts @@ -7,7 +7,7 @@ import assert = require('assert'); import TU = require('vs/editor/test/common/commands/commandTestUtils'); import {ShiftCommand} from 'vs/editor/common/commands/shiftCommand'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {withEditorModel} from 'vs/editor/test/common/editorTestUtils'; import {Selection} from 'vs/editor/common/core/selection'; import * as Modes from 'vs/editor/common/modes'; diff --git a/src/vs/editor/test/common/commands/sideEditing.test.ts b/src/vs/editor/test/common/commands/sideEditing.test.ts index 2baa843b87d..9be001827aa 100644 --- a/src/vs/editor/test/common/commands/sideEditing.test.ts +++ b/src/vs/editor/test/common/commands/sideEditing.test.ts @@ -9,7 +9,7 @@ import {Model} from 'vs/editor/common/model/model'; import {Selection} from 'vs/editor/common/core/selection'; import {Position} from 'vs/editor/common/core/position'; import {Cursor} from 'vs/editor/common/controller/cursor'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {MockConfiguration} from 'vs/editor/test/common/mocks/mockConfiguration'; import {EditOperation} from 'vs/editor/common/core/editOperation'; import {ModelLine, ILineEdit} from 'vs/editor/common/model/modelLine'; diff --git a/src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts b/src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts index c21cfaf851b..c3ffb4ff449 100644 --- a/src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts +++ b/src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts @@ -6,7 +6,7 @@ import assert = require('assert'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import TU = require('vs/editor/test/common/commands/commandTestUtils'); import TrimTrailingWhitespaceCommand = require('vs/editor/common/commands/trimTrailingWhitespaceCommand'); import {Selection} from 'vs/editor/common/core/selection'; diff --git a/src/vs/editor/test/common/diff/diffComputer.test.ts b/src/vs/editor/test/common/diff/diffComputer.test.ts index 09faf79c0ba..8b7dca9e8ee 100644 --- a/src/vs/editor/test/common/diff/diffComputer.test.ts +++ b/src/vs/editor/test/common/diff/diffComputer.test.ts @@ -6,7 +6,7 @@ import assert = require('assert'); import DiffComputer = require('vs/editor/common/diff/diffComputer'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; function extractCharChangeRepresentation(change, expectedChange): EditorCommon.ICharChange { var hasOriginal = expectedChange && expectedChange.originalStartLineNumber > 0; diff --git a/src/vs/editor/test/common/editorTestUtils.ts b/src/vs/editor/test/common/editorTestUtils.ts index 1246d1fda48..8b61e0d50f9 100644 --- a/src/vs/editor/test/common/editorTestUtils.ts +++ b/src/vs/editor/test/common/editorTestUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import Model = require('vs/editor/common/model/model'); export function pos(lineNumber:number, column:number): EditorCommon.IPosition { diff --git a/src/vs/editor/test/common/model/editableTextModel.test.ts b/src/vs/editor/test/common/model/editableTextModel.test.ts index 3189b93ffe9..576b4f37cad 100644 --- a/src/vs/editor/test/common/model/editableTextModel.test.ts +++ b/src/vs/editor/test/common/model/editableTextModel.test.ts @@ -6,7 +6,7 @@ import assert = require('assert'); import {Range} from 'vs/editor/common/core/range'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {EditableTextModel, IValidatedEditOperation} from 'vs/editor/common/model/editableTextModel'; import {TextModel} from 'vs/editor/common/model/textModel'; import {MirrorModel2} from 'vs/editor/common/model/mirrorModel2'; diff --git a/src/vs/editor/test/common/model/editableTextModelAuto.test.ts b/src/vs/editor/test/common/model/editableTextModelAuto.test.ts index b3596fef57d..1448e47fe77 100644 --- a/src/vs/editor/test/common/model/editableTextModelAuto.test.ts +++ b/src/vs/editor/test/common/model/editableTextModelAuto.test.ts @@ -6,7 +6,7 @@ import {Range} from 'vs/editor/common/core/range'; import Position = require('vs/editor/common/core/position'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {testApplyEditsWithSyncedModels} from 'vs/editor/test/common/model/editableTextModelTestUtils'; const GENERATE_TESTS = false; diff --git a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts index af2b461582c..907b9ec8a57 100644 --- a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts +++ b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts @@ -5,7 +5,7 @@ 'use strict'; import assert = require('assert'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {EditableTextModel} from 'vs/editor/common/model/editableTextModel'; import {TextModel} from 'vs/editor/common/model/textModel'; import {MirrorModel2} from 'vs/editor/common/model/mirrorModel2'; diff --git a/src/vs/editor/test/common/model/mirrorModel.test.ts b/src/vs/editor/test/common/model/mirrorModel.test.ts index 7b11b06bda1..1e4a9e7f025 100644 --- a/src/vs/editor/test/common/model/mirrorModel.test.ts +++ b/src/vs/editor/test/common/model/mirrorModel.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import assert = require('assert'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import MirrorModel = require('vs/editor/common/model/mirrorModel'); import modesUtil = require('vs/editor/test/common/modesTestUtils'); diff --git a/src/vs/editor/test/common/model/model.line.test.ts b/src/vs/editor/test/common/model/model.line.test.ts index 4fac190363f..8a8e1664d8a 100644 --- a/src/vs/editor/test/common/model/model.line.test.ts +++ b/src/vs/editor/test/common/model/model.line.test.ts @@ -6,9 +6,9 @@ import assert = require('assert'); import ModelLine = require('vs/editor/common/model/modelLine'); -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import TextModelWithTokens = require('vs/editor/common/model/textModelWithTokens'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {LineMarker} from 'vs/editor/common/model/textModelWithMarkers'; function assertLineTokens(actual:EditorCommon.ILineTokens, expected:Modes.IToken[]): void { diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts index a8593378f90..06cfeb81d67 100644 --- a/src/vs/editor/test/common/model/model.test.ts +++ b/src/vs/editor/test/common/model/model.test.ts @@ -9,7 +9,7 @@ import Model = require('vs/editor/common/model/model'); import {Position} from 'vs/editor/common/core/position'; import {Range} from 'vs/editor/common/core/range'; import ModelModes = require('vs/editor/test/common/testModes'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {EditOperation} from 'vs/editor/common/core/editOperation'; // --------- utils diff --git a/src/vs/editor/test/common/model/modelDecorations.test.ts b/src/vs/editor/test/common/model/modelDecorations.test.ts index f66602cf0e8..46e84a7ded7 100644 --- a/src/vs/editor/test/common/model/modelDecorations.test.ts +++ b/src/vs/editor/test/common/model/modelDecorations.test.ts @@ -5,7 +5,7 @@ 'use strict'; import assert = require('assert'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {Position} from 'vs/editor/common/core/position'; import {Range} from 'vs/editor/common/core/range'; import Model = require('vs/editor/common/model/model'); diff --git a/src/vs/editor/test/common/model/modelEditOperation.test.ts b/src/vs/editor/test/common/model/modelEditOperation.test.ts index e1668628b5e..f664eee173a 100644 --- a/src/vs/editor/test/common/model/modelEditOperation.test.ts +++ b/src/vs/editor/test/common/model/modelEditOperation.test.ts @@ -7,7 +7,7 @@ import assert = require('assert'); import Range = require('vs/editor/common/core/range'); import Model = require('vs/editor/common/model/model'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; suite('Editor Model - Model Edit Operation', () => { var LINE1 = 'My First Line'; diff --git a/src/vs/editor/test/common/modes/linkComputer.test.ts b/src/vs/editor/test/common/modes/linkComputer.test.ts index 823f4367c90..f238a10a259 100644 --- a/src/vs/editor/test/common/modes/linkComputer.test.ts +++ b/src/vs/editor/test/common/modes/linkComputer.test.ts @@ -6,7 +6,7 @@ import assert = require('assert'); import LinkComputer = require('vs/editor/common/modes/linkComputer'); -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; class SimpleLinkComputerTarget implements LinkComputer.ILinkComputerTarget { diff --git a/src/vs/editor/test/common/modes/tokenization.test.ts b/src/vs/editor/test/common/modes/tokenization.test.ts index 79b79de68f4..46e278a5252 100644 --- a/src/vs/editor/test/common/modes/tokenization.test.ts +++ b/src/vs/editor/test/common/modes/tokenization.test.ts @@ -9,7 +9,7 @@ import modes = require('vs/editor/common/modes'); import supports = require('vs/editor/common/modes/supports'); import {AbstractState} from 'vs/editor/common/modes/abstractState'; import {createLineContext} from 'vs/editor/test/common/modesTestUtils'; -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; import {IDisposable, empty as EmptyDisposable} from 'vs/base/common/lifecycle'; import {TokenizationSupport, IEnteringNestedModeData, ILeavingNestedModeData} from 'vs/editor/common/modes/supports/tokenizationSupport'; diff --git a/src/vs/editor/test/common/modesTestUtils.ts b/src/vs/editor/test/common/modesTestUtils.ts index 28ca0fbafa5..5b8f3e1c6f9 100644 --- a/src/vs/editor/test/common/modesTestUtils.ts +++ b/src/vs/editor/test/common/modesTestUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import Modes = require('vs/editor/common/modes'); +import * as Modes from 'vs/editor/common/modes'; import {Arrays} from 'vs/editor/common/core/arrays'; import {RichEditSupport} from 'vs/editor/common/modes/supports/richEditSupport'; diff --git a/src/vs/editor/test/common/viewModel/characterHardWrappingLineMapper.test.ts b/src/vs/editor/test/common/viewModel/characterHardWrappingLineMapper.test.ts index 9f900840465..ecdca905000 100644 --- a/src/vs/editor/test/common/viewModel/characterHardWrappingLineMapper.test.ts +++ b/src/vs/editor/test/common/viewModel/characterHardWrappingLineMapper.test.ts @@ -7,7 +7,7 @@ import assert = require('assert'); import CharacterHardWrappingLineMapper = require('vs/editor/common/viewModel/characterHardWrappingLineMapper'); import SplitLinesCollection = require('vs/editor/common/viewModel/splitLinesCollection'); -import EditorCommon = require('vs/editor/common/editorCommon'); +import * as EditorCommon from 'vs/editor/common/editorCommon'; function safeGetOutputLineCount(mapper:SplitLinesCollection.ILineMapping): number { if (!mapper) { diff --git a/src/vs/workbench/parts/debug/browser/debugViewer.ts b/src/vs/workbench/parts/debug/browser/debugViewer.ts index 49936cd81ee..789f533ebc1 100644 --- a/src/vs/workbench/parts/debug/browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/browser/debugViewer.ts @@ -661,7 +661,7 @@ export class WatchExpressionsController extends BaseDebugController { } } - protected onLeftClick(tree: tree.ITree, element: any, event: mouse.StandardMouseEvent): boolean { + protected onLeftClick(tree: tree.ITree, element: any, event: mouse.IMouseEvent): boolean { // double click on primitive value: open input box to be able to select and copy value. if (element instanceof model.Expression && event.detail === 2) { const expression = element; @@ -938,7 +938,7 @@ export class BreakpointsAccessibilityProvider implements tree.IAccessibilityProv export class BreakpointsController extends BaseDebugController { - protected onLeftClick(tree:tree.ITree, element: any, event: mouse.StandardMouseEvent): boolean { + protected onLeftClick(tree:tree.ITree, element: any, event: mouse.IMouseEvent): boolean { if (element instanceof model.ExceptionBreakpoint) { return false; } diff --git a/src/vs/workbench/parts/debug/browser/replViewer.ts b/src/vs/workbench/parts/debug/browser/replViewer.ts index 3a38f9b12a2..4df70ecbc49 100644 --- a/src/vs/workbench/parts/debug/browser/replViewer.ts +++ b/src/vs/workbench/parts/debug/browser/replViewer.ts @@ -370,7 +370,7 @@ export class ReplExpressionsRenderer implements tree.IRenderer { return linkContainer || text; } - private onLinkClick(event: mouse.StandardMouseEvent, resource: URI, line: number, column: number): void { + private onLinkClick(event: mouse.IMouseEvent, resource: URI, line: number, column: number): void { const selection = window.getSelection(); if (selection.type === 'Range') { return; // do not navigate when user is selecting @@ -485,7 +485,7 @@ export class ReplExpressionsController extends debugviewer.BaseDebugController { } protected onLeftClick(tree: tree.ITree, element: any, eventish: treedefaults.ICancelableEvent, origin: string = 'mouse'): boolean { - const mouseEvent = eventish; + const mouseEvent = eventish; // input and output are one element in the tree => we only expand if the user clicked on the output. if ((element.reference > 0 || (element instanceof model.KeyValueOutputElement && element.getChildren().length > 0)) && mouseEvent.target.className.indexOf('input expression') === -1) { super.onLeftClick(tree, element, eventish, origin); diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts index d074a2cf0e3..1ce79d97bd0 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts @@ -33,7 +33,7 @@ import {DesktopDragAndDropData, ExternalElementsDragAndDropData} from 'vs/base/p import {ClickBehavior, DefaultController} from 'vs/base/parts/tree/browser/treeDefaults'; import {ActionsRenderer} from 'vs/base/parts/tree/browser/actionsRenderer'; import {FileStat, NewStatPlaceholder} from 'vs/workbench/parts/files/common/explorerViewModel'; -import {DragMouseEvent, StandardMouseEvent} from 'vs/base/browser/mouseEvent'; +import {DragMouseEvent, IMouseEvent} from 'vs/base/browser/mouseEvent'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IPartService} from 'vs/workbench/services/part/common/partService'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; @@ -390,7 +390,7 @@ export class FileController extends DefaultController { this.state = state; } - /* protected */ public onLeftClick(tree: ITree, stat: FileStat, event: StandardMouseEvent, origin: string = 'mouse'): boolean { + /* protected */ public onLeftClick(tree: ITree, stat: FileStat, event: IMouseEvent, origin: string = 'mouse'): boolean { let payload = { origin: origin }; let isDoubleClick = (origin === 'mouse' && event.detail === 2); diff --git a/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts b/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts index fa5a462011c..b0e94a1bfa2 100644 --- a/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/workingFilesViewer.ts @@ -16,7 +16,7 @@ import errors = require('vs/base/common/errors'); import mime = require('vs/base/common/mime'); import uri from 'vs/base/common/uri'; import paths = require('vs/base/common/paths'); -import {StandardMouseEvent, DragMouseEvent} from 'vs/base/browser/mouseEvent'; +import {IMouseEvent, DragMouseEvent} from 'vs/base/browser/mouseEvent'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {Separator} from 'vs/base/browser/ui/actionbar/actionbar'; import actions = require('vs/base/common/actions'); @@ -341,7 +341,7 @@ export class WorkingFilesController extends DefaultController { } } - /* protected */ public onClick(tree: ITree, element: any, event: StandardMouseEvent): boolean { + /* protected */ public onClick(tree: ITree, element: any, event: IMouseEvent): boolean { // Close working file on middle mouse click if (element instanceof WorkingFileEntry && event.browserEvent && event.browserEvent.button === 1 /* Middle Button */) { @@ -356,7 +356,7 @@ export class WorkingFilesController extends DefaultController { return super.onClick(tree, element, event); } - /* protected */ public onLeftClick(tree: ITree, element: any, event: StandardMouseEvent, origin: string = 'mouse'): boolean { + /* protected */ public onLeftClick(tree: ITree, element: any, event: IMouseEvent, origin: string = 'mouse'): boolean { let payload = { origin: origin }; let isDoubleClick = (origin === 'mouse' && event.detail === 2); diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts index 5104ba45d41..90b4e6425cf 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts @@ -685,7 +685,7 @@ export class Controller extends treedefaults.DefaultController { this.downKeyBindingDispatcher.set(CommonKeybindings.SHIFT_PAGE_DOWN, this.onPageDown.bind(this)); } - protected onLeftClick(tree: tree.ITree, element: any, event: mouse.StandardMouseEvent): boolean { + protected onLeftClick(tree: tree.ITree, element: any, event: mouse.IMouseEvent): boolean { // Status group should never get selected nor expanded/collapsed if (element instanceof gitmodel.StatusGroup) { event.preventDefault();