Skip to content

Commit 359648e

Browse files
author
Paul van Brenk
committed
Merge branch 'master' into referencesFileAssert
2 parents 325c8b6 + b180324 commit 359648e

File tree

3,080 files changed

+82170
-72156
lines changed

Some content is hidden

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

3,080 files changed

+82170
-72156
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.js linguist-language=TypeScript

.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

.travis.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,4 @@ language: node_js
33
node_js:
44
- '0.10'
55

6-
sudo: false
7-
8-
before_script: npm install -g codeclimate-test-reporter
9-
10-
after_script:
11-
- cat coverage/lcov.info | codeclimate
12-
13-
addons:
14-
code_climate:
15-
repo_token: 9852ac5362c8cc38c07ca5adc0f94c20c6c79bd78e17933dc284598a65338656
6+
sudo: false

Jakefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var compilerSources = [
3939
"utilities.ts",
4040
"binder.ts",
4141
"checker.ts",
42+
"declarationEmitter.ts",
4243
"emitter.ts",
4344
"program.ts",
4445
"commandLineParser.ts",
@@ -57,6 +58,7 @@ var servicesSources = [
5758
"utilities.ts",
5859
"binder.ts",
5960
"checker.ts",
61+
"declarationEmitter.ts",
6062
"emitter.ts",
6163
"program.ts",
6264
"commandLineParser.ts",
@@ -65,7 +67,7 @@ var servicesSources = [
6567
return path.join(compilerDirectory, f);
6668
}).concat([
6769
"breakpoints.ts",
68-
"navigateTo.ts",
70+
"navigateTo.ts",
6971
"navigationBar.ts",
7072
"outliningElementsCollector.ts",
7173
"patternMatcher.ts",
@@ -252,8 +254,6 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
252254
options += " --stripInternal"
253255
}
254256

255-
options += " --cacheDownlevelForOfLength --preserveNewLines";
256-
257257
var cmd = host + " " + dir + compilerFilename + " " + options + " ";
258258
cmd = cmd + sources.join(" ");
259259
console.log(cmd + "\n");
@@ -539,7 +539,7 @@ function cleanTestDirs() {
539539
}
540540

541541
jake.mkdirP(localRwcBaseline);
542-
jake.mkdirP(localTest262Baseline);
542+
jake.mkdirP(localTest262Baseline);
543543
jake.mkdirP(localBaseline);
544544
}
545545

@@ -718,7 +718,7 @@ file(loggedIOJsPath, [builtLocalDirectory, loggedIOpath], function() {
718718

719719
var instrumenterPath = harnessDirectory + 'instrumenter.ts';
720720
var instrumenterJsPath = builtLocalDirectory + 'instrumenter.js';
721-
compileFile(instrumenterJsPath, [instrumenterPath], [tscFile, instrumenterPath], [], /*useBuiltCompiler*/ true);
721+
compileFile(instrumenterJsPath, [instrumenterPath], [tscFile, instrumenterPath].concat(libraryTargets), [], /*useBuiltCompiler*/ true);
722722

723723
desc("Builds an instrumented tsc.js");
724724
task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function() {

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 {

0 commit comments

Comments
 (0)