Skip to content

Commit a26368a

Browse files
author
Yui T
committed
Merge branch 'master' into allowDestructuringInAmbient
2 parents 8320bca + a4b71a1 commit a26368a

File tree

2,545 files changed

+65815
-67726
lines changed

Some content is hidden

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

2,545 files changed

+65815
-67726
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
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/local/projectOutput/*
2425
tests/services/baselines/prototyping/local/*
2526
tests/services/browser/typescriptServices.js
2627
scripts/processDiagnosticMessages.d.ts

Jakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
254254
options += " --stripInternal"
255255
}
256256

257-
options += " --cacheDownlevelForOfLength --preserveNewLines";
258-
259257
var cmd = host + " " + dir + compilerFilename + " " + options + " ";
260258
cmd = cmd + sources.join(" ");
261259
console.log(cmd + "\n");

bin/lib.core.d.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,3 +1170,17 @@ interface ArrayConstructor {
11701170
}
11711171

11721172
declare var Array: ArrayConstructor;
1173+
1174+
interface TypedPropertyDescriptor<T> {
1175+
enumerable?: boolean;
1176+
configurable?: boolean;
1177+
writable?: boolean;
1178+
value?: T;
1179+
get?: () => T;
1180+
set?: (value: T) => void;
1181+
}
1182+
1183+
declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
1184+
declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
1185+
declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
1186+
declare type ParameterDecorator = (target: Function, propertyKey: string | symbol, parameterIndex: number) => void;

bin/lib.core.es6.d.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,20 @@ interface ArrayConstructor {
11701170
}
11711171

11721172
declare var Array: ArrayConstructor;
1173+
1174+
interface TypedPropertyDescriptor<T> {
1175+
enumerable?: boolean;
1176+
configurable?: boolean;
1177+
writable?: boolean;
1178+
value?: T;
1179+
get?: () => T;
1180+
set?: (value: T) => void;
1181+
}
1182+
1183+
declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
1184+
declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
1185+
declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
1186+
declare type ParameterDecorator = (target: Function, propertyKey: string | symbol, parameterIndex: number) => void;
11731187
declare type PropertyKey = string | number | symbol;
11741188

11751189
interface Symbol {

bin/lib.d.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,20 @@ interface ArrayConstructor {
11711171

11721172
declare var Array: ArrayConstructor;
11731173

1174+
interface TypedPropertyDescriptor<T> {
1175+
enumerable?: boolean;
1176+
configurable?: boolean;
1177+
writable?: boolean;
1178+
value?: T;
1179+
get?: () => T;
1180+
set?: (value: T) => void;
1181+
}
1182+
1183+
declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
1184+
declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
1185+
declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
1186+
declare type ParameterDecorator = (target: Function, propertyKey: string | symbol, parameterIndex: number) => void;
1187+
11741188
/////////////////////////////
11751189
/// IE10 ECMAScript Extensions
11761190
/////////////////////////////

bin/lib.es6.d.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,6 +1170,20 @@ interface ArrayConstructor {
11701170
}
11711171

11721172
declare var Array: ArrayConstructor;
1173+
1174+
interface TypedPropertyDescriptor<T> {
1175+
enumerable?: boolean;
1176+
configurable?: boolean;
1177+
writable?: boolean;
1178+
value?: T;
1179+
get?: () => T;
1180+
set?: (value: T) => void;
1181+
}
1182+
1183+
declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
1184+
declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void;
1185+
declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
1186+
declare type ParameterDecorator = (target: Function, propertyKey: string | symbol, parameterIndex: number) => void;
11731187
declare type PropertyKey = string | number | symbol;
11741188

11751189
interface Symbol {

bin/tsc.js

Lines changed: 8147 additions & 6848 deletions
Large diffs are not rendered by default.

bin/tsserver.js

Lines changed: 9777 additions & 7631 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)