From 8ba918073062ceab284a495378f6ec1340d3de70 Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Mon, 16 Feb 2015 19:16:16 -0800
Subject: [PATCH] Remove the one based APIs.

---
 src/compiler/scanner.ts   | 12 ++++--------
 src/compiler/utilities.ts |  5 -----
 src/services/services.ts  | 13 -------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 66ee7814414..186c2a5ee79 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -279,16 +279,12 @@ module ts {
     }
 
     export function getPositionOfZeroBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number {
-        return computePositionOfOneBasedLineAndCharacter(getLineStarts(sourceFile), line + 1, character + 1);
+        return computePositionOfZeroBasedLineAndCharacter(getLineStarts(sourceFile), line, character);
     }
 
-    export function getPositionOfOneBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number {
-        return computePositionOfOneBasedLineAndCharacter(getLineStarts(sourceFile), line, character);
-    }
-
-    export function computePositionOfOneBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number {
-        Debug.assert(line > 0 && line <= lineStarts.length);
-        return lineStarts[line - 1] + character - 1;
+    export function computePositionOfZeroBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number {
+        Debug.assert(line >= 0 && line < lineStarts.length);
+        return lineStarts[line] + character;
     }
 
     export function getLineStarts(sourceFile: SourceFile): number[] {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index d543adaa103..da00bba6a31 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -110,11 +110,6 @@ module ts {
         return getLineStarts(sourceFile)[line];
     }
 
-    export function getStartPositionOfOneBasedLine(line: number, sourceFile: SourceFile): number {
-        Debug.assert(line >= 1);
-        return getLineStarts(sourceFile)[line - 1];
-    }
-
     // This is a useful function for debugging purposes.
     export function nodePosToString(node: Node): string {
         var file = getSourceFileOfNode(node);
diff --git a/src/services/services.ts b/src/services/services.ts
index 0ee0c4f75c3..7f1e52e4962 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -62,10 +62,8 @@ module ts {
         nameTable: Map<string>;
         getNamedDeclarations(): Declaration[];
         getZeroBasedLineAndCharacterOfPosition(pos: number): LineAndCharacter;
-        getOneBasedLineAndCharacterOfPosition(pos: number): LineAndCharacter;
         getLineStarts(): number[];
         getPositionOfZeroBasedLineAndCharacter(line: number, character: number): number;
-        getPositionOfOneBasedLineAndCharacter(line: number, character: number): number;
         update(newText: string, textChangeRange: TextChangeRange): SourceFile;
     }
 
@@ -756,21 +754,10 @@ module ts {
             return ts.getZeroBasedLineAndCharacterOfPosition(this, position);
         }
 
-        public getOneBasedLineAndCharacterOfPosition(position: number): LineAndCharacter {
-            var result = ts.getZeroBasedLineAndCharacterOfPosition(this, position);
-            result.line++;
-            result.character++;
-            return result;
-        }
-
         public getLineStarts(): number[] {
             return getLineStarts(this);
         }
 
-        public getPositionOfOneBasedLineAndCharacter(line: number, character: number): number {
-            return ts.getPositionOfOneBasedLineAndCharacter(this, line, character);
-        }
-
         public getPositionOfZeroBasedLineAndCharacter(line: number, character: number): number {
             return ts.getPositionOfZeroBasedLineAndCharacter(this, line, character);
         }