Remove unused code

src/vs/editor/common/editorCommon.ts

@@ -2284,12 +2284,6 @@ export interface IRangeWithText {
 export interface IMirrorModel extends IEventEmitter, ITokenizedModel {
 	uri: URI;
 
-	getOffsetFromPosition(position:IPosition): number;
-	getPositionFromOffset(offset:number): Position;
-	getOffsetAndLengthFromRange(range:IRange): {offset:number; length:number;};
-	getRangeFromOffsetAndLength(offset:number, length:number): Range;
-	getLineStart(lineNumber:number): number;
-
 	getAllWordsWithRange(): IRangeWithText[];
 	getAllUniqueWords(skipWordOnce?:string): string[];
 

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

@@ -11,8 +11,6 @@ import {ModelLine} from 'vs/editor/common/model/modelLine';
 import {TextModel} from 'vs/editor/common/model/textModel';
 import {TextModelWithTokens} from 'vs/editor/common/model/textModelWithTokens';
 import {IMode} from 'vs/editor/common/modes';
-import {Range} from 'vs/editor/common/core/range';
-import {Position} from 'vs/editor/common/core/position';
 
 export interface IMirrorModelEvents {
 	contentChanged: editorCommon.IModelContentChangedEvent[];
@@ -54,44 +52,6 @@ export class AbstractMirrorModel extends TextModelWithTokens implements editorCo
 		return this._associatedResource;
 	}
 
-	public getRangeFromOffsetAndLength(offset:number, length:number): Range {
-		let startPosition = this.getPositionAt(offset);
-		let endPosition = this.getPositionAt(offset + length);
-		return new Range(
-			startPosition.lineNumber,
-			startPosition.column,
-			endPosition.lineNumber,
-			endPosition.column
-		);
-	}
-
-	public getOffsetAndLengthFromRange(range:editorCommon.IRange):{offset:number; length:number;} {
-		let startOffset = this.getOffsetAt(new Position(range.startLineNumber, range.startColumn));
-		let endOffset = this.getOffsetAt(new Position(range.endLineNumber, range.endColumn));
-		return {
-			offset: startOffset,
-			length: endOffset - startOffset
-		};
-	}
-
-	public getPositionFromOffset(offset:number): Position {
-		return this.getPositionAt(offset);
-	}
-
-	public getOffsetFromPosition(position:editorCommon.IPosition): number {
-		return this.getOffsetAt(position);
-	}
-
-	public getLineStart(lineNumber:number): number {
-		if (lineNumber < 1) {
-			lineNumber = 1;
-		}
-		if (lineNumber > this.getLineCount()) {
-			lineNumber = this.getLineCount();
-		}
-		return this.getOffsetAt(new Position(lineNumber, 1));
-	}
-
 	public getAllWordsWithRange(): editorCommon.IRangeWithText[] {
 		if (this._lines.length > 10000) {
 			// This is a very heavy method, unavailable for very heavy models

src/vs/editor/test/common/model/mirrorModel.test.ts

@@ -6,6 +6,7 @@
 import * as assert from 'assert';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import {IMirrorModelEvents, MirrorModel, createTestMirrorModelFromString} from 'vs/editor/common/model/mirrorModel';
+import {Position} from 'vs/editor/common/core/position';
 
 function equalRange(left, right) {
 	if(left.startLineNumber !== right.startLineNumber) {
@@ -84,16 +85,16 @@ suite('Editor Model - MirrorModel', () => {
 	});
 
 	test('get line start ', () => {
-		assert.equal(mirrorModel.getLineStart(1), 0);
-		assert.equal(mirrorModel.getLineStart(2), 6);
-		assert.equal(mirrorModel.getLineStart(3), 12);
-		assert.equal(mirrorModel.getLineStart(4), 18);
-		assert.equal(mirrorModel.getLineStart(1000), mirrorModel.getLineStart(mirrorModel.getLineCount()));
+		assert.equal(mirrorModel.getOffsetAt(new Position(1, 1)), 0);
+		assert.equal(mirrorModel.getOffsetAt(new Position(2, 1)), 6);
+		assert.equal(mirrorModel.getOffsetAt(new Position(3, 1)), 12);
+		assert.equal(mirrorModel.getOffsetAt(new Position(4, 1)), 18);
+		assert.equal(mirrorModel.getOffsetAt(new Position(1000, 1)), mirrorModel.getOffsetAt(new Position(mirrorModel.getLineCount(), mirrorModel.getLineMaxColumn(mirrorModel.getLineCount()))));
 	});
 
 	test('get line start /flush event/', () => {
-		assert.equal(mirrorModel.getLineStart(2), 6);
-		assert.equal(mirrorModel.getLineStart(3), 12);
+		assert.equal(mirrorModel.getOffsetAt(new Position(2, 1)), 6);
+		assert.equal(mirrorModel.getOffsetAt(new Position(3, 1)), 12);
 
 		mirrorModel.onEvents(mirrorModelEvents([contentChangedFlushEvent({
 			length: -1,
@@ -111,24 +112,24 @@ suite('Editor Model - MirrorModel', () => {
 			}
 		})]));
 
-		assert.equal(mirrorModel.getLineStart(1), 0);
-		assert.equal(mirrorModel.getLineStart(2), 4);
+		assert.equal(mirrorModel.getOffsetAt(new Position(1, 1)), 0);
+		assert.equal(mirrorModel.getOffsetAt(new Position(2, 1)), 4);
 	});
 
 	test('get offset', () => {
-		assert.equal(mirrorModel.getOffsetFromPosition({lineNumber: 1, column: 1}), 0);
-		assert.equal(mirrorModel.getOffsetFromPosition({lineNumber: 1, column: 3}), 2);
-		assert.equal(mirrorModel.getOffsetFromPosition({lineNumber: 2, column: 1}), 6);
-		assert.equal(mirrorModel.getOffsetFromPosition({lineNumber: 4, column: 6}), 23);
-		assert.equal(mirrorModel.getOffsetFromPosition({lineNumber: 4, column: 7}), 23);
+		assert.equal(mirrorModel.getOffsetAt({lineNumber: 1, column: 1}), 0);
+		assert.equal(mirrorModel.getOffsetAt({lineNumber: 1, column: 3}), 2);
+		assert.equal(mirrorModel.getOffsetAt({lineNumber: 2, column: 1}), 6);
+		assert.equal(mirrorModel.getOffsetAt({lineNumber: 4, column: 6}), 23);
+		assert.equal(mirrorModel.getOffsetAt({lineNumber: 4, column: 7}), 23);
 	});
 
 	test('get position from offset', () => {
-		assert.deepEqual(mirrorModel.getPositionFromOffset(0), {lineNumber: 1, column: 1});
-		assert.deepEqual(mirrorModel.getPositionFromOffset(2), {lineNumber: 1, column: 3});
-		assert.deepEqual(mirrorModel.getPositionFromOffset(6), {lineNumber: 2, column: 1});
-		assert.deepEqual(mirrorModel.getPositionFromOffset(23), {lineNumber: 4, column: 6});
-		assert.deepEqual(mirrorModel.getPositionFromOffset(24), {lineNumber: 4, column: 6});
+		assert.deepEqual(mirrorModel.getPositionAt(0), {lineNumber: 1, column: 1});
+		assert.deepEqual(mirrorModel.getPositionAt(2), {lineNumber: 1, column: 3});
+		assert.deepEqual(mirrorModel.getPositionAt(6), {lineNumber: 2, column: 1});
+		assert.deepEqual(mirrorModel.getPositionAt(23), {lineNumber: 4, column: 6});
+		assert.deepEqual(mirrorModel.getPositionAt(24), {lineNumber: 4, column: 6});
 	});
 
 	test('get (all/unique) words', () => {

src/vs/languages/html/test/common/html-worker.test.ts

@@ -48,7 +48,7 @@ suite('HTML - worker', () => {
 		var url = URI.parse('test://1');
 		var env = mockHtmlWorkerEnv(url, content);
 
-		var position = env.model.getPositionFromOffset(idx);
+		var position = env.model.getPositionAt(idx);
 		return env.worker.provideCompletionItems(url, position);
 	};