Skip to content

Commit

Permalink
Merge pull request #2 from Microsoft/master
Browse files Browse the repository at this point in the history
fetch latest code
  • Loading branch information
plantain-00 committed Jan 12, 2016
2 parents bf8812e + 33bfd92 commit 001b7b5
Show file tree
Hide file tree
Showing 4,598 changed files with 158,729 additions and 33,927 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
29 changes: 15 additions & 14 deletions Jakefile.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,6 @@ var serverCoreSources = [
return path.join(serverDirectory, f);
});

var scriptSources = [
"tslint/booleanTriviaRule.ts",
"tslint/nextLineRule.ts",
"tslint/noNullRule.ts",
"tslint/preferConstRule.ts",
"tslint/typeOperatorSpacingRule.ts",
"tslint/noInOperatorRule.ts"
].map(function (f) {
return path.join(scriptsDirectory, f);
});

var serverSources = serverCoreSources.concat(servicesSources);

var languageServiceLibrarySources = [
Expand Down Expand Up @@ -544,7 +533,8 @@ compileFile(word2mdJs,
// The generated spec.md; built for the 'generate-spec' task
file(specMd, [word2mdJs, specWord], function () {
var specWordFullPath = path.resolve(specWord);
var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + specMd;
var specMDFullPath = path.resolve(specMd);
var cmd = "cscript //nologo " + word2mdJs + ' "' + specWordFullPath + '" ' + '"' + specMDFullPath + '"';
console.log(cmd);
child_process.exec(cmd, function () {
complete();
Expand Down Expand Up @@ -877,7 +867,8 @@ var tslintRules = ([
"preferConstRule",
"booleanTriviaRule",
"typeOperatorSpacingRule",
"noInOperatorRule"
"noInOperatorRule",
"noIncrementDecrementRule"
]);
var tslintRulesFiles = tslintRules.map(function(p) {
return path.join(tslintRuleDir, p + ".ts");
Expand Down Expand Up @@ -920,10 +911,20 @@ function lintFileAsync(options, path, cb) {
});
}

var servicesLintTargets = [
"navigateTo.ts",
"outliningElementsCollector.ts",
"patternMatcher.ts",
"services.ts",
"shims.ts",
].map(function (s) {
return path.join(servicesDirectory, s);
});
var lintTargets = compilerSources
.concat(harnessCoreSources)
.concat(serverCoreSources)
.concat(scriptSources);
.concat(tslintRulesFiles)
.concat(servicesLintTargets);

desc("Runs tslint on the compiler sources");
task("lint", ["build-rules"], function() {
Expand Down
7 changes: 7 additions & 0 deletions doc/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This directory contains miscellaneous documentation such as the TypeScript language specification and logo.
If you are looking for more introductory material, you might want to take a look at the [TypeScript Handbook](https://github.com/Microsoft/TypeScript-Handbook).

# Spec Contributions

The specification is first authored as a Microsoft Word (docx) file and then generated into Markdown and PDF formats.
Due to the binary format of docx files, and the merging difficulties that may come with it, it is preferred that any suggestions or problems found in the spec should be [filed as issues](https://github.com/Microsoft/TypeScript/issues/new) rather than sent as pull requests.
Binary file modified doc/TypeScript Language Specification (Change Markup).docx
Binary file not shown.
Binary file modified doc/TypeScript Language Specification (Change Markup).pdf
Binary file not shown.
Binary file modified doc/TypeScript Language Specification.docx
Binary file not shown.
Binary file modified doc/TypeScript Language Specification.pdf
Binary file not shown.
Binary file added doc/images/image1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/image2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/image3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/images/image4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
318 changes: 208 additions & 110 deletions doc/spec.md

Large diffs are not rendered by default.

44 changes: 31 additions & 13 deletions lib/lib.core.es6.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3847,7 +3847,7 @@ interface Symbol {
/** Returns the primitive value of the specified object. */
valueOf(): Object;

[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "Symbol";
}

interface SymbolConstructor {
Expand Down Expand Up @@ -4405,7 +4405,7 @@ interface IterableIterator<T> extends Iterator<T> {
}

interface GeneratorFunction extends Function {

[Symbol.toStringTag]: "GeneratorFunction";
}

interface GeneratorFunctionConstructor {
Expand Down Expand Up @@ -4530,7 +4530,7 @@ interface Math {
*/
cbrt(x: number): number;

[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "Math";
}

interface Date {
Expand Down Expand Up @@ -4647,7 +4647,7 @@ interface Map<K, V> {
size: number;
values(): IterableIterator<V>;
[Symbol.iterator]():IterableIterator<[K,V]>;
[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "Map";
}

interface MapConstructor {
Expand All @@ -4664,7 +4664,7 @@ interface WeakMap<K, V> {
get(key: K): V;
has(key: K): boolean;
set(key: K, value?: V): WeakMap<K, V>;
[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "WeakMap";
}

interface WeakMapConstructor {
Expand All @@ -4686,7 +4686,7 @@ interface Set<T> {
size: number;
values(): IterableIterator<T>;
[Symbol.iterator]():IterableIterator<T>;
[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "Set";
}

interface SetConstructor {
Expand All @@ -4702,7 +4702,7 @@ interface WeakSet<T> {
clear(): void;
delete(value: T): boolean;
has(value: T): boolean;
[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "WeakSet";
}

interface WeakSetConstructor {
Expand All @@ -4714,7 +4714,7 @@ interface WeakSetConstructor {
declare var WeakSet: WeakSetConstructor;

interface JSON {
[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "JSON";
}

/**
Expand All @@ -4724,11 +4724,11 @@ interface JSON {
* buffer as needed.
*/
interface ArrayBuffer {
[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "ArrayBuffer";
}

interface DataView {
[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "DataView";
}

/**
Expand All @@ -4749,6 +4749,7 @@ interface Int8Array {
*/
values(): IterableIterator<number>;
[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Int8Array";
}

interface Int8ArrayConstructor {
Expand Down Expand Up @@ -4781,6 +4782,7 @@ interface Uint8Array {
*/
values(): IterableIterator<number>;
[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "UInt8Array";
}

interface Uint8ArrayConstructor {
Expand Down Expand Up @@ -4816,6 +4818,7 @@ interface Uint8ClampedArray {
values(): IterableIterator<number>;

[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Uint8ClampedArray";
}

interface Uint8ClampedArrayConstructor {
Expand Down Expand Up @@ -4853,6 +4856,7 @@ interface Int16Array {


[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Int16Array";
}

interface Int16ArrayConstructor {
Expand Down Expand Up @@ -4885,6 +4889,7 @@ interface Uint16Array {
*/
values(): IterableIterator<number>;
[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Uint16Array";
}

interface Uint16ArrayConstructor {
Expand Down Expand Up @@ -4917,6 +4922,7 @@ interface Int32Array {
*/
values(): IterableIterator<number>;
[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Int32Array";
}

interface Int32ArrayConstructor {
Expand Down Expand Up @@ -4949,6 +4955,7 @@ interface Uint32Array {
*/
values(): IterableIterator<number>;
[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Uint32Array";
}

interface Uint32ArrayConstructor {
Expand Down Expand Up @@ -4981,6 +4988,7 @@ interface Float32Array {
*/
values(): IterableIterator<number>;
[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Float32Array";
}

interface Float32ArrayConstructor {
Expand Down Expand Up @@ -5013,6 +5021,7 @@ interface Float64Array {
*/
values(): IterableIterator<number>;
[Symbol.iterator](): IterableIterator<number>;
[Symbol.toStringTag]: "Float64Array";
}

interface Float64ArrayConstructor {
Expand Down Expand Up @@ -5064,7 +5073,7 @@ declare namespace Reflect {
function isExtensible(target: any): boolean;
function ownKeys(target: any): Array<PropertyKey>;
function preventExtensions(target: any): boolean;
function set(target: any, propertyKey: PropertyKey, value: any, receiver? :any): boolean;
function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
function setPrototypeOf(target: any, proto: any): boolean;
}

Expand All @@ -5089,7 +5098,7 @@ interface Promise<T> {
catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
catch(onrejected?: (reason: any) => void): Promise<T>;

[Symbol.toStringTag]: string;
[Symbol.toStringTag]: "Promise";
}

interface PromiseConstructor {
Expand All @@ -5112,7 +5121,16 @@ interface PromiseConstructor {
* @param values An array of Promises.
* @returns A new Promise.
*/
all<T>(values: Iterable<T | PromiseLike<T>>): Promise<T[]>;
all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;

/**
* Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
Expand Down
Loading

0 comments on commit 001b7b5

Please sign in to comment.