Remove usages of computeOneBasedLineAndCharacterOfPosition

CyrusNajmabadi · CyrusNajmabadi · commit 572c550a3328 · 2015-02-16T18:11:45.000-08:00
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -296,22 +296,17 @@ module ts {
     }
 
     export function computeZeroBasedLineAndCharacterOfPosition(lineStarts: number[], position: number) {
-        var oneBased = computeOneBasedLineAndCharacterOfPosition(lineStarts, position);
-        return { line: oneBased.line - 1, character: oneBased.character -1 };
-    }
-
-    export function computeOneBasedLineAndCharacterOfPosition(lineStarts: number[], position: number) {
         var lineNumber = binarySearch(lineStarts, position);
         if (lineNumber < 0) {
             // If the actual position was not found, 
             // the binary search returns the negative value of the next line start
             // e.g. if the line starts at [5, 10, 23, 80] and the position requested was 20
             // then the search will return -2
-            lineNumber = (~lineNumber) - 1;
+            lineNumber = ~lineNumber - 1;
         }
         return {
-            line: lineNumber + 1,
-            character: position - lineStarts[lineNumber] + 1
+            line: lineNumber,
+            character: position - lineStarts[lineNumber]
         };
     }
 
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -395,8 +395,8 @@ module FourSlash {
             this.currentCaretPosition = pos;
 
             var lineStarts = ts.computeLineStarts(this.getFileContent(this.activeFile.fileName));
-            var lineCharPos = ts.computeOneBasedLineAndCharacterOfPosition(lineStarts, pos);
-            this.scenarioActions.push('<MoveCaretToLineAndChar LineNumber="' + lineCharPos.line + '" CharNumber="' + lineCharPos.character + '" />');
+            var lineCharPos = ts.computeZeroBasedLineAndCharacterOfPosition(lineStarts, pos);
+            this.scenarioActions.push('<MoveCaretToLineAndChar LineNumber="' + (lineCharPos.line + 1) + '" CharNumber="' + (lineCharPos.character + 1) + '" />');
         }
 
         public moveCaretRight(count = 1) {
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -186,11 +186,7 @@ module Harness.LanguageService {
             var script: ScriptInfo = this.fileNameToScript[fileName];
             assert.isNotNull(script);
 
-            var result = ts.computeOneBasedLineAndCharacterOfPosition(script.lineMap, position);
-
-            assert.isTrue(result.line >= 1);
-            assert.isTrue(result.character >= 1);
-            return { line: result.line - 1, character: result.character - 1 };
+            return ts.computeZeroBasedLineAndCharacterOfPosition(script.lineMap, position);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -395,8 +395,8 @@ module FourSlash {`
`395`	`395`	`this.currentCaretPosition = pos;`
`396`	`396`
`397`	`397`	`var lineStarts = ts.computeLineStarts(this.getFileContent(this.activeFile.fileName));`
`398`		`- var lineCharPos = ts.computeOneBasedLineAndCharacterOfPosition(lineStarts, pos);`
`399`		`- this.scenarioActions.push('<MoveCaretToLineAndChar LineNumber="' + lineCharPos.line + '" CharNumber="' + lineCharPos.character + '" />');`
	`398`	`+ var lineCharPos = ts.computeZeroBasedLineAndCharacterOfPosition(lineStarts, pos);`
	`399`	`+ this.scenarioActions.push('<MoveCaretToLineAndChar LineNumber="' + (lineCharPos.line + 1) + '" CharNumber="' + (lineCharPos.character + 1) + '" />');`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`public moveCaretRight(count = 1) {`
Original file line number	Diff line number	Diff line change
`@@ -186,11 +186,7 @@ module Harness.LanguageService {`
`186`	`186`	`var script: ScriptInfo = this.fileNameToScript[fileName];`
`187`	`187`	`assert.isNotNull(script);`
`188`	`188`
`189`		`- var result = ts.computeOneBasedLineAndCharacterOfPosition(script.lineMap, position);`
`190`		`-`
`191`		`- assert.isTrue(result.line >= 1);`
`192`		`- assert.isTrue(result.character >= 1);`
`193`		`- return { line: result.line - 1, character: result.character - 1 };`
	`189`	`+ return ts.computeZeroBasedLineAndCharacterOfPosition(script.lineMap, position);`
`194`	`190`	`}`
`195`	`191`	`}`
`196`	`192`