microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 04:43:37 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove the one based APIs.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2015-02-16 19:16:16 -08:00
parent 041b646004
commit 8ba9180730
3 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/scanner.ts
View File

@@ -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[] {

5
src/compiler/utilities.ts
View File

@@ -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);

13
src/services/services.ts
View File

@@ -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);
}