Skip to content

Commit 875e28c

Browse files
alexdimaalexdima
committed
Remove IEditorRange, IEditorSelection
1 parent 9de85cb commit 875e28c

95 files changed

Lines changed: 649 additions & 640 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.

‎build/lib/monaco-editor.d.ts‎

Lines changed: 120 additions & 129 deletions
Large diffs are not rendered by default.

‎build/lib/monaco-editor.d.ts.recipe‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ declare module monaco {
9292
new (context: IPlatformServices, first: A1, second: A2): T;
9393
}
9494

95-
#include(vs/editor/common/editorCommon): IPosition, IRange, IEditorRange, SelectionDirection, ISelection, IEditorSelection
95+
#include(vs/editor/common/editorCommon): IPosition, IRange, SelectionDirection, ISelection
9696
#include(vs/editor/common/core/position): Position
9797
#include(vs/editor/common/core/range): Range
9898
#include(vs/editor/common/core/selection): Selection
@@ -115,7 +115,7 @@ declare module monaco.editor {
115115

116116
#include(vs/editor/common/core/viewLineToken): ViewLineToken
117117

118-
#includeAll(vs/editor/common/editorCommon): IPosition, IRange, IEditorRange, SelectionDirection, ISelection, IEditorSelection, IFoundBracket
118+
#includeAll(vs/editor/common/editorCommon): IPosition, IRange, SelectionDirection, ISelection, IFoundBracket
119119

120120
#includeAll(vs/editor/browser/editorBrowser):
121121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ class MouseDownOperation extends Disposable {
316316
private _mouseMoveMonitor:GlobalMouseMoveMonitor<IMouseEvent>;
317317
private _mouseDownThenMoveEventHandler: EventGateKeeper<IMouseEvent>;
318318

319-
private _currentSelection: editorCommon.IEditorSelection;
319+
private _currentSelection: Selection;
320320
private _mouseState: MouseDownState;
321321

322322
private _onScrollTimeout: TimeoutTimer;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import {Position} from 'vs/editor/common/core/position';
88
import {Range as EditorRange} from 'vs/editor/common/core/range';
9-
import {EditorLayoutInfo, IEditorRange, IPosition, MouseTargetType} from 'vs/editor/common/editorCommon';
9+
import {EditorLayoutInfo, IPosition, MouseTargetType} from 'vs/editor/common/editorCommon';
1010
import {ClassNames, IMouseTarget, IViewZoneData} from 'vs/editor/browser/editorBrowser';
1111
import {IDomNodePosition} from 'vs/base/browser/dom';
1212
import {ViewContext} from 'vs/editor/common/view/viewContext';
@@ -29,10 +29,10 @@ class MouseTarget implements IMouseTarget {
2929
public type: MouseTargetType;
3030
public mouseColumn: number;
3131
public position: Position;
32-
public range: IEditorRange;
32+
public range: EditorRange;
3333
public detail: any;
3434

35-
constructor(element: Element, type: MouseTargetType, mouseColumn:number = 0, position:Position = null, range: IEditorRange = null, detail: any = null) {
35+
constructor(element: Element, type: MouseTargetType, mouseColumn:number = 0, position:Position = null, range: EditorRange = null, detail: any = null) {
3636
this.element = element;
3737
this.type = type;
3838
this.mouseColumn = mouseColumn;
@@ -575,7 +575,7 @@ export class MouseTargetFactory {
575575
return null;
576576
}
577577

578-
private _getFullLineRangeAtCoord(mouseVerticalOffset: number): { range: IEditorRange; isAfterLines: boolean; } {
578+
private _getFullLineRangeAtCoord(mouseVerticalOffset: number): { range: EditorRange; isAfterLines: boolean; } {
579579
if (this._viewHelper.isAfterLines(mouseVerticalOffset)) {
580580
// Below the last line
581581
var lineNumber = this._context.model.getLineCount();

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {IMouseEvent} from 'vs/base/browser/mouseEvent';
1111
import {IInstantiationService, IConstructorSignature1} from 'vs/platform/instantiation/common/instantiation';
1212
import * as editorCommon from 'vs/editor/common/editorCommon';
1313
import {Position} from 'vs/editor/common/core/position';
14+
import {Range} from 'vs/editor/common/core/range';
1415

1516
export interface IContentWidgetData {
1617
widget: IContentWidget;
@@ -44,7 +45,7 @@ export interface IView extends IDisposable {
4445
createOverviewRuler(cssClassName:string, minimumHeight:number, maximumHeight:number): IOverviewRuler;
4546
getCodeEditorHelper(): ICodeEditorHelper;
4647

47-
getCenteredRangeInViewport(): editorCommon.IEditorRange;
48+
getCenteredRangeInViewport(): Range;
4849

4950
change(callback:(changeAccessor:IViewZoneChangeAccessor) => any): boolean;
5051
getWhitespaces(): editorCommon.IEditorWhitespace[];
@@ -131,7 +132,7 @@ export var ClassNames = {
131132
};
132133

133134
export interface IViewportInfo {
134-
visibleRange: editorCommon.IEditorRange;
135+
visibleRange: Range;
135136
width:number;
136137
height:number;
137138
deltaTop:number;
@@ -332,7 +333,7 @@ export interface IMouseTarget {
332333
/**
333334
* The 'approximate' editor range
334335
*/
335-
range: editorCommon.IEditorRange;
336+
range: Range;
336337
/**
337338
* Some extra detail.
338339
*/
@@ -518,7 +519,7 @@ export interface ICodeEditor extends editorCommon.ICommonCodeEditor {
518519
/**
519520
* Returns the range that is currently centered in the view port.
520521
*/
521-
getCenteredRangeInViewport(): editorCommon.IEditorRange;
522+
getCenteredRangeInViewport(): Range;
522523

523524
/**
524525
* Get the view zones.

‎src/vs/editor/browser/standalone/simpleServices.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
2424
import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
2525
import * as editorCommon from 'vs/editor/common/editorCommon';
2626
import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser';
27+
import {Selection} from 'vs/editor/common/core/selection';
2728

2829
export class SimpleEditor implements IEditor {
2930

@@ -39,7 +40,7 @@ export class SimpleEditor implements IEditor {
3940

4041
public getId():string { return 'editor'; }
4142
public getControl():editorCommon.IEditor { return this._widget; }
42-
public getSelection():editorCommon.IEditorSelection { return this._widget.getSelection(); }
43+
public getSelection():Selection { return this._widget.getSelection(); }
4344
public focus():void { this._widget.focus(); }
4445

4546
public withTypedEditor<T>(codeEditorCallback:(editor:ICodeEditor)=>T, diffEditorCallback:(editor:IDiffEditor)=>T): T {

‎src/vs/editor/browser/view/viewController.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
1111
import {IEditorMouseEvent, IViewController, IMouseDispatchData} from 'vs/editor/browser/editorBrowser';
1212
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
1313
import {IViewModel} from 'vs/editor/common/viewModel/viewModel';
14+
import {Range} from 'vs/editor/common/core/range';
1415

1516
export interface TriggerCursorHandler {
1617
(source:string, handlerId:string, payload:any): void;
@@ -238,7 +239,7 @@ export class ViewController implements IViewController {
238239
return this.viewModel.convertViewPositionToModelPosition(viewPosition.lineNumber, viewPosition.column);
239240
}
240241

241-
private convertViewToModelRange(viewRange:editorCommon.IRange): editorCommon.IEditorRange {
242+
private convertViewToModelRange(viewRange:editorCommon.IRange): Range {
242243
return this.viewModel.convertViewRangeToModelRange(viewRange);
243244
}
244245

‎src/vs/editor/browser/view/viewImpl.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
582582
return this.codeEditorHelper;
583583
}
584584

585-
public getCenteredRangeInViewport(): editorCommon.IEditorRange {
585+
public getCenteredRangeInViewport(): Range {
586586
if (this._isDisposed) {
587587
throw new Error('ViewImpl.getCenteredRangeInViewport: View is disposed');
588588
}

‎src/vs/editor/browser/viewParts/lines/viewLines.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ export class ViewLines extends ViewLayer {
436436
}
437437
}
438438

439-
private _computeScrollTopToRevealRange(viewport:editorCommon.Viewport, range: editorCommon.IEditorRange, verticalType: editorCommon.VerticalRevealType): number {
439+
private _computeScrollTopToRevealRange(viewport:editorCommon.Viewport, range: Range, verticalType: editorCommon.VerticalRevealType): number {
440440
var viewportStartY = viewport.top,
441441
viewportHeight = viewport.height,
442442
viewportEndY = viewportStartY + viewportHeight,
@@ -469,7 +469,7 @@ export class ViewLines extends ViewLayer {
469469
return newScrollTop;
470470
}
471471

472-
private _computeScrollLeftToRevealRange(range: editorCommon.IEditorRange): { scrollLeft: number; maxHorizontalOffset: number; } {
472+
private _computeScrollLeftToRevealRange(range: Range): { scrollLeft: number; maxHorizontalOffset: number; } {
473473

474474
var maxHorizontalOffset = 0;
475475

‎src/vs/editor/browser/viewParts/selections/selections.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {DynamicViewOverlay} from 'vs/editor/browser/view/dynamicViewOverlay';
1111
import {ViewContext} from 'vs/editor/common/view/viewContext';
1212
import {HorizontalRange, LineVisibleRanges} from 'vs/editor/common/view/renderingContext';
1313
import {IRenderingContext} from 'vs/editor/common/view/renderingContext';
14+
import {Range} from 'vs/editor/common/core/range';
1415

1516
enum CornerStyle {
1617
EXTERN,
@@ -78,7 +79,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
7879
private _context:ViewContext;
7980
private _lineHeight:number;
8081
private _roundedSelection:boolean;
81-
private _selections:editorCommon.IEditorRange[];
82+
private _selections:Range[];
8283
private _renderResult:string[];
8384

8485
constructor(context:ViewContext) {
@@ -271,7 +272,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
271272
}
272273
}
273274

274-
private _getVisibleRangesWithStyle(selection: editorCommon.IEditorRange, ctx: IRenderingContext, previousFrame:LineVisibleRangesWithStyle[]): LineVisibleRangesWithStyle[] {
275+
private _getVisibleRangesWithStyle(selection: Range, ctx: IRenderingContext, previousFrame:LineVisibleRangesWithStyle[]): LineVisibleRangesWithStyle[] {
275276
let _linesVisibleRanges = ctx.linesVisibleRangesForRange(selection, true) || [];
276277
let linesVisibleRanges = _linesVisibleRanges.map(toStyled);
277278
let visibleRangesHaveGaps = this._visibleRangesHaveGaps(linesVisibleRanges);

0 commit comments

Comments
 (0)