Skip to content

Commit ca884d4

Browse files
DanielRosenwasserDanielRosenwasser
committed
Merge branch 'master' into testPerf
Conflicts: src/harness/harness.ts
2 parents 31ea4ba + 4fd3bcf commit ca884d4

685 files changed

Lines changed: 24932 additions & 5901 deletions

File tree

Some content is hidden

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

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
*.js linguist-language=TypeScript
1+
*.js linguist-language=TypeScript
2+
* -text

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ tests/services/baselines/local/*
2121
tests/baselines/prototyping/local/*
2222
tests/baselines/rwc/*
2323
tests/baselines/test262/*
24+
tests/baselines/reference/projectOutput/*
2425
tests/baselines/local/projectOutput/*
2526
tests/services/baselines/prototyping/local/*
2627
tests/services/browser/typescriptServices.js
@@ -46,4 +47,5 @@ scripts/*.js.map
4647
coverage/
4748
internal/
4849
**/.DS_Store
49-
.settings/
50+
.settings/*
51+
!.settings/tasks.json

‎.settings/tasks.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Available variables which can be used inside of strings.
2+
// ${workspaceRoot}: the root folder of the team
3+
// ${file}: the current opened file
4+
// ${fileBasename}: the current opened file's basename
5+
// ${fileDirname}: the current opened file's dirname
6+
// ${fileExtname}: the current opened file's extension
7+
// ${cwd}: the current working directory of the spawned process
8+
{
9+
"version": "0.1.0",
10+
"command": "jake",
11+
"isShellCommand": true,
12+
"showOutput": "silent",
13+
"tasks": [
14+
{
15+
"taskName": "local",
16+
"isBuildCommand": true,
17+
"showOutput": "silent",
18+
"problemMatcher": [
19+
"$tsc"
20+
]
21+
}
22+
]
23+
}

‎Jakefile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ var harnessSources = [
123123
return path.join(harnessDirectory, f);
124124
}).concat([
125125
"incrementalParser.ts",
126+
"jsDocParsing.ts",
126127
"services/colorization.ts",
127128
"services/documentRegistry.ts",
128129
"services/preProcessFile.ts",

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
[![Downloads](http://img.shields.io/npm/dm/TypeScript.svg)](https://npmjs.org/package/typescript)
66

77
# TypeScript
8+
9+
[![Join the chat at https://gitter.im/Microsoft/TypeScript](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Microsoft/TypeScript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
810

911
[TypeScript](http://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types, classes, and modules to JavaScript. TypeScript supports tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](http://www.typescriptlang.org/Playground), and stay up to date via [our blog](http://blogs.msdn.com/typescript) and [twitter account](https://twitter.com/typescriptlang).
1012

@@ -29,7 +31,7 @@ There are many ways to [contribute](https://github.com/Microsoft/TypeScript/blob
2931

3032
## Building
3133

32-
In order to build the TypeScript compiler, ensure that you have [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/) installed.
34+
In order to build the TypeScript compiler, ensure that you have [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/) installed. Note that you need to have autocrlf off as we track whitespace changes (`git config --global core.autocrlf false`).
3335

3436
Clone a copy of the repo:
3537

‎bin/lib.core.es6.d.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,11 @@ interface Array<T> {
15021502
copyWithin(target: number, start: number, end?: number): T[];
15031503
}
15041504

1505+
interface IArguments {
1506+
/** Iterator */
1507+
[Symbol.iterator](): IterableIterator<any>;
1508+
}
1509+
15051510
interface ArrayConstructor {
15061511
/**
15071512
* Creates an array from an array-like object.
@@ -1686,14 +1691,6 @@ interface GeneratorFunctionConstructor {
16861691
}
16871692
declare var GeneratorFunction: GeneratorFunctionConstructor;
16881693

1689-
interface Generator<T> extends IterableIterator<T> {
1690-
next(value?: any): IteratorResult<T>;
1691-
throw(exception: any): IteratorResult<T>;
1692-
return(value: T): IteratorResult<T>;
1693-
[Symbol.iterator](): Generator<T>;
1694-
[Symbol.toStringTag]: string;
1695-
}
1696-
16971694
interface Math {
16981695
/**
16991696
* Returns the number of leading zero bits in the 32-bit binary representation of a number.

‎bin/lib.d.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,10 +3552,10 @@ declare module Intl {
35523552
resolvedOptions(): ResolvedNumberFormatOptions;
35533553
}
35543554
var NumberFormat: {
3555-
new (locales?: string[], options?: NumberFormatOptions): Collator;
3556-
new (locale?: string, options?: NumberFormatOptions): Collator;
3557-
(locales?: string[], options?: NumberFormatOptions): Collator;
3558-
(locale?: string, options?: NumberFormatOptions): Collator;
3555+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
3556+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
3557+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
3558+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
35593559
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
35603560
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
35613561
}
@@ -3597,10 +3597,10 @@ declare module Intl {
35973597
resolvedOptions(): ResolvedDateTimeFormatOptions;
35983598
}
35993599
var DateTimeFormat: {
3600-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
3601-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
3602-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
3603-
(locale?: string, options?: DateTimeFormatOptions): Collator;
3600+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
3601+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
3602+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
3603+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
36043604
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
36053605
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
36063606
}

‎bin/lib.dom.d.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,10 +2382,10 @@ declare module Intl {
23822382
resolvedOptions(): ResolvedNumberFormatOptions;
23832383
}
23842384
var NumberFormat: {
2385-
new (locales?: string[], options?: NumberFormatOptions): Collator;
2386-
new (locale?: string, options?: NumberFormatOptions): Collator;
2387-
(locales?: string[], options?: NumberFormatOptions): Collator;
2388-
(locale?: string, options?: NumberFormatOptions): Collator;
2385+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
2386+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
2387+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
2388+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
23892389
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
23902390
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
23912391
}
@@ -2427,10 +2427,10 @@ declare module Intl {
24272427
resolvedOptions(): ResolvedDateTimeFormatOptions;
24282428
}
24292429
var DateTimeFormat: {
2430-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
2431-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
2432-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
2433-
(locale?: string, options?: DateTimeFormatOptions): Collator;
2430+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2431+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
2432+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2433+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
24342434
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
24352435
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
24362436
}

‎bin/lib.es6.d.ts‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,11 @@ interface Array<T> {
15021502
copyWithin(target: number, start: number, end?: number): T[];
15031503
}
15041504

1505+
interface IArguments {
1506+
/** Iterator */
1507+
[Symbol.iterator](): IterableIterator<any>;
1508+
}
1509+
15051510
interface ArrayConstructor {
15061511
/**
15071512
* Creates an array from an array-like object.
@@ -1686,14 +1691,6 @@ interface GeneratorFunctionConstructor {
16861691
}
16871692
declare var GeneratorFunction: GeneratorFunctionConstructor;
16881693

1689-
interface Generator<T> extends IterableIterator<T> {
1690-
next(value?: any): IteratorResult<T>;
1691-
throw(exception: any): IteratorResult<T>;
1692-
return(value: T): IteratorResult<T>;
1693-
[Symbol.iterator](): Generator<T>;
1694-
[Symbol.toStringTag]: string;
1695-
}
1696-
16971694
interface Math {
16981695
/**
16991696
* Returns the number of leading zero bits in the 32-bit binary representation of a number.
@@ -4933,10 +4930,10 @@ declare module Intl {
49334930
resolvedOptions(): ResolvedNumberFormatOptions;
49344931
}
49354932
var NumberFormat: {
4936-
new (locales?: string[], options?: NumberFormatOptions): Collator;
4937-
new (locale?: string, options?: NumberFormatOptions): Collator;
4938-
(locales?: string[], options?: NumberFormatOptions): Collator;
4939-
(locale?: string, options?: NumberFormatOptions): Collator;
4933+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
4934+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
4935+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
4936+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
49404937
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
49414938
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
49424939
}
@@ -4978,10 +4975,10 @@ declare module Intl {
49784975
resolvedOptions(): ResolvedDateTimeFormatOptions;
49794976
}
49804977
var DateTimeFormat: {
4981-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
4982-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
4983-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
4984-
(locale?: string, options?: DateTimeFormatOptions): Collator;
4978+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
4979+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
4980+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
4981+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
49854982
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
49864983
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
49874984
}

‎bin/lib.webworker.d.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,10 +2382,10 @@ declare module Intl {
23822382
resolvedOptions(): ResolvedNumberFormatOptions;
23832383
}
23842384
var NumberFormat: {
2385-
new (locales?: string[], options?: NumberFormatOptions): Collator;
2386-
new (locale?: string, options?: NumberFormatOptions): Collator;
2387-
(locales?: string[], options?: NumberFormatOptions): Collator;
2388-
(locale?: string, options?: NumberFormatOptions): Collator;
2385+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
2386+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
2387+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
2388+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
23892389
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
23902390
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
23912391
}
@@ -2427,10 +2427,10 @@ declare module Intl {
24272427
resolvedOptions(): ResolvedDateTimeFormatOptions;
24282428
}
24292429
var DateTimeFormat: {
2430-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
2431-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
2432-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
2433-
(locale?: string, options?: DateTimeFormatOptions): Collator;
2430+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2431+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
2432+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2433+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
24342434
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
24352435
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
24362436
}

0 commit comments

Comments
 (0)