Skip to content

Commit 273cc0d

Browse files
alexdimaalexdima
committed
Organize imports
1 parent 4768799 commit 273cc0d

144 files changed

Lines changed: 2716 additions & 2713 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/editor/browser/controller/mouseHandler.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export class MouseHandler extends ViewEventHandler implements IDisposable {
206206
private _onContextMenu(rawEvent: MouseEvent): void {
207207
var e = new StandardMouseEvent(rawEvent);
208208
var t = this._createMouseTarget(e, true);
209-
var mouseEvent: editorBrowser.IMouseEvent = {
209+
var mouseEvent: editorBrowser.IEditorMouseEvent = {
210210
event: e,
211211
target: t
212212
};
@@ -225,7 +225,7 @@ export class MouseHandler extends ViewEventHandler implements IDisposable {
225225
}
226226

227227
var t = this._createMouseTarget(e, true);
228-
var mouseEvent: editorBrowser.IMouseEvent = {
228+
var mouseEvent: editorBrowser.IEditorMouseEvent = {
229229
event: e,
230230
target: t
231231
};
@@ -234,7 +234,7 @@ export class MouseHandler extends ViewEventHandler implements IDisposable {
234234

235235
private _onMouseLeave(rawEvent: MouseEvent): void {
236236
this.lastMouseLeaveTime = (new Date()).getTime();
237-
var mouseEvent: editorBrowser.IMouseEvent = {
237+
var mouseEvent: editorBrowser.IEditorMouseEvent = {
238238
event: new StandardMouseEvent(rawEvent),
239239
target: null
240240
};
@@ -245,7 +245,7 @@ export class MouseHandler extends ViewEventHandler implements IDisposable {
245245
var e = new StandardMouseEvent(rawEvent);
246246
var t = this._createMouseTarget(e, true);
247247

248-
var mouseEvent: editorBrowser.IMouseEvent = {
248+
var mouseEvent: editorBrowser.IEditorMouseEvent = {
249249
event: e,
250250
target: t
251251
};
@@ -295,7 +295,7 @@ export class MouseHandler extends ViewEventHandler implements IDisposable {
295295
}
296296
}
297297

298-
var mouseEvent: editorBrowser.IMouseEvent = {
298+
var mouseEvent: editorBrowser.IEditorMouseEvent = {
299299
event: e,
300300
target: t
301301
};

‎src/vs/editor/browser/editorBrowser.ts‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import * as EditorCommon from 'vs/editor/common/editorCommon';
8-
import EventEmitter = require('vs/base/common/eventEmitter');
9-
import Lifecycle = require('vs/base/common/lifecycle');
10-
import Mouse = require('vs/base/browser/mouseEvent');
11-
import Instantiation = require('vs/platform/instantiation/common/instantiation');
7+
import {IEmitterEvent, IEventEmitter} from 'vs/base/common/eventEmitter';
8+
import {IDisposable} from 'vs/base/common/lifecycle';
129
import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent';
10+
import {IMouseEvent} from 'vs/base/browser/mouseEvent';
11+
import {IConstructorSignature1, IInstantiationService, INewConstructorSignature1} from 'vs/platform/instantiation/common/instantiation';
12+
import * as editorCommon from 'vs/editor/common/editorCommon';
1313

14-
export interface IDynamicViewOverlay extends Lifecycle.IDisposable {
14+
export interface IDynamicViewOverlay extends IDisposable {
1515
shouldCallRender2(ctx:IRenderingContext): boolean;
1616
render2(lineNumber:number): string[];
1717
}
@@ -41,7 +41,7 @@ export interface ICodeEditorHelper {
4141
export interface IKeyboardHandlerHelper {
4242
viewDomNode:HTMLElement;
4343
textArea:HTMLTextAreaElement;
44-
visibleRangeForPositionRelativeToEditor(lineNumber:number, column:number): EditorCommon.VisibleRange;
44+
visibleRangeForPositionRelativeToEditor(lineNumber:number, column:number): editorCommon.VisibleRange;
4545
}
4646

4747
export interface IPointerHandlerHelper {
@@ -59,39 +59,39 @@ export interface IPointerHandlerHelper {
5959
isAfterLines(verticalOffset:number): boolean;
6060
getLineNumberAtVerticalOffset(verticalOffset: number): number;
6161
getVerticalOffsetForLineNumber(lineNumber: number): number;
62-
getWhitespaceAtVerticalOffset(verticalOffset:number): EditorCommon.IViewWhitespaceViewportData;
62+
getWhitespaceAtVerticalOffset(verticalOffset:number): editorCommon.IViewWhitespaceViewportData;
6363
shouldSuppressMouseDownOnViewZone(viewZoneId:number): boolean;
6464

6565
/**
6666
* Decode an Editor.IPosition from a rendered dom node
6767
*/
68-
getPositionFromDOMInfo(spanNode:HTMLElement, offset:number): EditorCommon.IPosition;
68+
getPositionFromDOMInfo(spanNode:HTMLElement, offset:number): editorCommon.IPosition;
6969

70-
visibleRangeForPosition2(lineNumber:number, column:number): EditorCommon.VisibleRange;
70+
visibleRangeForPosition2(lineNumber:number, column:number): editorCommon.VisibleRange;
7171
getLineWidth(lineNumber:number): number;
7272
}
7373

74-
export interface IView extends Lifecycle.IDisposable {
74+
export interface IView extends IDisposable {
7575
domNode: HTMLElement;
7676

77-
getInternalEventBus(): EventEmitter.IEventEmitter;
77+
getInternalEventBus(): IEventEmitter;
7878

7979
createOverviewRuler(cssClassName:string, minimumHeight:number, maximumHeight:number): IOverviewRuler;
8080
getCodeEditorHelper(): ICodeEditorHelper;
8181

82-
getCenteredRangeInViewport(): EditorCommon.IEditorRange;
82+
getCenteredRangeInViewport(): editorCommon.IEditorRange;
8383

8484
change(callback:(changeAccessor:IViewZoneChangeAccessor) => any): boolean;
85-
getWhitespaces(): EditorCommon.IEditorWhitespace[];
85+
getWhitespaces(): editorCommon.IEditorWhitespace[];
8686
renderOnce(callback:() => any): any;
8787

8888
render(now:boolean): void;
8989

9090
focus(): void;
9191
isFocused(): boolean;
9292

93-
saveState(): EditorCommon.IViewState;
94-
restoreState(state:EditorCommon.IViewState): void;
93+
saveState(): editorCommon.IViewState;
94+
restoreState(state:editorCommon.IViewState): void;
9595

9696
addContentWidget(widgetData: IContentWidgetData): void;
9797
layoutContentWidget(widgetData: IContentWidgetData): void;
@@ -104,9 +104,9 @@ export interface IView extends Lifecycle.IDisposable {
104104

105105
export interface IViewZoneData {
106106
viewZoneId: number;
107-
positionBefore:EditorCommon.IEditorPosition;
108-
positionAfter:EditorCommon.IEditorPosition;
109-
position: EditorCommon.IEditorPosition;
107+
positionBefore:editorCommon.IEditorPosition;
108+
positionAfter:editorCommon.IEditorPosition;
109+
position: editorCommon.IEditorPosition;
110110
afterLineNumber: number;
111111
}
112112

@@ -130,11 +130,11 @@ export interface IViewController {
130130

131131
emitKeyDown(e:IKeyboardEvent): void;
132132
emitKeyUp(e:IKeyboardEvent): void;
133-
emitContextMenu(e:IMouseEvent): void;
134-
emitMouseMove(e:IMouseEvent): void;
135-
emitMouseLeave(e:IMouseEvent): void;
136-
emitMouseUp(e:IMouseEvent): void;
137-
emitMouseDown(e:IMouseEvent): void;
133+
emitContextMenu(e:IEditorMouseEvent): void;
134+
emitMouseMove(e:IEditorMouseEvent): void;
135+
emitMouseLeave(e:IEditorMouseEvent): void;
136+
emitMouseUp(e:IEditorMouseEvent): void;
137+
emitMouseDown(e:IEditorMouseEvent): void;
138138
}
139139

140140
export var ClassNames = {
@@ -157,12 +157,12 @@ export var ClassNames = {
157157
};
158158

159159
export interface IRestrictedRenderingContext {
160-
linesViewportData:EditorCommon.IViewLinesViewportData;
160+
linesViewportData:editorCommon.IViewLinesViewportData;
161161

162162
scrollWidth:number;
163163
scrollHeight:number;
164164

165-
visibleRange:EditorCommon.IEditorRange;
165+
visibleRange:editorCommon.IEditorRange;
166166
bigNumbersDelta:number;
167167

168168
viewportTop:number;
@@ -174,29 +174,29 @@ export interface IRestrictedRenderingContext {
174174
getViewportVerticalOffsetForLineNumber(lineNumber:number): number;
175175
lineIsVisible(lineNumber:number): boolean;
176176

177-
getDecorationsInViewport(): EditorCommon.IModelDecoration[];
177+
getDecorationsInViewport(): editorCommon.IModelDecoration[];
178178
}
179179

180180
export interface IRenderingContext extends IRestrictedRenderingContext {
181181

182-
linesVisibleRangesForRange(range:EditorCommon.IRange, includeNewLines:boolean): EditorCommon.LineVisibleRanges[];
182+
linesVisibleRangesForRange(range:editorCommon.IRange, includeNewLines:boolean): editorCommon.LineVisibleRanges[];
183183

184-
visibleRangeForPosition(position:EditorCommon.IPosition): EditorCommon.VisibleRange;
184+
visibleRangeForPosition(position:editorCommon.IPosition): editorCommon.VisibleRange;
185185
}
186186

187187
export interface IViewEventHandler {
188-
handleEvents(events:EventEmitter.IEmitterEvent[]): void;
188+
handleEvents(events:IEmitterEvent[]): void;
189189
}
190190

191191
export interface IViewportInfo {
192-
visibleRange: EditorCommon.IEditorRange;
192+
visibleRange: editorCommon.IEditorRange;
193193
width:number;
194194
height:number;
195195
deltaTop:number;
196196
deltaLeft:number;
197197
}
198198

199-
export interface IViewPart extends Lifecycle.IDisposable {
199+
export interface IViewPart extends IDisposable {
200200
onBeforeForcedLayout(): void;
201201
onReadAfterForcedLayout(ctx:IRenderingContext): void;
202202
onWriteAfterForcedLayout(): void;
@@ -209,9 +209,9 @@ export interface IViewContext {
209209
addEventHandler(eventHandler:IViewEventHandler): void;
210210
removeEventHandler(eventHandler:IViewEventHandler): void;
211211

212-
configuration:EditorCommon.IConfiguration;
213-
model: EditorCommon.IViewModel;
214-
privateViewEventBus:EditorCommon.IViewEventBus;
212+
configuration:editorCommon.IConfiguration;
213+
model: editorCommon.IViewModel;
214+
privateViewEventBus:editorCommon.IViewEventBus;
215215
}
216216

217217
export interface ILayoutProvider extends IVerticalLayoutProvider, IScrollingProvider {
@@ -220,12 +220,12 @@ export interface ILayoutProvider extends IVerticalLayoutProvider, IScrollingProv
220220

221221
getCenteredViewLineNumberInViewport(): number;
222222

223-
getCurrentViewport(): EditorCommon.IViewport;
223+
getCurrentViewport(): editorCommon.IViewport;
224224

225225
onMaxLineWidthChanged(width:number): void;
226226

227-
saveState(): EditorCommon.IViewState;
228-
restoreState(state:EditorCommon.IViewState): void;
227+
saveState(): editorCommon.IViewState;
228+
restoreState(state:editorCommon.IViewState): void;
229229
}
230230

231231
export interface IScrollingProvider {
@@ -270,7 +270,7 @@ export interface IVerticalLayoutProvider {
270270
/**
271271
* Compute the lines that need to be rendered in the current viewport position.
272272
*/
273-
getLinesViewportData(): EditorCommon.IViewLinesViewportData;
273+
getLinesViewportData(): editorCommon.IViewLinesViewportData;
274274
}
275275

276276
/**
@@ -366,7 +366,7 @@ export interface IContentWidgetPosition {
366366
* Desired position for the content widget.
367367
* `preference` will also affect the placement.
368368
*/
369-
position: EditorCommon.IPosition;
369+
position: editorCommon.IPosition;
370370
/**
371371
* Placement preference for position, in order of preference.
372372
*/
@@ -453,15 +453,15 @@ export interface IMouseTarget {
453453
/**
454454
* The target type
455455
*/
456-
type: EditorCommon.MouseTargetType;
456+
type: editorCommon.MouseTargetType;
457457
/**
458458
* The 'approximate' editor position
459459
*/
460-
position: EditorCommon.IEditorPosition;
460+
position: editorCommon.IEditorPosition;
461461
/**
462462
* The 'approximate' editor range
463463
*/
464-
range: EditorCommon.IEditorRange;
464+
range: editorCommon.IEditorRange;
465465
/**
466466
* Some extra detail.
467467
*/
@@ -470,12 +470,12 @@ export interface IMouseTarget {
470470
/**
471471
* A mouse event originating from the editor.
472472
*/
473-
export interface IMouseEvent {
474-
event: Mouse.IMouseEvent;
473+
export interface IEditorMouseEvent {
474+
event: IMouseEvent;
475475
target: IMouseTarget;
476476
}
477477

478-
export type ISimpleEditorContributionCtor = Instantiation.IConstructorSignature1<ICodeEditor, EditorCommon.IEditorContribution> | Instantiation.INewConstructorSignature1<ICodeEditor, EditorCommon.IEditorContribution>;
478+
export type ISimpleEditorContributionCtor = IConstructorSignature1<ICodeEditor, editorCommon.IEditorContribution> | INewConstructorSignature1<ICodeEditor, editorCommon.IEditorContribution>;
479479

480480
/**
481481
* An editor contribution descriptor that will be used to construct editor contributions
@@ -484,7 +484,7 @@ export interface IEditorContributionDescriptor {
484484
/**
485485
* Create an instance of the contribution
486486
*/
487-
createInstance(instantiationService:Instantiation.IInstantiationService, editor:ICodeEditor): EditorCommon.IEditorContribution;
487+
createInstance(instantiationService:IInstantiationService, editor:ICodeEditor): editorCommon.IEditorContribution;
488488
}
489489

490490
/**
@@ -496,7 +496,7 @@ export interface IOverviewRulerZone {
496496
forceHeight?: number;
497497
color: string;
498498
darkColor: string;
499-
position: EditorCommon.OverviewRulerLane;
499+
position: editorCommon.OverviewRulerLane;
500500
}
501501
/**
502502
* An overview ruler
@@ -505,12 +505,12 @@ export interface IOverviewRuler {
505505
getDomNode(): HTMLElement;
506506
dispose(): void;
507507
setZones(zones:IOverviewRulerZone[]): void;
508-
setLayout(position:EditorCommon.IOverviewRulerPosition): void;
508+
setLayout(position:editorCommon.IOverviewRulerPosition): void;
509509
}
510510
/**
511511
* A rich code editor.
512512
*/
513-
export interface ICodeEditor extends EditorCommon.ICommonCodeEditor {
513+
export interface ICodeEditor extends editorCommon.ICommonCodeEditor {
514514

515515
/**
516516
* Returns the editor's dom node
@@ -553,12 +553,12 @@ export interface ICodeEditor extends EditorCommon.ICommonCodeEditor {
553553
/**
554554
* Returns the range that is currently centered in the view port.
555555
*/
556-
getCenteredRangeInViewport(): EditorCommon.IEditorRange;
556+
getCenteredRangeInViewport(): editorCommon.IEditorRange;
557557

558558
/**
559559
* Get the view zones.
560560
*/
561-
getWhitespaces(): EditorCommon.IEditorWhitespace[];
561+
getWhitespaces(): editorCommon.IEditorWhitespace[];
562562

563563
/**
564564
* Get the horizontal position (left offset) for the column w.r.t to the beginning of the line.
@@ -589,18 +589,18 @@ export interface ICodeEditor extends EditorCommon.ICommonCodeEditor {
589589
* Explanation 2: the results of this method will not change if the container of the editor gets repositioned.
590590
* Warning: the results of this method are innacurate for positions that are outside the current editor viewport.
591591
*/
592-
getScrolledVisiblePosition(position: EditorCommon.IPosition): { top: number; left: number; height: number; };
592+
getScrolledVisiblePosition(position: editorCommon.IPosition): { top: number; left: number; height: number; };
593593

594594
/**
595595
* Set the model ranges that will be hidden in the view.
596596
*/
597-
setHiddenAreas(ranges:EditorCommon.IRange[]): void;
597+
setHiddenAreas(ranges:editorCommon.IRange[]): void;
598598
}
599599

600600
/**
601601
* A rich diff editor.
602602
*/
603-
export interface IDiffEditor extends EditorCommon.ICommonDiffEditor {
603+
export interface IDiffEditor extends editorCommon.ICommonDiffEditor {
604604
/**
605605
* @see ICodeEditor.getDomNode
606606
*/

0 commit comments

Comments
 (0)