Skip to content

Commit 5c19a6a

Browse files
alexdimaalexdima
committed
Use protected
1 parent 23bf65a commit 5c19a6a

9 files changed

Lines changed: 34 additions & 40 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ export class ShiftCommand implements ICommand {
5151
}
5252

5353
public getEditOperations(model: ITokenizedModel, builder: IEditOperationBuilder): void {
54-
let startLine = this._selection.startLineNumber,
55-
endLine = this._selection.endLineNumber,
56-
_SPACE = ' '.charCodeAt(0);
54+
let startLine = this._selection.startLineNumber;
55+
let endLine = this._selection.endLineNumber;
56+
let _SPACE = ' '.charCodeAt(0);
5757

5858
if (this._selection.endColumn === 1 && startLine !== endLine) {
5959
endLine = endLine - 1;

‎src/vs/editor/common/commonCodeEditor.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom
8484

8585
protected id:number;
8686

87-
_lifetimeDispose: IDisposable[];
88-
_configuration:CommonEditorConfiguration;
87+
protected _lifetimeDispose: IDisposable[];
88+
protected _configuration:CommonEditorConfiguration;
8989

9090
protected _contributions:{ [key:string]:editorCommon.IEditorContribution; };
9191
protected _actions:{ [key:string]:editorCommon.IEditorAction; };
@@ -705,7 +705,7 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom
705705
return this._configuration.editor.layoutInfo;
706706
}
707707

708-
_attachModel(model:editorCommon.IModel): void {
708+
protected _attachModel(model:editorCommon.IModel): void {
709709
this.model = model ? model : null;
710710
this.listenersToRemove = [];
711711
this.viewModel = null;
@@ -913,7 +913,7 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom
913913

914914
protected abstract _getViewInternalEventBus(): IEventEmitter;
915915

916-
_postDetachModelCleanup(detachedModel:editorCommon.IModel): void {
916+
protected _postDetachModelCleanup(detachedModel:editorCommon.IModel): void {
917917
if (detachedModel) {
918918
this._decorationTypeKeysToIds = {};
919919
if (this._decorationTypeSubtypes) {

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

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,22 +1527,16 @@ export class OneCursorOp {
15271527
return false;
15281528
}
15291529

1530-
let selectionContainsOnlyWhitespace = true,
1531-
lineNumber:number,
1532-
startIndex:number,
1533-
endIndex:number,
1534-
charIndex:number,
1535-
charCode:number,
1536-
lineText:string,
1537-
_tab = '\t'.charCodeAt(0),
1538-
_space = ' '.charCodeAt(0);
1539-
1540-
for (lineNumber = selection.startLineNumber; lineNumber <= selection.endLineNumber; lineNumber++) {
1541-
lineText = cursor.model.getLineContent(lineNumber);
1542-
startIndex = (lineNumber === selection.startLineNumber ? selection.startColumn - 1 : 0);
1543-
endIndex = (lineNumber === selection.endLineNumber ? selection.endColumn - 1 : lineText.length);
1544-
for (charIndex = startIndex; charIndex < endIndex; charIndex++) {
1545-
charCode = lineText.charCodeAt(charIndex);
1530+
let selectionContainsOnlyWhitespace = true;
1531+
let _tab = '\t'.charCodeAt(0);
1532+
let _space = ' '.charCodeAt(0);
1533+
1534+
for (let lineNumber = selection.startLineNumber; lineNumber <= selection.endLineNumber; lineNumber++) {
1535+
let lineText = cursor.model.getLineContent(lineNumber);
1536+
let startIndex = (lineNumber === selection.startLineNumber ? selection.startColumn - 1 : 0);
1537+
let endIndex = (lineNumber === selection.endLineNumber ? selection.endColumn - 1 : lineText.length);
1538+
for (let charIndex = startIndex; charIndex < endIndex; charIndex++) {
1539+
let charCode = lineText.charCodeAt(charIndex);
15461540
if (charCode !== _tab && charCode !== _space) {
15471541
selectionContainsOnlyWhitespace = false;
15481542

‎src/vs/editor/common/model/compatMirrorModel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const NO_TAB_SIZE = 0;
2121

2222
export class AbstractMirrorModel extends TextModelWithTokens implements ICompatMirrorModel {
2323

24-
_associatedResource:URI;
24+
protected _associatedResource:URI;
2525

2626
constructor(allowedEventTypes:string[], versionId:number, value:editorCommon.IRawText, mode:IMode|TPromise<IMode>, associatedResource?:URI) {
2727
super(allowedEventTypes.concat([editorCommon.EventType.ModelDispose]), value, mode);

‎src/vs/editor/common/model/editableTextModel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class EditableTextModel extends TextModelWithDecorations implements edito
7070
super.dispose();
7171
}
7272

73-
_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
73+
protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
7474
super._resetValue(e, newValue);
7575

7676
// Destroy my edit history and settings

‎src/vs/editor/common/model/textModelWithDecorations.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export class TextModelWithDecorations extends TextModelWithTrackedRanges impleme
113113
super.dispose();
114114
}
115115

116-
_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
116+
protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
117117
super._resetValue(e, newValue);
118118

119119
// Destroy all my decorations
@@ -289,7 +289,7 @@ export class TextModelWithDecorations extends TextModelWithTrackedRanges impleme
289289
return result;
290290
}
291291

292-
_withDeferredEvents(callback:(deferredEventsBuilder:DeferredEventsBuilder)=>any): any {
292+
protected _withDeferredEvents(callback:(deferredEventsBuilder:DeferredEventsBuilder)=>any): any {
293293
return this.deferredEmit(() => {
294294
var createDeferredEvents = this._currentDeferredEvents ? false : true;
295295
if (createDeferredEvents) {

‎src/vs/editor/common/model/textModelWithMarkers.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export class TextModelWithMarkers extends TextModelWithTokens implements ITextMo
6262
super.dispose();
6363
}
6464

65-
_resetValue(e:IModelContentChangedFlushEvent, newValue:IRawText): void {
65+
protected _resetValue(e:IModelContentChangedFlushEvent, newValue:IRawText): void {
6666
super._resetValue(e, newValue);
6767

6868
// Destroy all my markers
@@ -195,7 +195,7 @@ export class TextModelWithMarkers extends TextModelWithTokens implements ITextMo
195195
}
196196
}
197197

198-
_getMarkersInMap(markersMap:{[markerId:string]:boolean;}): ILineMarker[] {
198+
protected _getMarkersInMap(markersMap:{[markerId:string]:boolean;}): ILineMarker[] {
199199
let result: ILineMarker[] = [];
200200
let keys = Object.keys(markersMap);
201201
for (let i = 0, len = keys.length; i < len; i++) {

‎src/vs/editor/common/model/textModelWithTokens.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class FullModelRetokenizer implements IRetokenizeRequest {
9292

9393
public isFulfilled: boolean;
9494

95-
_model:TextModelWithTokens;
95+
protected _model:TextModelWithTokens;
9696
private _retokenizePromise:TPromise<void>;
9797
private _isDisposed: boolean;
9898

@@ -302,17 +302,17 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
302302
}
303303
}
304304

305-
_createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
305+
protected _createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
306306
return new FullModelRetokenizer(retokenizePromise, this);
307307
}
308308

309-
_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
309+
protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
310310
super._resetValue(e, newValue);
311311
// Cancel tokenization, clear all tokens and begin tokenizing
312312
this._resetTokenizationState();
313313
}
314314

315-
_resetMode(e:editorCommon.IModelModeChangedEvent, newMode:IMode): void {
315+
protected _resetMode(e:editorCommon.IModelModeChangedEvent, newMode:IMode): void {
316316
// Cancel tokenization, clear all tokens and begin tokenizing
317317
this._mode = newMode;
318318
this._resetModeListener(newMode);
@@ -339,7 +339,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
339339
}
340340
}
341341

342-
_resetTokenizationState(): void {
342+
protected _resetTokenizationState(): void {
343343
this._retokenizers = dispose(this._retokenizers);
344344
this._scheduleRetokenizeNow.cancel();
345345
this._clearTimers();
@@ -397,7 +397,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
397397
return new LineContext(this.getModeId(), this._lines[lineNumber - 1], this._tokensInflatorMap);
398398
}
399399

400-
_getInternalTokens(lineNumber:number): editorCommon.ILineTokens {
400+
protected _getInternalTokens(lineNumber:number): editorCommon.ILineTokens {
401401
this._updateTokensUntilLine(lineNumber, true);
402402
return this._lines[lineNumber - 1].getTokens(this._tokensInflatorMap);
403403
}
@@ -454,7 +454,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
454454
}
455455
}
456456

457-
_invalidateLine(lineIndex:number): void {
457+
protected _invalidateLine(lineIndex:number): void {
458458
this._lines[lineIndex].isInvalid = true;
459459
if (lineIndex < this._invalidLineStartIndex) {
460460
if (this._invalidLineStartIndex < this._lines.length) {
@@ -685,7 +685,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
685685
return this._invalidLineStartIndex > lineNumber - 1;
686686
}
687687

688-
_getWordDefinition(): RegExp {
688+
protected _getWordDefinition(): RegExp {
689689
return WordHelper.massageWordDefinitionOf(this.getModeId());
690690
}
691691

‎src/vs/editor/common/model/textModelWithTrackedRanges.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class TextModelWithTrackedRanges extends TextModelWithMarkers implements
8585
this._multiLineTrackedRanges = {};
8686
}
8787

88-
_createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
88+
protected _createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
8989
return new TrackedRangeModelRetokenizer(retokenizePromise, lineNumber, this);
9090
}
9191

@@ -96,7 +96,7 @@ export class TextModelWithTrackedRanges extends TextModelWithMarkers implements
9696
super.dispose();
9797
}
9898

99-
_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
99+
protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
100100
super._resetValue(e, newValue);
101101

102102
// Destroy all my tracked ranges
@@ -346,7 +346,7 @@ export class TextModelWithTrackedRanges extends TextModelWithMarkers implements
346346
return result;
347347
}
348348

349-
_onChangedMarkers(changedMarkers:ILineMarker[]): editorCommon.IChangedTrackedRanges {
349+
protected _onChangedMarkers(changedMarkers:ILineMarker[]): editorCommon.IChangedTrackedRanges {
350350
var changedRanges:editorCommon.IChangedTrackedRanges = {},
351351
changedRange:editorCommon.IRange,
352352
range:ITrackedRange,

0 commit comments

Comments
 (0)