Skip to content

Commit ce9f7b4

Browse files
committed
Merge branch 'master' into supportedExtensions
2 parents 1993387 + dd6c87e commit ce9f7b4

File tree

78 files changed

+2613
-6638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2613
-6638
lines changed

bin/lib.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15838,6 +15838,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
1583815838
overrideMimeType(mime: string): void;
1583915839
send(data?: Document): void;
1584015840
send(data?: string): void;
15841+
send(data?: any): void;
1584115842
setRequestHeader(header: string, value: string): void;
1584215843
DONE: number;
1584315844
HEADERS_RECEIVED: number;

bin/lib.dom.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14668,6 +14668,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
1466814668
overrideMimeType(mime: string): void;
1466914669
send(data?: Document): void;
1467014670
send(data?: string): void;
14671+
send(data?: any): void;
1467114672
setRequestHeader(header: string, value: string): void;
1467214673
DONE: number;
1467314674
HEADERS_RECEIVED: number;

bin/lib.es6.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17217,6 +17217,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
1721717217
overrideMimeType(mime: string): void;
1721817218
send(data?: Document): void;
1721917219
send(data?: string): void;
17220+
send(data?: any): void;
1722017221
setRequestHeader(header: string, value: string): void;
1722117222
DONE: number;
1722217223
HEADERS_RECEIVED: number;

bin/tsc.js

Lines changed: 140 additions & 96 deletions
Large diffs are not rendered by default.

bin/tsserver.js

Lines changed: 262 additions & 169 deletions
Large diffs are not rendered by default.

bin/typescript.d.ts

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,6 +1094,7 @@ declare module "typescript" {
10941094
locale?: string;
10951095
mapRoot?: string;
10961096
module?: ModuleKind;
1097+
newLine?: NewLineKind;
10971098
noEmit?: boolean;
10981099
noEmitHelpers?: boolean;
10991100
noEmitOnError?: boolean;
@@ -1124,6 +1125,10 @@ declare module "typescript" {
11241125
UMD = 3,
11251126
System = 4,
11261127
}
1128+
const enum NewLineKind {
1129+
CarriageReturnLineFeed = 0,
1130+
LineFeed = 1,
1131+
}
11271132
interface LineAndCharacter {
11281133
line: number;
11291134
character: number;
@@ -1186,6 +1191,32 @@ declare module "typescript" {
11861191
var sys: System;
11871192
}
11881193
declare module "typescript" {
1194+
interface ErrorCallback {
1195+
(message: DiagnosticMessage, length: number): void;
1196+
}
1197+
interface Scanner {
1198+
getStartPos(): number;
1199+
getToken(): SyntaxKind;
1200+
getTextPos(): number;
1201+
getTokenPos(): number;
1202+
getTokenText(): string;
1203+
getTokenValue(): string;
1204+
hasExtendedUnicodeEscape(): boolean;
1205+
hasPrecedingLineBreak(): boolean;
1206+
isIdentifier(): boolean;
1207+
isReservedWord(): boolean;
1208+
isUnterminated(): boolean;
1209+
reScanGreaterToken(): SyntaxKind;
1210+
reScanSlashToken(): SyntaxKind;
1211+
reScanTemplateToken(): SyntaxKind;
1212+
scan(): SyntaxKind;
1213+
setText(text: string, start?: number, length?: number): void;
1214+
setOnError(onError: ErrorCallback): void;
1215+
setScriptTarget(scriptTarget: ScriptTarget): void;
1216+
setTextPos(textPos: number): void;
1217+
lookAhead<T>(callback: () => T): T;
1218+
tryScan<T>(callback: () => T): T;
1219+
}
11891220
function tokenToString(t: SyntaxKind): string;
11901221
function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
11911222
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
@@ -1195,6 +1226,8 @@ declare module "typescript" {
11951226
function getTrailingCommentRanges(text: string, pos: number): CommentRange[];
11961227
function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
11971228
function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
1229+
/** Creates a scanner over a (possibly unspecified) range of a piece of text. */
1230+
function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
11981231
}
11991232
declare module "typescript" {
12001233
function getDefaultLibFileName(options: CompilerOptions): string;
@@ -1381,6 +1414,7 @@ declare module "typescript" {
13811414
getRenameInfo(fileName: string, position: number): RenameInfo;
13821415
findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[];
13831416
getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
1417+
getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
13841418
getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
13851419
findReferences(fileName: string, position: number): ReferencedSymbol[];
13861420
getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[];

bin/typescript.js

Lines changed: 274 additions & 172 deletions
Large diffs are not rendered by default.

bin/typescriptServices.d.ts

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,6 +1094,7 @@ declare module ts {
10941094
locale?: string;
10951095
mapRoot?: string;
10961096
module?: ModuleKind;
1097+
newLine?: NewLineKind;
10971098
noEmit?: boolean;
10981099
noEmitHelpers?: boolean;
10991100
noEmitOnError?: boolean;
@@ -1124,6 +1125,10 @@ declare module ts {
11241125
UMD = 3,
11251126
System = 4,
11261127
}
1128+
const enum NewLineKind {
1129+
CarriageReturnLineFeed = 0,
1130+
LineFeed = 1,
1131+
}
11271132
interface LineAndCharacter {
11281133
line: number;
11291134
character: number;
@@ -1186,6 +1191,32 @@ declare module ts {
11861191
var sys: System;
11871192
}
11881193
declare module ts {
1194+
interface ErrorCallback {
1195+
(message: DiagnosticMessage, length: number): void;
1196+
}
1197+
interface Scanner {
1198+
getStartPos(): number;
1199+
getToken(): SyntaxKind;
1200+
getTextPos(): number;
1201+
getTokenPos(): number;
1202+
getTokenText(): string;
1203+
getTokenValue(): string;
1204+
hasExtendedUnicodeEscape(): boolean;
1205+
hasPrecedingLineBreak(): boolean;
1206+
isIdentifier(): boolean;
1207+
isReservedWord(): boolean;
1208+
isUnterminated(): boolean;
1209+
reScanGreaterToken(): SyntaxKind;
1210+
reScanSlashToken(): SyntaxKind;
1211+
reScanTemplateToken(): SyntaxKind;
1212+
scan(): SyntaxKind;
1213+
setText(text: string, start?: number, length?: number): void;
1214+
setOnError(onError: ErrorCallback): void;
1215+
setScriptTarget(scriptTarget: ScriptTarget): void;
1216+
setTextPos(textPos: number): void;
1217+
lookAhead<T>(callback: () => T): T;
1218+
tryScan<T>(callback: () => T): T;
1219+
}
11891220
function tokenToString(t: SyntaxKind): string;
11901221
function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
11911222
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
@@ -1195,6 +1226,8 @@ declare module ts {
11951226
function getTrailingCommentRanges(text: string, pos: number): CommentRange[];
11961227
function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
11971228
function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
1229+
/** Creates a scanner over a (possibly unspecified) range of a piece of text. */
1230+
function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
11981231
}
11991232
declare module ts {
12001233
function getDefaultLibFileName(options: CompilerOptions): string;
@@ -1381,6 +1414,7 @@ declare module ts {
13811414
getRenameInfo(fileName: string, position: number): RenameInfo;
13821415
findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[];
13831416
getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
1417+
getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
13841418
getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
13851419
findReferences(fileName: string, position: number): ReferencedSymbol[];
13861420
getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[];

0 commit comments

Comments
 (0)