Skip to content

Commit 7b0a1cd

Browse files
alexdimaalexdima
committed
Eliminate extraneuous model interfaces
1 parent 059ead3 commit 7b0a1cd

43 files changed

Lines changed: 274 additions & 318 deletions

Some content is hidden

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

‎build/monaco/monaco.d.ts.recipe‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,15 @@ export interface ICommandHandler {
6262
#include(vs/editor/standalone/browser/colorizer): IColorizerOptions, IColorizerElementOptions
6363
#include(vs/base/common/scrollable): ScrollbarVisibility
6464
#include(vs/platform/theme/common/themeService): ThemeColor
65-
#includeAll(vs/editor/common/editorCommon;IMode=>languages.IMode;LanguageIdentifier=>languages.LanguageIdentifier;editorOptions.=>): ISelection, IScrollEvent
65+
#includeAll(vs/editor/common/editorCommon;IMode=>languages.IMode;LanguageIdentifier=>languages.LanguageIdentifier;editorOptions.=>): IScrollEvent
6666
#includeAll(vs/editor/common/model/textModelEvents):
6767
#includeAll(vs/editor/common/controller/cursorEvents):
6868
#includeAll(vs/editor/common/config/editorOptions):
6969
#includeAll(vs/editor/browser/editorBrowser;editorCommon.=>;editorOptions.=>):
7070
#include(vs/editor/common/config/fontInfo): FontInfo, BareFontInfo
71+
72+
//compatibility:
73+
export type IReadOnlyModel = IModel;
7174
}
7275

