Skip to content

Commit b3366ec

Browse files
CyrusNajmabadiCyrusNajmabadi
committed
name more line/char functions more clearly. Use zero based indexing in breakpoints.
1 parent afb083a commit b3366ec

11 files changed

Lines changed: 54 additions & 49 deletions

File tree

‎src/compiler/emitter.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ module ts {
173173
var lastLine = getLineStarts(currentSourceFile).length;
174174
var firstCommentLineIndent: number;
175175
for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
176-
var nextLineStart = currentLine === lastLine ? (comment.end + 1) : getPositionFromOneBasedLineAndCharacter(currentSourceFile, currentLine + 1, /*character*/1);
176+
var nextLineStart = currentLine === lastLine ? (comment.end + 1) : getPositionOfOneBasedLineAndCharacter(currentSourceFile, currentLine + 1, /*character*/1);
177177

178178
if (pos !== comment.pos) {
179179
// If we are not emitting first line, we need to write the spaces to adjust the alignment
180180
if (firstCommentLineIndent === undefined) {
181-
firstCommentLineIndent = calculateIndent(getPositionFromOneBasedLineAndCharacter(currentSourceFile, firstCommentLineAndCharacter.line, /*character*/1),
181+
firstCommentLineIndent = calculateIndent(getPositionOfOneBasedLineAndCharacter(currentSourceFile, firstCommentLineAndCharacter.line, /*character*/1),
182182
comment.pos);
183183
}
184184

‎src/compiler/scanner.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ module ts {
278278
return result;
279279
}
280280

281-
export function getPositionFromZeroBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number {
282-
return computePositionFromOneBasedLineAndCharacter(getLineStarts(sourceFile), line + 1, character + 1);
281+
export function getPositionOfZeroBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number {
282+
return computePositionOfOneBasedLineAndCharacter(getLineStarts(sourceFile), line + 1, character + 1);
283283
}
284284

285-
export function getPositionFromOneBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number {
286-
return computePositionFromOneBasedLineAndCharacter(getLineStarts(sourceFile), line, character);
285+
export function getPositionOfOneBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number {
286+
return computePositionOfOneBasedLineAndCharacter(getLineStarts(sourceFile), line, character);
287287
}
288288

289-
export function computePositionFromOneBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number {
289+
export function computePositionOfOneBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number {
290290
Debug.assert(line > 0 && line <= lineStarts.length);
291291
return lineStarts[line - 1] + character - 1;
292292
}

‎src/harness/harness.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,7 @@ module Harness {
11841184
}
11851185

11861186
export function getMinimalDiagnostic(err: ts.Diagnostic): HarnessDiagnostic {
1187-
var errorLineInfo = err.file ? err.file.getOneBasedLineAndCharacterFromPosition(err.start) : { line: 0, character: 0 };
1187+
var errorLineInfo = err.file ? err.file.getOneBasedLineAndCharacterOfPosition(err.start) : { line: 0, character: 0 };
11881188
return {
11891189
fileName: err.file && err.file.fileName,
11901190
start: err.start,

‎src/harness/harnessLanguageService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ module Harness.LanguageService {
175175
assert.isTrue(line >= 1);
176176
assert.isTrue(col >= 1);
177177

178-
return ts.computePositionFromOneBasedLineAndCharacter(script.lineMap, line, col);
178+
return ts.computePositionOfOneBasedLineAndCharacter(script.lineMap, line, col);
179179
}
180180

181181
/**

‎src/harness/typeWriter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class TypeWriterWalker {
8585

8686
private log(node: ts.Node, type: ts.Type): void {
8787
var actualPos = ts.skipTrivia(this.currentSourceFile.text, node.pos);
88-
var lineAndCharacter = this.currentSourceFile.getOneBasedLineAndCharacterFromPosition(actualPos);
88+
var lineAndCharacter = this.currentSourceFile.getOneBasedLineAndCharacterOfPosition(actualPos);
8989
var sourceText = ts.getTextOfNodeFromSourceText(this.currentSourceFile.text, node);
9090

9191
// If we got an unknown type, we temporarily want to fall back to just pretending the name

‎src/services/breakpoints.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ module ts.BreakpointResolver {
1414
}
1515

1616
var tokenAtLocation = getTokenAtPosition(sourceFile, position);
17-
var lineOfPosition = sourceFile.getOneBasedLineAndCharacterFromPosition(position).line;
18-
if (sourceFile.getOneBasedLineAndCharacterFromPosition(tokenAtLocation.getStart()).line > lineOfPosition) {
17+
var lineOfPosition = sourceFile.getZeroBasedLineAndCharacterOfPosition(position).line;
18+
if (sourceFile.getZeroBasedLineAndCharacterOfPosition(tokenAtLocation.getStart()).line > lineOfPosition) {
1919
// Get previous token if the token is returned starts on new line
20-
// eg: var x =10; |--- curser is here
20+
// eg: var x =10; |--- cursor is here
2121
// var y = 10;
2222
// token at position will return var keyword on second line as the token but we would like to use
2323
// token on same line if trailing trivia (comments or white spaces on same line) part of the last token on that line
2424
tokenAtLocation = findPrecedingToken(tokenAtLocation.pos, sourceFile);
2525

2626
// Its a blank line
27-
if (!tokenAtLocation || sourceFile.getOneBasedLineAndCharacterFromPosition(tokenAtLocation.getEnd()).line !== lineOfPosition) {
27+
if (!tokenAtLocation || sourceFile.getZeroBasedLineAndCharacterOfPosition(tokenAtLocation.getEnd()).line !== lineOfPosition) {
2828
return undefined;
2929
}
3030
}
@@ -42,7 +42,7 @@ module ts.BreakpointResolver {
4242
}
4343

4444
function spanInNodeIfStartsOnSameLine(node: Node, otherwiseOnNode?: Node): TextSpan {
45-
if (node && lineOfPosition === sourceFile.getOneBasedLineAndCharacterFromPosition(node.getStart()).line) {
45+
if (node && lineOfPosition === sourceFile.getZeroBasedLineAndCharacterOfPosition(node.getStart()).line) {
4646
return spanInNode(node);
4747
}
4848
return spanInNode(otherwiseOnNode);

‎src/services/formatting/formatting.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module ts.formatting {
6767
}
6868

6969
export function formatOnEnter(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeOptions): TextChange[] {
70-
var line = sourceFile.getOneBasedLineAndCharacterFromPosition(position).line;
70+
var line = sourceFile.getOneBasedLineAndCharacterOfPosition(position).line;
7171
if (line === 1) {
7272
return [];
7373
}
@@ -283,7 +283,7 @@ module ts.formatting {
283283
var previousLine = Constants.Unknown;
284284
var childKind = SyntaxKind.Unknown;
285285
while (n) {
286-
var line = sourceFile.getOneBasedLineAndCharacterFromPosition(n.getStart(sourceFile)).line;
286+
var line = sourceFile.getOneBasedLineAndCharacterOfPosition(n.getStart(sourceFile)).line;
287287
if (previousLine !== Constants.Unknown && line !== previousLine) {
288288
break;
289289
}
@@ -327,7 +327,7 @@ module ts.formatting {
327327
formattingScanner.advance();
328328

329329
if (formattingScanner.isOnToken()) {
330-
var startLine = sourceFile.getOneBasedLineAndCharacterFromPosition(enclosingNode.getStart(sourceFile)).line;
330+
var startLine = sourceFile.getOneBasedLineAndCharacterOfPosition(enclosingNode.getStart(sourceFile)).line;
331331
var delta = getOwnOrInheritedDelta(enclosingNode, options, sourceFile);
332332
processNode(enclosingNode, enclosingNode, startLine, initialIndentation, delta);
333333
}
@@ -357,7 +357,7 @@ module ts.formatting {
357357
}
358358
}
359359
else {
360-
var startLine = sourceFile.getOneBasedLineAndCharacterFromPosition(startPos).line;
360+
var startLine = sourceFile.getOneBasedLineAndCharacterOfPosition(startPos).line;
361361
var startLinePosition = getLineStartPositionForPosition(startPos, sourceFile);
362362
var column = SmartIndenter.findFirstNonWhitespaceColumn(startLinePosition, startPos, sourceFile, options);
363363
if (startLine !== parentStartLine || startPos === column) {
@@ -521,7 +521,7 @@ module ts.formatting {
521521

522522
var childStartPos = child.getStart(sourceFile);
523523

524-
var childStart = sourceFile.getOneBasedLineAndCharacterFromPosition(childStartPos);
524+
var childStart = sourceFile.getOneBasedLineAndCharacterOfPosition(childStartPos);
525525

526526
// if child is a list item - try to get its indentation
527527
var childIndentationAmount = Constants.Unknown;
@@ -594,7 +594,7 @@ module ts.formatting {
594594
}
595595
else if (tokenInfo.token.kind === listStartToken) {
596596
// consume list start token
597-
startLine = sourceFile.getOneBasedLineAndCharacterFromPosition(tokenInfo.token.pos).line;
597+
startLine = sourceFile.getOneBasedLineAndCharacterOfPosition(tokenInfo.token.pos).line;
598598
var indentation =
599599
computeIndentation(tokenInfo.token, startLine, Constants.Unknown, parent, parentDynamicIndentation, startLine);
600600

@@ -641,7 +641,7 @@ module ts.formatting {
641641
var lineAdded: boolean;
642642
var isTokenInRange = rangeContainsRange(originalRange, currentTokenInfo.token);
643643

644-
var tokenStart = sourceFile.getOneBasedLineAndCharacterFromPosition(currentTokenInfo.token.pos);
644+
var tokenStart = sourceFile.getOneBasedLineAndCharacterOfPosition(currentTokenInfo.token.pos);
645645
if (isTokenInRange) {
646646
var rangeHasError = rangeContainsError(currentTokenInfo.token);
647647
// save prevStartLine since processRange will overwrite this value with current ones
@@ -674,7 +674,7 @@ module ts.formatting {
674674
continue;
675675
}
676676

677-
var triviaStartLine = sourceFile.getOneBasedLineAndCharacterFromPosition(triviaItem.pos).line;
677+
var triviaStartLine = sourceFile.getOneBasedLineAndCharacterOfPosition(triviaItem.pos).line;
678678
switch (triviaItem.kind) {
679679
case SyntaxKind.MultiLineCommentTrivia:
680680
var commentIndentation = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind);
@@ -712,7 +712,7 @@ module ts.formatting {
712712
for (var i = 0, len = trivia.length; i < len; ++i) {
713713
var triviaItem = trivia[i];
714714
if (isComment(triviaItem.kind) && rangeContainsRange(originalRange, triviaItem)) {
715-
var triviaItemStart = sourceFile.getOneBasedLineAndCharacterFromPosition(triviaItem.pos);
715+
var triviaItemStart = sourceFile.getOneBasedLineAndCharacterOfPosition(triviaItem.pos);
716716
processRange(triviaItem, triviaItemStart, parent, contextNode, dynamicIndentation);
717717
}
718718
}
@@ -729,7 +729,7 @@ module ts.formatting {
729729
if (!rangeHasError && !previousRangeHasError) {
730730
if (!previousRange) {
731731
// trim whitespaces starting from the beginning of the span up to the current line
732-
var originalStart = sourceFile.getOneBasedLineAndCharacterFromPosition(originalRange.pos);
732+
var originalStart = sourceFile.getOneBasedLineAndCharacterOfPosition(originalRange.pos);
733733
trimTrailingWhitespacesForLines(originalStart.line, rangeStart.line);
734734
}
735735
else {
@@ -807,7 +807,7 @@ module ts.formatting {
807807
recordReplace(pos, 0, indentationString);
808808
}
809809
else {
810-
var tokenStart = sourceFile.getOneBasedLineAndCharacterFromPosition(pos);
810+
var tokenStart = sourceFile.getOneBasedLineAndCharacterOfPosition(pos);
811811
if (indentation !== tokenStart.character - 1) {
812812
var startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);
813813
recordReplace(startLinePosition, tokenStart.character - 1, indentationString);
@@ -817,8 +817,8 @@ module ts.formatting {
817817

818818
function indentMultilineComment(commentRange: TextRange, indentation: number, firstLineIsIndented: boolean) {
819819
// split comment in lines
820-
var startLine = sourceFile.getOneBasedLineAndCharacterFromPosition(commentRange.pos).line;
821-
var endLine = sourceFile.getOneBasedLineAndCharacterFromPosition(commentRange.end).line;
820+
var startLine = sourceFile.getOneBasedLineAndCharacterOfPosition(commentRange.pos).line;
821+
var endLine = sourceFile.getOneBasedLineAndCharacterOfPosition(commentRange.end).line;
822822

823823
if (startLine === endLine) {
824824
if (!firstLineIsIndented) {

‎src/services/formatting/formattingContext.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ module ts.formatting {
7171

7272
public TokensAreOnSameLine(): boolean {
7373
if (this.tokensAreOnSameLine === undefined) {
74-
var startLine = this.sourceFile.getOneBasedLineAndCharacterFromPosition(this.currentTokenSpan.pos).line;
75-
var endLine = this.sourceFile.getOneBasedLineAndCharacterFromPosition(this.nextTokenSpan.pos).line;
74+
var startLine = this.sourceFile.getOneBasedLineAndCharacterOfPosition(this.currentTokenSpan.pos).line;
75+
var endLine = this.sourceFile.getOneBasedLineAndCharacterOfPosition(this.nextTokenSpan.pos).line;
7676
this.tokensAreOnSameLine = (startLine == endLine);
7777
}
7878

@@ -96,17 +96,17 @@ module ts.formatting {
9696
}
9797

9898
private NodeIsOnOneLine(node: Node): boolean {
99-
var startLine = this.sourceFile.getOneBasedLineAndCharacterFromPosition(node.getStart(this.sourceFile)).line;
100-
var endLine = this.sourceFile.getOneBasedLineAndCharacterFromPosition(node.getEnd()).line;
99+
var startLine = this.sourceFile.getOneBasedLineAndCharacterOfPosition(node.getStart(this.sourceFile)).line;
100+
var endLine = this.sourceFile.getOneBasedLineAndCharacterOfPosition(node.getEnd()).line;
101101
return startLine == endLine;
102102
}
103103

104104
private BlockIsOnOneLine(node: Node): boolean {
105105
var openBrace = findChildOfKind(node, SyntaxKind.OpenBraceToken, this.sourceFile);
106106
var closeBrace = findChildOfKind(node, SyntaxKind.CloseBraceToken, this.sourceFile);
107107
if (openBrace && closeBrace) {
108-
var startLine = this.sourceFile.getOneBasedLineAndCharacterFromPosition(openBrace.getEnd()).line;
109-
var endLine = this.sourceFile.getOneBasedLineAndCharacterFromPosition(closeBrace.getStart(this.sourceFile)).line;
108+
var startLine = this.sourceFile.getOneBasedLineAndCharacterOfPosition(openBrace.getEnd()).line;
109+
var endLine = this.sourceFile.getOneBasedLineAndCharacterOfPosition(closeBrace.getStart(this.sourceFile)).line;
110110
return startLine === endLine;
111111
}
112112
return false;

‎src/services/formatting/smartIndenter.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module ts.formatting {
2424
return 0;
2525
}
2626

27-
var lineAtPosition = sourceFile.getOneBasedLineAndCharacterFromPosition(position).line;
27+
var lineAtPosition = sourceFile.getOneBasedLineAndCharacterOfPosition(position).line;
2828

2929
if (precedingToken.kind === SyntaxKind.CommaToken && precedingToken.parent.kind !== SyntaxKind.BinaryExpression) {
3030
// previous token is comma that separates items in list - find the previous item and try to derive indentation from it
@@ -74,7 +74,7 @@ module ts.formatting {
7474
}
7575

7676
export function getIndentationForNode(n: Node, ignoreActualIndentationRange: TextRange, sourceFile: SourceFile, options: FormatCodeOptions): number {
77-
var start = sourceFile.getOneBasedLineAndCharacterFromPosition(n.getStart(sourceFile));
77+
var start = sourceFile.getOneBasedLineAndCharacterOfPosition(n.getStart(sourceFile));
7878
return getIndentationForNodeWorker(n, start, ignoreActualIndentationRange, /*indentationDelta*/ 0, sourceFile, options);
7979
}
8080

@@ -135,10 +135,10 @@ module ts.formatting {
135135
function getParentStart(parent: Node, child: Node, sourceFile: SourceFile): LineAndCharacter {
136136
var containingList = getContainingList(child, sourceFile);
137137
if (containingList) {
138-
return sourceFile.getOneBasedLineAndCharacterFromPosition(containingList.pos);
138+
return sourceFile.getOneBasedLineAndCharacterOfPosition(containingList.pos);
139139
}
140140

141-
return sourceFile.getOneBasedLineAndCharacterFromPosition(parent.getStart(sourceFile));
141+
return sourceFile.getOneBasedLineAndCharacterOfPosition(parent.getStart(sourceFile));
142142
}
143143

144144
/*
@@ -204,7 +204,7 @@ module ts.formatting {
204204
}
205205

206206
function getStartLineAndCharacterForNode(n: Node, sourceFile: SourceFile): LineAndCharacter {
207-
return sourceFile.getOneBasedLineAndCharacterFromPosition(n.getStart(sourceFile));
207+
return sourceFile.getOneBasedLineAndCharacterOfPosition(n.getStart(sourceFile));
208208
}
209209

210210
function positionBelongsToNode(candidate: Node, position: number, sourceFile: SourceFile): boolean {
@@ -292,7 +292,7 @@ module ts.formatting {
292292
continue;
293293
}
294294
// skip list items that ends on the same line with the current list element
295-
var prevEndLine = sourceFile.getOneBasedLineAndCharacterFromPosition(list[i].end).line;
295+
var prevEndLine = sourceFile.getOneBasedLineAndCharacterOfPosition(list[i].end).line;
296296
if (prevEndLine !== lineAndCharacter.line) {
297297
return findColumnForFirstNonWhitespaceCharacterInLine(lineAndCharacter, sourceFile, options);
298298
}
@@ -303,7 +303,7 @@ module ts.formatting {
303303
}
304304

305305
function findColumnForFirstNonWhitespaceCharacterInLine(lineAndCharacter: LineAndCharacter, sourceFile: SourceFile, options: EditorOptions): number {
306-
var lineStart = sourceFile.getPositionFromOneBasedLineAndCharacter(lineAndCharacter.line, 1);
306+
var lineStart = sourceFile.getPositionOfOneBasedLineAndCharacter(lineAndCharacter.line, 1);
307307
return findFirstNonWhitespaceColumn(lineStart, lineStart + lineAndCharacter.character, sourceFile, options);
308308
}
309309

0 commit comments

Comments
 (0)