Skip to content

Commit a83534a

Browse files
CyrusNajmabadiCyrusNajmabadi
committed
Fix up API samples.
1 parent 124a77c commit a83534a

12 files changed

Lines changed: 134 additions & 126 deletions

‎tests/baselines/reference/APISample_compile.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export function compile(fileNames: string[], options: ts.CompilerOptions): void
2121
var allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
2222

2323
allDiagnostics.forEach(diagnostic => {
24-
var lineChar = diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start);
25-
console.log(`${diagnostic.file.fileName} (${lineChar.line},${lineChar.character}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`);
24+
var lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
25+
console.log(`${diagnostic.file.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`);
2626
});
2727

2828
var exitCode = emitResult.emitSkipped ? 1 : 0;
@@ -1384,14 +1384,14 @@ declare module "typescript" {
13841384
}
13851385
function tokenToString(t: SyntaxKind): string;
13861386
function computeLineStarts(text: string): number[];
1387-
function getPositionFromOneBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
1388-
function computePositionFromOneBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number;
1387+
function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
1388+
function computePositionOfLineAndCharacter(lineStarts: number[], line: number, character: number): number;
13891389
function getLineStarts(sourceFile: SourceFile): number[];
1390-
function computeOneBasedLineAndCharacterOfPosition(lineStarts: number[], position: number): {
1390+
function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
13911391
line: number;
13921392
character: number;
13931393
};
1394-
function getOneBasedLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
1394+
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
13951395
function isWhiteSpace(ch: number): boolean;
13961396
function isLineBreak(ch: number): boolean;
13971397
function isOctalDigit(ch: number): boolean;
@@ -1469,9 +1469,9 @@ declare module "typescript" {
14691469
scriptSnapshot: IScriptSnapshot;
14701470
nameTable: Map<string>;
14711471
getNamedDeclarations(): Declaration[];
1472-
getLineAndCharacterFromPosition(pos: number): LineAndCharacter;
1472+
getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
14731473
getLineStarts(): number[];
1474-
getPositionFromOneBasedLineAndCharacter(line: number, character: number): number;
1474+
getPositionOfLineAndCharacter(line: number, character: number): number;
14751475
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
14761476
}
14771477
/**
@@ -1946,8 +1946,8 @@ function compile(fileNames, options) {
19461946
var emitResult = program.emit();
19471947
var allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
19481948
allDiagnostics.forEach(function (diagnostic) {
1949-
var lineChar = diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start);
1950-
console.log(diagnostic.file.fileName + " (" + lineChar.line + "," + lineChar.character + "): " + ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL));
1949+
var lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
1950+
console.log(diagnostic.file.fileName + " (" + (lineChar.line + 1) + "," + (lineChar.character + 1) + "): " + ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL));
19511951
});
19521952
var exitCode = emitResult.emitSkipped ? 1 : 0;
19531953
console.log("Process exiting with code '" + exitCode + "'.");

‎tests/baselines/reference/APISample_compile.types‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,27 @@ export function compile(fileNames: string[], options: ts.CompilerOptions): void
5656
>diagnostics : ts.Diagnostic[]
5757

5858
allDiagnostics.forEach(diagnostic => {
59-
>allDiagnostics.forEach(diagnostic => { var lineChar = diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start); console.log(`${diagnostic.file.fileName} (${lineChar.line},${lineChar.character}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`); }) : void
59+
>allDiagnostics.forEach(diagnostic => { var lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start); console.log(`${diagnostic.file.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`); }) : void
6060
>allDiagnostics.forEach : (callbackfn: (value: ts.Diagnostic, index: number, array: ts.Diagnostic[]) => void, thisArg?: any) => void
6161
>allDiagnostics : ts.Diagnostic[]
6262
>forEach : (callbackfn: (value: ts.Diagnostic, index: number, array: ts.Diagnostic[]) => void, thisArg?: any) => void
63-
>diagnostic => { var lineChar = diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start); console.log(`${diagnostic.file.fileName} (${lineChar.line},${lineChar.character}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`); } : (diagnostic: ts.Diagnostic) => void
63+
>diagnostic => { var lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start); console.log(`${diagnostic.file.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`); } : (diagnostic: ts.Diagnostic) => void
6464
>diagnostic : ts.Diagnostic
6565

66-
var lineChar = diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start);
66+
var lineChar = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
6767
>lineChar : ts.LineAndCharacter
68-
>diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start) : ts.LineAndCharacter
69-
>diagnostic.file.getLineAndCharacterFromPosition : (pos: number) => ts.LineAndCharacter
68+
>diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start) : ts.LineAndCharacter
69+
>diagnostic.file.getLineAndCharacterOfPosition : (pos: number) => ts.LineAndCharacter
7070
>diagnostic.file : ts.SourceFile
7171
>diagnostic : ts.Diagnostic
7272
>file : ts.SourceFile
73-
>getLineAndCharacterFromPosition : (pos: number) => ts.LineAndCharacter
73+
>getLineAndCharacterOfPosition : (pos: number) => ts.LineAndCharacter
7474
>diagnostic.start : number
7575
>diagnostic : ts.Diagnostic
7676
>start : number
7777

78-
console.log(`${diagnostic.file.fileName} (${lineChar.line},${lineChar.character}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`);
79-
>console.log(`${diagnostic.file.fileName} (${lineChar.line},${lineChar.character}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`) : any
78+
console.log(`${diagnostic.file.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`);
79+
>console.log(`${diagnostic.file.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${ts.flattenDiagnosticMessageText(diagnostic.messageText, os.EOL)}`) : any
8080
>console.log : any
8181
>console : any
8282
>log : any
@@ -85,9 +85,11 @@ export function compile(fileNames: string[], options: ts.CompilerOptions): void
8585
>diagnostic : ts.Diagnostic
8686
>file : ts.SourceFile
8787
>fileName : string
88+
>lineChar.line + 1 : number
8889
>lineChar.line : number
8990
>lineChar : ts.LineAndCharacter
9091
>line : number
92+
>lineChar.character + 1 : number
9193
>lineChar.character : number
9294
>lineChar : ts.LineAndCharacter
9395
>character : number
@@ -4368,15 +4370,15 @@ declare module "typescript" {
43684370
>computeLineStarts : (text: string) => number[]
43694371
>text : string
43704372

4371-
function getPositionFromOneBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
4372-
>getPositionFromOneBasedLineAndCharacter : (sourceFile: SourceFile, line: number, character: number) => number
4373+
function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
4374+
>getPositionOfLineAndCharacter : (sourceFile: SourceFile, line: number, character: number) => number
43734375
>sourceFile : SourceFile
43744376
>SourceFile : SourceFile
43754377
>line : number
43764378
>character : number
43774379

4378-
function computePositionFromOneBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number;
4379-
>computePositionFromOneBasedLineAndCharacter : (lineStarts: number[], line: number, character: number) => number
4380+
function computePositionOfLineAndCharacter(lineStarts: number[], line: number, character: number): number;
4381+
>computePositionOfLineAndCharacter : (lineStarts: number[], line: number, character: number) => number
43804382
>lineStarts : number[]
43814383
>line : number
43824384
>character : number
@@ -4386,8 +4388,8 @@ declare module "typescript" {
43864388
>sourceFile : SourceFile
43874389
>SourceFile : SourceFile
43884390

4389-
function computeOneBasedLineAndCharacterOfPosition(lineStarts: number[], position: number): {
4390-
>computeOneBasedLineAndCharacterOfPosition : (lineStarts: number[], position: number) => { line: number; character: number; }
4391+
function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
4392+
>computeLineAndCharacterOfPosition : (lineStarts: number[], position: number) => { line: number; character: number; }
43914393
>lineStarts : number[]
43924394
>position : number
43934395

@@ -4398,8 +4400,8 @@ declare module "typescript" {
43984400
>character : number
43994401

44004402
};
4401-
function getOneBasedLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
4402-
>getOneBasedLineAndCharacterOfPosition : (sourceFile: SourceFile, position: number) => LineAndCharacter
4403+
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
4404+
>getLineAndCharacterOfPosition : (sourceFile: SourceFile, position: number) => LineAndCharacter
44034405
>sourceFile : SourceFile
44044406
>SourceFile : SourceFile
44054407
>position : number
@@ -4735,16 +4737,16 @@ declare module "typescript" {
47354737
>getNamedDeclarations : () => Declaration[]
47364738
>Declaration : Declaration
47374739

4738-
getLineAndCharacterFromPosition(pos: number): LineAndCharacter;
4739-
>getLineAndCharacterFromPosition : (pos: number) => LineAndCharacter
4740+
getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
4741+
>getLineAndCharacterOfPosition : (pos: number) => LineAndCharacter
47404742
>pos : number
47414743
>LineAndCharacter : LineAndCharacter
47424744

47434745
getLineStarts(): number[];
47444746
>getLineStarts : () => number[]
47454747

4746-
getPositionFromOneBasedLineAndCharacter(line: number, character: number): number;
4747-
>getPositionFromOneBasedLineAndCharacter : (line: number, character: number) => number
4748+
getPositionOfLineAndCharacter(line: number, character: number): number;
4749+
>getPositionOfLineAndCharacter : (line: number, character: number) => number
47484750
>line : number
47494751
>character : number
47504752

‎tests/baselines/reference/APISample_linter.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export function delint(sourceFile: ts.SourceFile) {
5151
}
5252

5353
function report(node: ts.Node, message: string) {
54-
var lineChar = sourceFile.getLineAndCharacterFromPosition(node.getStart());
55-
console.log(`${sourceFile.fileName} (${lineChar.line},${lineChar.character}): ${message}`)
54+
var lineChar = sourceFile.getLineAndCharacterOfPosition(node.getStart());
55+
console.log(`${sourceFile.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${message}`)
5656
}
5757
}
5858

@@ -1415,14 +1415,14 @@ declare module "typescript" {
14151415
}
14161416
function tokenToString(t: SyntaxKind): string;
14171417
function computeLineStarts(text: string): number[];
1418-
function getPositionFromOneBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
1419-
function computePositionFromOneBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number;
1418+
function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
1419+
function computePositionOfLineAndCharacter(lineStarts: number[], line: number, character: number): number;
14201420
function getLineStarts(sourceFile: SourceFile): number[];
1421-
function computeOneBasedLineAndCharacterOfPosition(lineStarts: number[], position: number): {
1421+
function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
14221422
line: number;
14231423
character: number;
14241424
};
1425-
function getOneBasedLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
1425+
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
14261426
function isWhiteSpace(ch: number): boolean;
14271427
function isLineBreak(ch: number): boolean;
14281428
function isOctalDigit(ch: number): boolean;
@@ -1500,9 +1500,9 @@ declare module "typescript" {
15001500
scriptSnapshot: IScriptSnapshot;
15011501
nameTable: Map<string>;
15021502
getNamedDeclarations(): Declaration[];
1503-
getLineAndCharacterFromPosition(pos: number): LineAndCharacter;
1503+
getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
15041504
getLineStarts(): number[];
1505-
getPositionFromOneBasedLineAndCharacter(line: number, character: number): number;
1505+
getPositionOfLineAndCharacter(line: number, character: number): number;
15061506
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
15071507
}
15081508
/**
@@ -2003,8 +2003,8 @@ function delint(sourceFile) {
20032003
ts.forEachChild(node, delintNode);
20042004
}
20052005
function report(node, message) {
2006-
var lineChar = sourceFile.getLineAndCharacterFromPosition(node.getStart());
2007-
console.log(sourceFile.fileName + " (" + lineChar.line + "," + lineChar.character + "): " + message);
2006+
var lineChar = sourceFile.getLineAndCharacterOfPosition(node.getStart());
2007+
console.log(sourceFile.fileName + " (" + (lineChar.line + 1) + "," + (lineChar.character + 1) + "): " + message);
20082008
}
20092009
}
20102010
exports.delint = delint;

‎tests/baselines/reference/APISample_linter.types‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -224,28 +224,30 @@ export function delint(sourceFile: ts.SourceFile) {
224224
>Node : ts.Node
225225
>message : string
226226

227-
var lineChar = sourceFile.getLineAndCharacterFromPosition(node.getStart());
227+
var lineChar = sourceFile.getLineAndCharacterOfPosition(node.getStart());
228228
>lineChar : ts.LineAndCharacter
229-
>sourceFile.getLineAndCharacterFromPosition(node.getStart()) : ts.LineAndCharacter
230-
>sourceFile.getLineAndCharacterFromPosition : (pos: number) => ts.LineAndCharacter
229+
>sourceFile.getLineAndCharacterOfPosition(node.getStart()) : ts.LineAndCharacter
230+
>sourceFile.getLineAndCharacterOfPosition : (pos: number) => ts.LineAndCharacter
231231
>sourceFile : ts.SourceFile
232-
>getLineAndCharacterFromPosition : (pos: number) => ts.LineAndCharacter
232+
>getLineAndCharacterOfPosition : (pos: number) => ts.LineAndCharacter
233233
>node.getStart() : number
234234
>node.getStart : (sourceFile?: ts.SourceFile) => number
235235
>node : ts.Node
236236
>getStart : (sourceFile?: ts.SourceFile) => number
237237

238-
console.log(`${sourceFile.fileName} (${lineChar.line},${lineChar.character}): ${message}`)
239-
>console.log(`${sourceFile.fileName} (${lineChar.line},${lineChar.character}): ${message}`) : any
238+
console.log(`${sourceFile.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${message}`)
239+
>console.log(`${sourceFile.fileName} (${lineChar.line + 1},${lineChar.character + 1}): ${message}`) : any
240240
>console.log : any
241241
>console : any
242242
>log : any
243243
>sourceFile.fileName : string
244244
>sourceFile : ts.SourceFile
245245
>fileName : string
246+
>lineChar.line + 1 : number
246247
>lineChar.line : number
247248
>lineChar : ts.LineAndCharacter
248249
>line : number
250+
>lineChar.character + 1 : number
249251
>lineChar.character : number
250252
>lineChar : ts.LineAndCharacter
251253
>character : number
@@ -4512,15 +4514,15 @@ declare module "typescript" {
45124514
>computeLineStarts : (text: string) => number[]
45134515
>text : string
45144516

4515-
function getPositionFromOneBasedLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
4516-
>getPositionFromOneBasedLineAndCharacter : (sourceFile: SourceFile, line: number, character: number) => number
4517+
function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
4518+
>getPositionOfLineAndCharacter : (sourceFile: SourceFile, line: number, character: number) => number
45174519
>sourceFile : SourceFile
45184520
>SourceFile : SourceFile
45194521
>line : number
45204522
>character : number
45214523

4522-
function computePositionFromOneBasedLineAndCharacter(lineStarts: number[], line: number, character: number): number;
4523-
>computePositionFromOneBasedLineAndCharacter : (lineStarts: number[], line: number, character: number) => number
4524+
function computePositionOfLineAndCharacter(lineStarts: number[], line: number, character: number): number;
4525+
>computePositionOfLineAndCharacter : (lineStarts: number[], line: number, character: number) => number
45244526
>lineStarts : number[]
45254527
>line : number
45264528
>character : number
@@ -4530,8 +4532,8 @@ declare module "typescript" {
45304532
>sourceFile : SourceFile
45314533
>SourceFile : SourceFile
45324534

4533-
function computeOneBasedLineAndCharacterOfPosition(lineStarts: number[], position: number): {
4534-
>computeOneBasedLineAndCharacterOfPosition : (lineStarts: number[], position: number) => { line: number; character: number; }
4535+
function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
4536+
>computeLineAndCharacterOfPosition : (lineStarts: number[], position: number) => { line: number; character: number; }
45354537
>lineStarts : number[]
45364538
>position : number
45374539

@@ -4542,8 +4544,8 @@ declare module "typescript" {
45424544
>character : number
45434545

45444546
};
4545-
function getOneBasedLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
4546-
>getOneBasedLineAndCharacterOfPosition : (sourceFile: SourceFile, position: number) => LineAndCharacter
4547+
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
4548+
>getLineAndCharacterOfPosition : (sourceFile: SourceFile, position: number) => LineAndCharacter
45474549
>sourceFile : SourceFile
45484550
>SourceFile : SourceFile
45494551
>position : number
@@ -4879,16 +4881,16 @@ declare module "typescript" {
48794881
>getNamedDeclarations : () => Declaration[]
48804882
>Declaration : Declaration
48814883

4882-
getLineAndCharacterFromPosition(pos: number): LineAndCharacter;
4883-
>getLineAndCharacterFromPosition : (pos: number) => LineAndCharacter
4884+
getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
4885+
>getLineAndCharacterOfPosition : (pos: number) => LineAndCharacter
48844886
>pos : number
48854887
>LineAndCharacter : LineAndCharacter
48864888

48874889
getLineStarts(): number[];
48884890
>getLineStarts : () => number[]
48894891

4890-
getPositionFromOneBasedLineAndCharacter(line: number, character: number): number;
4891-
>getPositionFromOneBasedLineAndCharacter : (line: number, character: number) => number
4892+
getPositionOfLineAndCharacter(line: number, character: number): number;
4893+
>getPositionOfLineAndCharacter : (line: number, character: number) => number
48924894
>line : number
48934895
>character : number
48944896

0 commit comments

Comments
 (0)