7376
declare module monaco.languages {

‎src/vs/editor/common/commands/replaceCommand.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ export class ReplaceCommand implements editorCommon.ICommand {
2020
this.insertsAutoWhitespace = insertsAutoWhitespace;
2121
}
2222

23-
public getEditOperations(model: editorCommon.ITokenizedModel, builder: editorCommon.IEditOperationBuilder): void {
23+
public getEditOperations(model: editorCommon.IModel, builder: editorCommon.IEditOperationBuilder): void {
2424
builder.addTrackedEditOperation(this._range, this._text);
2525
}
2626

27-
public computeCursorState(model: editorCommon.ITokenizedModel, helper: editorCommon.ICursorStateComputerData): Selection {
27+
public computeCursorState(model: editorCommon.IModel, helper: editorCommon.ICursorStateComputerData): Selection {
2828
let inverseEditOperations = helper.getInverseEditOperations();
2929
let srcRange = inverseEditOperations[0].range;
3030
return new Selection(
@@ -48,11 +48,11 @@ export class ReplaceCommandWithoutChangingPosition implements editorCommon.IComm
4848
this.insertsAutoWhitespace = insertsAutoWhitespace;
4949
}
5050

51-
public getEditOperations(model: editorCommon.ITokenizedModel, builder: editorCommon.IEditOperationBuilder): void {
51+
public getEditOperations(model: editorCommon.IModel, builder: editorCommon.IEditOperationBuilder): void {
5252
builder.addTrackedEditOperation(this._range, this._text);
5353
}
5454

55-
public computeCursorState(model: editorCommon.ITokenizedModel, helper: editorCommon.ICursorStateComputerData): Selection {
55+
public computeCursorState(model: editorCommon.IModel, helper: editorCommon.ICursorStateComputerData): Selection {
5656
let inverseEditOperations = helper.getInverseEditOperations();
5757
let srcRange = inverseEditOperations[0].range;
5858
return new Selection(
@@ -80,11 +80,11 @@ export class ReplaceCommandWithOffsetCursorState implements editorCommon.IComman
8080
this.insertsAutoWhitespace = insertsAutoWhitespace;
8181
}
8282

83-
public getEditOperations(model: editorCommon.ITokenizedModel, builder: editorCommon.IEditOperationBuilder): void {
83+
public getEditOperations(model: editorCommon.IModel, builder: editorCommon.IEditOperationBuilder): void {
8484
builder.addTrackedEditOperation(this._range, this._text);
8585
}
8686

87-
public computeCursorState(model: editorCommon.ITokenizedModel, helper: editorCommon.ICursorStateComputerData): Selection {
87+
public computeCursorState(model: editorCommon.IModel, helper: editorCommon.ICursorStateComputerData): Selection {
8888
let inverseEditOperations = helper.getInverseEditOperations();
8989
let srcRange = inverseEditOperations[0].range;
9090
return new Selection(
@@ -109,12 +109,12 @@ export class ReplaceCommandThatPreservesSelection implements editorCommon.IComma
109109
this._initialSelection = initialSelection;
110110
}
111111

112-
public getEditOperations(model: editorCommon.ITokenizedModel, builder: editorCommon.IEditOperationBuilder): void {
112+
public getEditOperations(model: editorCommon.IModel, builder: editorCommon.IEditOperationBuilder): void {
113113
builder.addEditOperation(this._range, this._text);
114114
this._selectionId = builder.trackSelection(this._initialSelection);
115115
}
116116

117-
public computeCursorState(model: editorCommon.ITokenizedModel, helper: editorCommon.ICursorStateComputerData): Selection {
117+
public computeCursorState(model: editorCommon.IModel, helper: editorCommon.ICursorStateComputerData): Selection {
118118
return helper.getTrackedSelection(this._selectionId);
119119
}
120120
}

‎src/vs/editor/common/commands/shiftCommand.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as strings from 'vs/base/common/strings';
88
import { CursorColumns } from 'vs/editor/common/controller/cursorCommon';
99
import { Range } from 'vs/editor/common/core/range';
1010
import { Selection, SelectionDirection } from 'vs/editor/common/core/selection';
11-
import { ICommand, ICursorStateComputerData, IEditOperationBuilder, ITokenizedModel } from 'vs/editor/common/editorCommon';
11+
import { ICommand, ICursorStateComputerData, IEditOperationBuilder, IModel } from 'vs/editor/common/editorCommon';
1212
import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
1313
import { CharCode } from 'vs/base/common/charCode';
1414

@@ -62,7 +62,7 @@ export class ShiftCommand implements ICommand {
6262
}
6363
}
6464

65-
public getEditOperations(model: ITokenizedModel, builder: IEditOperationBuilder): void {
65+
public getEditOperations(model: IModel, builder: IEditOperationBuilder): void {
6666
const startLine = this._selection.startLineNumber;
6767

6868
let endLine = this._selection.endLineNumber;
@@ -216,7 +216,7 @@ export class ShiftCommand implements ICommand {
216216
this._selectionId = builder.trackSelection(this._selection);
217217
}
218218

219-
public computeCursorState(model: ITokenizedModel, helper: ICursorStateComputerData): Selection {
219+
public computeCursorState(model: IModel, helper: ICursorStateComputerData): Selection {
220220
if (this._useLastEditRangeForCursorEndPosition) {
221221
let lastOp = helper.getInverseEditOperations()[0];
222222
return new Selection(lastOp.range.endLineNumber, lastOp.range.endColumn, lastOp.range.endLineNumber, lastOp.range.endColumn);

‎src/vs/editor/common/commands/surroundSelectionCommand.ts‎

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

77
import { Range } from 'vs/editor/common/core/range';
88
import { Selection } from 'vs/editor/common/core/selection';
9-
import { ICommand, ICursorStateComputerData, IEditOperationBuilder, ITokenizedModel } from 'vs/editor/common/editorCommon';
9+
import { ICommand, ICursorStateComputerData, IEditOperationBuilder, IModel } from 'vs/editor/common/editorCommon';
1010

1111
export class SurroundSelectionCommand implements ICommand {
1212
private _range: Selection;
@@ -19,7 +19,7 @@ export class SurroundSelectionCommand implements ICommand {
1919
this._charAfterSelection = charAfterSelection;
2020
}
2121

22-
public getEditOperations(model: ITokenizedModel, builder: IEditOperationBuilder): void {
22+
public getEditOperations(model: IModel, builder: IEditOperationBuilder): void {
2323
builder.addTrackedEditOperation(new Range(
2424
this._range.startLineNumber,
2525
this._range.startColumn,
@@ -35,7 +35,7 @@ export class SurroundSelectionCommand implements ICommand {
3535
), this._charAfterSelection);
3636
}
3737

38-
public computeCursorState(model: ITokenizedModel, helper: ICursorStateComputerData): Selection {
38+
public computeCursorState(model: IModel, helper: ICursorStateComputerData): Selection {
3939
let inverseEditOperations = helper.getInverseEditOperations();
4040
let firstOperationRange = inverseEditOperations[0].range;
4141
let secondOperationRange = inverseEditOperations[1].range;

‎src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class TrimTrailingWhitespaceCommand implements editorCommon.ICommand {
2222
this.cursors = cursors;
2323
}
2424

25-
public getEditOperations(model: editorCommon.ITokenizedModel, builder: editorCommon.IEditOperationBuilder): void {
25+
public getEditOperations(model: editorCommon.IModel, builder: editorCommon.IEditOperationBuilder): void {
2626
let ops = trimTrailingWhitespace(model, this.cursors);
2727
for (let i = 0, len = ops.length; i < len; i++) {
2828
let op = ops[i];
@@ -33,15 +33,15 @@ export class TrimTrailingWhitespaceCommand implements editorCommon.ICommand {
3333
this.selectionId = builder.trackSelection(this.selection);
3434
}
3535

36-
public computeCursorState(model: editorCommon.ITokenizedModel, helper: editorCommon.ICursorStateComputerData): Selection {
36+
public computeCursorState(model: editorCommon.IModel, helper: editorCommon.ICursorStateComputerData): Selection {
3737
return helper.getTrackedSelection(this.selectionId);
3838
}
3939
}
4040

4141
/**
4242
* Generate commands for trimming trailing whitespace on a model and ignore lines on which cursors are sitting.
4343
*/
44-
export function trimTrailingWhitespace(model: editorCommon.ITextModel, cursors: Position[]): editorCommon.IIdentifiedSingleEditOperation[] {
44+
export function trimTrailingWhitespace(model: editorCommon.IModel, cursors: Position[]): editorCommon.IIdentifiedSingleEditOperation[] {
4545
// Sort cursors ascending
4646
cursors.sort((a, b) => {
4747
if (a.lineNumber === b.lineNumber) {

‎src/vs/editor/common/controller/cursorTypeOperations.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
88
import { ReplaceCommand, ReplaceCommandWithoutChangingPosition, ReplaceCommandWithOffsetCursorState } from 'vs/editor/common/commands/replaceCommand';
99
import { CursorColumns, CursorConfiguration, ICursorSimpleModel, EditOperationResult, EditOperationType } from 'vs/editor/common/controller/cursorCommon';
1010
import { Range } from 'vs/editor/common/core/range';
11-
import { ICommand, ITokenizedModel } from 'vs/editor/common/editorCommon';
11+
import { ICommand, IModel } from 'vs/editor/common/editorCommon';
1212
import * as strings from 'vs/base/common/strings';
1313
import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand';
1414
import { Selection } from 'vs/editor/common/core/selection';
@@ -136,7 +136,7 @@ export class TypeOperations {
136136
}
137137
}
138138

139-
private static _goodIndentForLine(config: CursorConfiguration, model: ITokenizedModel, lineNumber: number): string {
139+
private static _goodIndentForLine(config: CursorConfiguration, model: IModel, lineNumber: number): string {
140140
let action: IndentAction | EnterAction;
141141
let indentation: string;
142142

@@ -207,7 +207,7 @@ export class TypeOperations {
207207
return new ReplaceCommand(selection, typeText, insertsAutoWhitespace);
208208
}
209209

210-
public static tab(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[]): ICommand[] {
210+
public static tab(config: CursorConfiguration, model: IModel, selections: Selection[]): ICommand[] {
211211
let commands: ICommand[] = [];
212212
for (let i = 0, len = selections.length; i < len; i++) {
213213
const selection = selections[i];
@@ -248,7 +248,7 @@ export class TypeOperations {
248248
return commands;
249249
}
250250

251-
public static replacePreviousChar(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], txt: string, replaceCharCnt: number): EditOperationResult {
251+
public static replacePreviousChar(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: IModel, selections: Selection[], txt: string, replaceCharCnt: number): EditOperationResult {
252252
let commands: ICommand[] = [];
253253
for (let i = 0, len = selections.length; i < len; i++) {
254254
const selection = selections[i];
@@ -278,7 +278,7 @@ export class TypeOperations {
278278
}
279279
}
280280

281-
private static _enter(config: CursorConfiguration, model: ITokenizedModel, keepPosition: boolean, range: Range): ICommand {
281+
private static _enter(config: CursorConfiguration, model: IModel, keepPosition: boolean, range: Range): ICommand {
282282
if (!model.isCheapToTokenize(range.getStartPosition().lineNumber)) {
283283
let lineText = model.getLineContent(range.startLineNumber);
284284
let indentation = strings.getLeadingWhitespace(lineText).substring(0, range.startColumn - 1);
@@ -375,7 +375,7 @@ export class TypeOperations {
375375
}
376376
}
377377

378-
private static _isAutoIndentType(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[]): boolean {
378+
private static _isAutoIndentType(config: CursorConfiguration, model: IModel, selections: Selection[]): boolean {
379379
if (!config.autoIndent) {
380380
return false;
381381
}
@@ -389,7 +389,7 @@ export class TypeOperations {
389389
return true;
390390
}
391391

392-
private static _runAutoIndentType(config: CursorConfiguration, model: ITokenizedModel, range: Range, ch: string): ICommand {
392+
private static _runAutoIndentType(config: CursorConfiguration, model: IModel, range: Range, ch: string): ICommand {
393393
let currentIndentation = LanguageConfigurationRegistry.getIndentationAtPosition(model, range.startLineNumber, range.startColumn);
394394
let actualIndentation = LanguageConfigurationRegistry.getIndentActionForType(model, range, ch, {
395395
shiftIndent: (indentation) => {
@@ -425,7 +425,7 @@ export class TypeOperations {
425425
return null;
426426
}
427427

428-
private static _isAutoClosingCloseCharType(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], ch: string): boolean {
428+
private static _isAutoClosingCloseCharType(config: CursorConfiguration, model: IModel, selections: Selection[], ch: string): boolean {
429429
if (!config.autoClosingBrackets || !config.autoClosingPairsClose.hasOwnProperty(ch)) {
430430
return false;
431431
}
@@ -468,7 +468,7 @@ export class TypeOperations {
468468
return cnt;
469469
}
470470

471-
private static _runAutoClosingCloseCharType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], ch: string): EditOperationResult {
471+
private static _runAutoClosingCloseCharType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: IModel, selections: Selection[], ch: string): EditOperationResult {
472472
let commands: ICommand[] = [];
473473
for (let i = 0, len = selections.length; i < len; i++) {
474474
const selection = selections[i];
@@ -482,7 +482,7 @@ export class TypeOperations {
482482
});
483483
}
484484

485-
private static _isAutoClosingOpenCharType(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], ch: string): boolean {
485+
private static _isAutoClosingOpenCharType(config: CursorConfiguration, model: IModel, selections: Selection[], ch: string): boolean {
486486
if (!config.autoClosingBrackets || !config.autoClosingPairsOpen.hasOwnProperty(ch)) {
487487
return false;
488488
}
@@ -550,7 +550,7 @@ export class TypeOperations {
550550
return true;
551551
}
552552

553-
private static _runAutoClosingOpenCharType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], ch: string): EditOperationResult {
553+
private static _runAutoClosingOpenCharType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: IModel, selections: Selection[], ch: string): EditOperationResult {
554554
let commands: ICommand[] = [];
555555
for (let i = 0, len = selections.length; i < len; i++) {
556556
const selection = selections[i];
@@ -563,7 +563,7 @@ export class TypeOperations {
563563
});
564564
}
565565

566-
private static _isSurroundSelectionType(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], ch: string): boolean {
566+
private static _isSurroundSelectionType(config: CursorConfiguration, model: IModel, selections: Selection[], ch: string): boolean {
567567
if (!config.autoClosingBrackets || !config.surroundingPairs.hasOwnProperty(ch)) {
568568
return false;
569569
}
@@ -597,7 +597,7 @@ export class TypeOperations {
597597
return true;
598598
}
599599

600-
private static _runSurroundSelectionType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], ch: string): EditOperationResult {
600+
private static _runSurroundSelectionType(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: IModel, selections: Selection[], ch: string): EditOperationResult {
601601
let commands: ICommand[] = [];
602602
for (let i = 0, len = selections.length; i < len; i++) {
603603
const selection = selections[i];
@@ -610,14 +610,14 @@ export class TypeOperations {
610610
});
611611
}
612612

613-
private static _isTypeInterceptorElectricChar(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[]) {
613+
private static _isTypeInterceptorElectricChar(config: CursorConfiguration, model: IModel, selections: Selection[]) {
614614
if (selections.length === 1 && model.isCheapToTokenize(selections[0].getEndPosition().lineNumber)) {
615615
return true;
616616
}
617617
return false;
618618
}
619619

620-
private static _typeInterceptorElectricChar(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITokenizedModel, selection: Selection, ch: string): EditOperationResult {
620+
private static _typeInterceptorElectricChar(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: IModel, selection: Selection, ch: string): EditOperationResult {
621621
if (!config.electricChars.hasOwnProperty(ch) || !selection.isEmpty()) {
622622
return null;
623623
}
@@ -680,7 +680,7 @@ export class TypeOperations {
680680
return null;
681681
}
682682

683-
public static typeWithInterceptors(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], ch: string): EditOperationResult {
683+
public static typeWithInterceptors(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: IModel, selections: Selection[], ch: string): EditOperationResult {
684684

685685
if (ch === '\n') {
686686
let commands: ICommand[] = [];
@@ -747,7 +747,7 @@ export class TypeOperations {
747747
});
748748
}
749749

750-
public static typeWithoutInterceptors(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: ITokenizedModel, selections: Selection[], str: string): EditOperationResult {
750+
public static typeWithoutInterceptors(prevEditOperationType: EditOperationType, config: CursorConfiguration, model: IModel, selections: Selection[], str: string): EditOperationResult {
751751
let commands: ICommand[] = [];
752752
for (let i = 0, len = selections.length; i < len; i++) {
753753
commands[i] = new ReplaceCommand(selections[i], str);
@@ -758,7 +758,7 @@ export class TypeOperations {
758758
});
759759
}
760760

761-
public static lineInsertBefore(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[]): ICommand[] {
761+
public static lineInsertBefore(config: CursorConfiguration, model: IModel, selections: Selection[]): ICommand[] {
762762
let commands: ICommand[] = [];
763763
for (let i = 0, len = selections.length; i < len; i++) {
764764
let lineNumber = selections[i].positionLineNumber;
@@ -775,7 +775,7 @@ export class TypeOperations {
775775
return commands;
776776
}
777777

778-
public static lineInsertAfter(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[]): ICommand[] {
778+
public static lineInsertAfter(config: CursorConfiguration, model: IModel, selections: Selection[]): ICommand[] {
779779
let commands: ICommand[] = [];
780780
for (let i = 0, len = selections.length; i < len; i++) {
781781
const lineNumber = selections[i].positionLineNumber;
@@ -785,7 +785,7 @@ export class TypeOperations {
785785
return commands;
786786
}
787787

788-
public static lineBreakInsert(config: CursorConfiguration, model: ITokenizedModel, selections: Selection[]): ICommand[] {
788+
public static lineBreakInsert(config: CursorConfiguration, model: IModel, selections: Selection[]): ICommand[] {
789789
let commands: ICommand[] = [];
790790
for (let i = 0, len = selections.length; i < len; i++) {
791791
commands[i] = this._enter(config, model, true, selections[i]);

0 commit comments

Comments
 (0)