Skip to content

Commit 45defa8

Browse files
committed
updated tests
1 parent 288e38f commit 45defa8

8 files changed

+336
-208
lines changed

tests/baselines/reference/APISample_compile.js

+14-11
Original file line numberDiff line numberDiff line change
@@ -725,24 +725,21 @@ declare module "typescript" {
725725
endOfFileToken: Node;
726726
filename: string;
727727
text: string;
728-
getLineAndCharacterFromPosition(position: number): LineAndCharacter;
729-
getPositionFromLineAndCharacter(line: number, character: number): number;
730-
getLineStarts(): number[];
731-
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
732728
amdDependencies: string[];
733729
amdModuleName: string;
734730
referencedFiles: FileReference[];
735731
referenceDiagnostics: Diagnostic[];
736732
parseDiagnostics: Diagnostic[];
737-
getSyntacticDiagnostics(): Diagnostic[];
738733
semanticDiagnostics: Diagnostic[];
734+
syntacticDiagnostics: Diagnostic[];
739735
hasNoDefaultLib: boolean;
740736
externalModuleIndicator: Node;
741737
nodeCount: number;
742738
identifierCount: number;
743739
symbolCount: number;
744740
languageVersion: ScriptTarget;
745741
identifiers: Map<string>;
742+
lineMap: number[];
746743
}
747744
interface ScriptReferenceHost {
748745
getCompilerOptions(): CompilerOptions;
@@ -1393,15 +1390,14 @@ declare module "typescript" {
13931390
}
13941391
function tokenToString(t: SyntaxKind): string;
13951392
function computeLineStarts(text: string): number[];
1396-
function getPositionFromLineAndCharacter(lineStarts: number[], line: number, character: number): number;
1397-
function getLineAndCharacterOfPosition(lineStarts: number[], position: number): {
1398-
line: number;
1399-
character: number;
1400-
};
1401-
function positionToLineAndCharacter(text: string, pos: number): {
1393+
function getPositionFromLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
1394+
function computePositionFromLineAndCharacter(lineStarts: number[], line: number, character: number): number;
1395+
function getLineStarts(sourceFile: SourceFile): number[];
1396+
function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
14021397
line: number;
14031398
character: number;
14041399
};
1400+
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
14051401
function isWhiteSpace(ch: number): boolean;
14061402
function isLineBreak(ch: number): boolean;
14071403
function isOctalDigit(ch: number): boolean;
@@ -1417,6 +1413,8 @@ declare module "typescript" {
14171413
function createNode(kind: SyntaxKind): Node;
14181414
function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
14191415
function modifierToFlag(token: SyntaxKind): NodeFlags;
1416+
function getSyntacticDiagnostics(sourceFile: SourceFile): Diagnostic[];
1417+
function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange): SourceFile;
14201418
function isEvalOrArgumentsIdentifier(node: Node): boolean;
14211419
function createSourceFile(filename: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
14221420
function isLeftHandSideExpression(expr: Expression): boolean;
@@ -1476,6 +1474,11 @@ declare module "typescript" {
14761474
scriptSnapshot: IScriptSnapshot;
14771475
nameTable: Map<string>;
14781476
getNamedDeclarations(): Declaration[];
1477+
getLineAndCharacterFromPosition(pos: number): LineAndCharacter;
1478+
getLineStarts(): number[];
1479+
getPositionFromLineAndCharacter(line: number, character: number): number;
1480+
getSyntacticDiagnostics(): Diagnostic[];
1481+
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
14791482
}
14801483
/**
14811484
* Represents an immutable snapshot of a script at a specified time.Once acquired, the

tests/baselines/reference/APISample_compile.types

+70-41
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ export function compile(filenames: string[], options: ts.CompilerOptions): void
9090
var lineChar = diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start);
9191
>lineChar : ts.LineAndCharacter
9292
>diagnostic.file.getLineAndCharacterFromPosition(diagnostic.start) : ts.LineAndCharacter
93-
>diagnostic.file.getLineAndCharacterFromPosition : (position: number) => ts.LineAndCharacter
93+
>diagnostic.file.getLineAndCharacterFromPosition : (pos: number) => ts.LineAndCharacter
9494
>diagnostic.file : ts.SourceFile
9595
>diagnostic : ts.Diagnostic
9696
>file : ts.SourceFile
97-
>getLineAndCharacterFromPosition : (position: number) => ts.LineAndCharacter
97+
>getLineAndCharacterFromPosition : (pos: number) => ts.LineAndCharacter
9898
>diagnostic.start : number
9999
>diagnostic : ts.Diagnostic
100100
>start : number
@@ -2209,26 +2209,6 @@ declare module "typescript" {
22092209
text: string;
22102210
>text : string
22112211

2212-
getLineAndCharacterFromPosition(position: number): LineAndCharacter;
2213-
>getLineAndCharacterFromPosition : (position: number) => LineAndCharacter
2214-
>position : number
2215-
>LineAndCharacter : LineAndCharacter
2216-
2217-
getPositionFromLineAndCharacter(line: number, character: number): number;
2218-
>getPositionFromLineAndCharacter : (line: number, character: number) => number
2219-
>line : number
2220-
>character : number
2221-
2222-
getLineStarts(): number[];
2223-
>getLineStarts : () => number[]
2224-
2225-
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
2226-
>update : (newText: string, textChangeRange: TextChangeRange) => SourceFile
2227-
>newText : string
2228-
>textChangeRange : TextChangeRange
2229-
>TextChangeRange : TextChangeRange
2230-
>SourceFile : SourceFile
2231-
22322212
amdDependencies: string[];
22332213
>amdDependencies : string[]
22342214

@@ -2245,14 +2225,14 @@ declare module "typescript" {
22452225

22462226
parseDiagnostics: Diagnostic[];
22472227
>parseDiagnostics : Diagnostic[]
2248-
>Diagnostic : Diagnostic
2249-
2250-
getSyntacticDiagnostics(): Diagnostic[];
2251-
>getSyntacticDiagnostics : () => Diagnostic[]
22522228
>Diagnostic : Diagnostic
22532229

22542230
semanticDiagnostics: Diagnostic[];
22552231
>semanticDiagnostics : Diagnostic[]
2232+
>Diagnostic : Diagnostic
2233+
2234+
syntacticDiagnostics: Diagnostic[];
2235+
>syntacticDiagnostics : Diagnostic[]
22562236
>Diagnostic : Diagnostic
22572237

22582238
hasNoDefaultLib: boolean;
@@ -2278,6 +2258,9 @@ declare module "typescript" {
22782258
identifiers: Map<string>;
22792259
>identifiers : Map<string>
22802260
>Map : Map<T>
2261+
2262+
lineMap: number[];
2263+
>lineMap : number[]
22812264
}
22822265
interface ScriptReferenceHost {
22832266
>ScriptReferenceHost : ScriptReferenceHost
@@ -4446,28 +4429,28 @@ declare module "typescript" {
44464429
>computeLineStarts : (text: string) => number[]
44474430
>text : string
44484431

4449-
function getPositionFromLineAndCharacter(lineStarts: number[], line: number, character: number): number;
4450-
>getPositionFromLineAndCharacter : (lineStarts: number[], line: number, character: number) => number
4451-
>lineStarts : number[]
4432+
function getPositionFromLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
4433+
>getPositionFromLineAndCharacter : (sourceFile: SourceFile, line: number, character: number) => number
4434+
>sourceFile : SourceFile
4435+
>SourceFile : SourceFile
44524436
>line : number
44534437
>character : number
44544438

4455-
function getLineAndCharacterOfPosition(lineStarts: number[], position: number): {
4456-
>getLineAndCharacterOfPosition : (lineStarts: number[], position: number) => { line: number; character: number; }
4439+
function computePositionFromLineAndCharacter(lineStarts: number[], line: number, character: number): number;
4440+
>computePositionFromLineAndCharacter : (lineStarts: number[], line: number, character: number) => number
44574441
>lineStarts : number[]
4458-
>position : number
4459-
4460-
line: number;
44614442
>line : number
4462-
4463-
character: number;
44644443
>character : number
44654444

4466-
};
4467-
function positionToLineAndCharacter(text: string, pos: number): {
4468-
>positionToLineAndCharacter : (text: string, pos: number) => { line: number; character: number; }
4469-
>text : string
4470-
>pos : number
4445+
function getLineStarts(sourceFile: SourceFile): number[];
4446+
>getLineStarts : (sourceFile: SourceFile) => number[]
4447+
>sourceFile : SourceFile
4448+
>SourceFile : SourceFile
4449+
4450+
function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
4451+
>computeLineAndCharacterOfPosition : (lineStarts: number[], position: number) => { line: number; character: number; }
4452+
>lineStarts : number[]
4453+
>position : number
44714454

44724455
line: number;
44734456
>line : number
@@ -4476,6 +4459,13 @@ declare module "typescript" {
44764459
>character : number
44774460

44784461
};
4462+
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
4463+
>getLineAndCharacterOfPosition : (sourceFile: SourceFile, position: number) => LineAndCharacter
4464+
>sourceFile : SourceFile
4465+
>SourceFile : SourceFile
4466+
>position : number
4467+
>LineAndCharacter : LineAndCharacter
4468+
44794469
function isWhiteSpace(ch: number): boolean;
44804470
>isWhiteSpace : (ch: number) => boolean
44814471
>ch : number
@@ -4562,6 +4552,21 @@ declare module "typescript" {
45624552
>SyntaxKind : SyntaxKind
45634553
>NodeFlags : NodeFlags
45644554

4555+
function getSyntacticDiagnostics(sourceFile: SourceFile): Diagnostic[];
4556+
>getSyntacticDiagnostics : (sourceFile: SourceFile) => Diagnostic[]
4557+
>sourceFile : SourceFile
4558+
>SourceFile : SourceFile
4559+
>Diagnostic : Diagnostic
4560+
4561+
function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange): SourceFile;
4562+
>updateSourceFile : (sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange) => SourceFile
4563+
>sourceFile : SourceFile
4564+
>SourceFile : SourceFile
4565+
>newText : string
4566+
>textChangeRange : TextChangeRange
4567+
>TextChangeRange : TextChangeRange
4568+
>SourceFile : SourceFile
4569+
45654570
function isEvalOrArgumentsIdentifier(node: Node): boolean;
45664571
>isEvalOrArgumentsIdentifier : (node: Node) => boolean
45674572
>node : Node
@@ -4783,6 +4788,30 @@ declare module "typescript" {
47834788
getNamedDeclarations(): Declaration[];
47844789
>getNamedDeclarations : () => Declaration[]
47854790
>Declaration : Declaration
4791+
4792+
getLineAndCharacterFromPosition(pos: number): LineAndCharacter;
4793+
>getLineAndCharacterFromPosition : (pos: number) => LineAndCharacter
4794+
>pos : number
4795+
>LineAndCharacter : LineAndCharacter
4796+
4797+
getLineStarts(): number[];
4798+
>getLineStarts : () => number[]
4799+
4800+
getPositionFromLineAndCharacter(line: number, character: number): number;
4801+
>getPositionFromLineAndCharacter : (line: number, character: number) => number
4802+
>line : number
4803+
>character : number
4804+
4805+
getSyntacticDiagnostics(): Diagnostic[];
4806+
>getSyntacticDiagnostics : () => Diagnostic[]
4807+
>Diagnostic : Diagnostic
4808+
4809+
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
4810+
>update : (newText: string, textChangeRange: TextChangeRange) => SourceFile
4811+
>newText : string
4812+
>textChangeRange : TextChangeRange
4813+
>TextChangeRange : TextChangeRange
4814+
>SourceFile : SourceFile
47864815
}
47874816
/**
47884817
* Represents an immutable snapshot of a script at a specified time.Once acquired, the

tests/baselines/reference/APISample_linter.js

+14-11
Original file line numberDiff line numberDiff line change
@@ -754,24 +754,21 @@ declare module "typescript" {
754754
endOfFileToken: Node;
755755
filename: string;
756756
text: string;
757-
getLineAndCharacterFromPosition(position: number): LineAndCharacter;
758-
getPositionFromLineAndCharacter(line: number, character: number): number;
759-
getLineStarts(): number[];
760-
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
761757
amdDependencies: string[];
762758
amdModuleName: string;
763759
referencedFiles: FileReference[];
764760
referenceDiagnostics: Diagnostic[];
765761
parseDiagnostics: Diagnostic[];
766-
getSyntacticDiagnostics(): Diagnostic[];
767762
semanticDiagnostics: Diagnostic[];
763+
syntacticDiagnostics: Diagnostic[];
768764
hasNoDefaultLib: boolean;
769765
externalModuleIndicator: Node;
770766
nodeCount: number;
771767
identifierCount: number;
772768
symbolCount: number;
773769
languageVersion: ScriptTarget;
774770
identifiers: Map<string>;
771+
lineMap: number[];
775772
}
776773
interface ScriptReferenceHost {
777774
getCompilerOptions(): CompilerOptions;
@@ -1422,15 +1419,14 @@ declare module "typescript" {
14221419
}
14231420
function tokenToString(t: SyntaxKind): string;
14241421
function computeLineStarts(text: string): number[];
1425-
function getPositionFromLineAndCharacter(lineStarts: number[], line: number, character: number): number;
1426-
function getLineAndCharacterOfPosition(lineStarts: number[], position: number): {
1427-
line: number;
1428-
character: number;
1429-
};
1430-
function positionToLineAndCharacter(text: string, pos: number): {
1422+
function getPositionFromLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
1423+
function computePositionFromLineAndCharacter(lineStarts: number[], line: number, character: number): number;
1424+
function getLineStarts(sourceFile: SourceFile): number[];
1425+
function computeLineAndCharacterOfPosition(lineStarts: number[], position: number): {
14311426
line: number;
14321427
character: number;
14331428
};
1429+
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
14341430
function isWhiteSpace(ch: number): boolean;
14351431
function isLineBreak(ch: number): boolean;
14361432
function isOctalDigit(ch: number): boolean;
@@ -1446,6 +1442,8 @@ declare module "typescript" {
14461442
function createNode(kind: SyntaxKind): Node;
14471443
function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
14481444
function modifierToFlag(token: SyntaxKind): NodeFlags;
1445+
function getSyntacticDiagnostics(sourceFile: SourceFile): Diagnostic[];
1446+
function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange): SourceFile;
14491447
function isEvalOrArgumentsIdentifier(node: Node): boolean;
14501448
function createSourceFile(filename: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
14511449
function isLeftHandSideExpression(expr: Expression): boolean;
@@ -1505,6 +1503,11 @@ declare module "typescript" {
15051503
scriptSnapshot: IScriptSnapshot;
15061504
nameTable: Map<string>;
15071505
getNamedDeclarations(): Declaration[];
1506+
getLineAndCharacterFromPosition(pos: number): LineAndCharacter;
1507+
getLineStarts(): number[];
1508+
getPositionFromLineAndCharacter(line: number, character: number): number;
1509+
getSyntacticDiagnostics(): Diagnostic[];
1510+
update(newText: string, textChangeRange: TextChangeRange): SourceFile;
15081511
}
15091512
/**
15101513
* Represents an immutable snapshot of a script at a specified time.Once acquired, the

0 commit comments

Comments
 (0)