Use protected

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

@@ -51,9 +51,9 @@ export class ShiftCommand implements ICommand {
 	}
 
 	public getEditOperations(model: ITokenizedModel, builder: IEditOperationBuilder): void {
-		let startLine = this._selection.startLineNumber,
-			endLine = this._selection.endLineNumber,
-			_SPACE = ' '.charCodeAt(0);
+		let startLine = this._selection.startLineNumber;
+		let endLine = this._selection.endLineNumber;
+		let _SPACE = ' '.charCodeAt(0);
 
 		if (this._selection.endColumn === 1 && startLine !== endLine) {
 			endLine = endLine - 1;

src/vs/editor/common/commonCodeEditor.ts

@@ -84,8 +84,8 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom
 
 	protected id:number;
 
-	_lifetimeDispose: IDisposable[];
-	_configuration:CommonEditorConfiguration;
+	protected _lifetimeDispose: IDisposable[];
+	protected _configuration:CommonEditorConfiguration;
 
 	protected _contributions:{ [key:string]:editorCommon.IEditorContribution; };
 	protected _actions:{ [key:string]:editorCommon.IEditorAction; };
@@ -705,7 +705,7 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom
 		return this._configuration.editor.layoutInfo;
 	}
 
-	_attachModel(model:editorCommon.IModel): void {
+	protected _attachModel(model:editorCommon.IModel): void {
 		this.model = model ? model : null;
 		this.listenersToRemove = [];
 		this.viewModel = null;
@@ -913,7 +913,7 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom
 
 	protected abstract _getViewInternalEventBus(): IEventEmitter;
 
-	_postDetachModelCleanup(detachedModel:editorCommon.IModel): void {
+	protected _postDetachModelCleanup(detachedModel:editorCommon.IModel): void {
 		if (detachedModel) {
 			this._decorationTypeKeysToIds = {};
 			if (this._decorationTypeSubtypes) {

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

@@ -1527,22 +1527,16 @@ export class OneCursorOp {
 			return false;
 		}
 
-		let selectionContainsOnlyWhitespace = true,
-			lineNumber:number,
-			startIndex:number,
-			endIndex:number,
-			charIndex:number,
-			charCode:number,
-			lineText:string,
-			_tab = '\t'.charCodeAt(0),
-			_space = ' '.charCodeAt(0);
-
-		for (lineNumber = selection.startLineNumber; lineNumber <= selection.endLineNumber; lineNumber++) {
-			lineText = cursor.model.getLineContent(lineNumber);
-			startIndex = (lineNumber === selection.startLineNumber ? selection.startColumn - 1 : 0);
-			endIndex = (lineNumber === selection.endLineNumber ? selection.endColumn - 1 : lineText.length);
-			for (charIndex = startIndex; charIndex < endIndex; charIndex++) {
-				charCode = lineText.charCodeAt(charIndex);
+		let selectionContainsOnlyWhitespace = true;
+		let _tab = '\t'.charCodeAt(0);
+		let _space = ' '.charCodeAt(0);
+
+		for (let lineNumber = selection.startLineNumber; lineNumber <= selection.endLineNumber; lineNumber++) {
+			let lineText = cursor.model.getLineContent(lineNumber);
+			let startIndex = (lineNumber === selection.startLineNumber ? selection.startColumn - 1 : 0);
+			let endIndex = (lineNumber === selection.endLineNumber ? selection.endColumn - 1 : lineText.length);
+			for (let charIndex = startIndex; charIndex < endIndex; charIndex++) {
+				let charCode = lineText.charCodeAt(charIndex);
 				if (charCode !== _tab && charCode !== _space) {
 					selectionContainsOnlyWhitespace = false;
 

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

@@ -21,7 +21,7 @@ const NO_TAB_SIZE = 0;
 
 export class AbstractMirrorModel extends TextModelWithTokens implements ICompatMirrorModel {
 
-	_associatedResource:URI;
+	protected _associatedResource:URI;
 
 	constructor(allowedEventTypes:string[], versionId:number, value:editorCommon.IRawText, mode:IMode|TPromise<IMode>, associatedResource?:URI) {
 		super(allowedEventTypes.concat([editorCommon.EventType.ModelDispose]), value, mode);

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

@@ -70,7 +70,7 @@ export class EditableTextModel extends TextModelWithDecorations implements edito
 		super.dispose();
 	}
 
-	_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
+	protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
 		super._resetValue(e, newValue);
 
 		// Destroy my edit history and settings

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

@@ -113,7 +113,7 @@ export class TextModelWithDecorations extends TextModelWithTrackedRanges impleme
 		super.dispose();
 	}
 
-	_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
+	protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
 		super._resetValue(e, newValue);
 
 		// Destroy all my decorations
@@ -289,7 +289,7 @@ export class TextModelWithDecorations extends TextModelWithTrackedRanges impleme
 		return result;
 	}
 
-	_withDeferredEvents(callback:(deferredEventsBuilder:DeferredEventsBuilder)=>any): any {
+	protected _withDeferredEvents(callback:(deferredEventsBuilder:DeferredEventsBuilder)=>any): any {
 		return this.deferredEmit(() => {
 			var createDeferredEvents = this._currentDeferredEvents ? false : true;
 			if (createDeferredEvents) {

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

@@ -62,7 +62,7 @@ export class TextModelWithMarkers extends TextModelWithTokens implements ITextMo
 		super.dispose();
 	}
 
-	_resetValue(e:IModelContentChangedFlushEvent, newValue:IRawText): void {
+	protected _resetValue(e:IModelContentChangedFlushEvent, newValue:IRawText): void {
 		super._resetValue(e, newValue);
 
 		// Destroy all my markers
@@ -195,7 +195,7 @@ export class TextModelWithMarkers extends TextModelWithTokens implements ITextMo
 		}
 	}
 
-	_getMarkersInMap(markersMap:{[markerId:string]:boolean;}): ILineMarker[] {
+	protected _getMarkersInMap(markersMap:{[markerId:string]:boolean;}): ILineMarker[] {
 		let result: ILineMarker[] = [];
 		let keys = Object.keys(markersMap);
 		for (let i = 0, len = keys.length; i < len; i++) {

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

@@ -92,7 +92,7 @@ export class FullModelRetokenizer implements IRetokenizeRequest {
 
 	public isFulfilled: boolean;
 
-	_model:TextModelWithTokens;
+	protected _model:TextModelWithTokens;
 	private _retokenizePromise:TPromise<void>;
 	private _isDisposed: boolean;
 
@@ -302,17 +302,17 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 		}
 	}
 
-	_createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
+	protected _createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
 		return new FullModelRetokenizer(retokenizePromise, this);
 	}
 
-	_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
+	protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
 		super._resetValue(e, newValue);
 		// Cancel tokenization, clear all tokens and begin tokenizing
 		this._resetTokenizationState();
 	}
 
-	_resetMode(e:editorCommon.IModelModeChangedEvent, newMode:IMode): void {
+	protected _resetMode(e:editorCommon.IModelModeChangedEvent, newMode:IMode): void {
 		// Cancel tokenization, clear all tokens and begin tokenizing
 		this._mode = newMode;
 		this._resetModeListener(newMode);
@@ -339,7 +339,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 		}
 	}
 
-	_resetTokenizationState(): void {
+	protected _resetTokenizationState(): void {
 		this._retokenizers = dispose(this._retokenizers);
 		this._scheduleRetokenizeNow.cancel();
 		this._clearTimers();
@@ -397,7 +397,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 		return new LineContext(this.getModeId(), this._lines[lineNumber - 1], this._tokensInflatorMap);
 	}
 
-	_getInternalTokens(lineNumber:number): editorCommon.ILineTokens {
+	protected _getInternalTokens(lineNumber:number): editorCommon.ILineTokens {
 		this._updateTokensUntilLine(lineNumber, true);
 		return this._lines[lineNumber - 1].getTokens(this._tokensInflatorMap);
 	}
@@ -454,7 +454,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 		}
 	}
 
-	_invalidateLine(lineIndex:number): void {
+	protected _invalidateLine(lineIndex:number): void {
 		this._lines[lineIndex].isInvalid = true;
 		if (lineIndex < this._invalidLineStartIndex) {
 			if (this._invalidLineStartIndex < this._lines.length) {
@@ -685,7 +685,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 		return this._invalidLineStartIndex > lineNumber - 1;
 	}
 
-	_getWordDefinition(): RegExp {
+	protected _getWordDefinition(): RegExp {
 		return WordHelper.massageWordDefinitionOf(this.getModeId());
 	}
 

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

@@ -85,7 +85,7 @@ export class TextModelWithTrackedRanges extends TextModelWithMarkers implements
 		this._multiLineTrackedRanges = {};
 	}
 
-	_createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
+	protected _createRetokenizer(retokenizePromise:TPromise<void>, lineNumber:number): IRetokenizeRequest {
 		return new TrackedRangeModelRetokenizer(retokenizePromise, lineNumber, this);
 	}
 
@@ -96,7 +96,7 @@ export class TextModelWithTrackedRanges extends TextModelWithMarkers implements
 		super.dispose();
 	}
 
-	_resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
+	protected _resetValue(e:editorCommon.IModelContentChangedFlushEvent, newValue:editorCommon.IRawText): void {
 		super._resetValue(e, newValue);
 
 		// Destroy all my tracked ranges
@@ -346,7 +346,7 @@ export class TextModelWithTrackedRanges extends TextModelWithMarkers implements
 		return result;
 	}
 
-	_onChangedMarkers(changedMarkers:ILineMarker[]): editorCommon.IChangedTrackedRanges {
+	protected _onChangedMarkers(changedMarkers:ILineMarker[]): editorCommon.IChangedTrackedRanges {
 		var changedRanges:editorCommon.IChangedTrackedRanges = {},
 			changedRange:editorCommon.IRange,
 			range:ITrackedRange,