Skip to content

Commit 455492d

Browse files
author
Andy Hanson
committed
Merge branch 'master' into fallthrough
2 parents a82ac45 + 0a77bd2 commit 455492d

326 files changed

Lines changed: 6364 additions & 2430 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.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ branches:
1818
- master
1919
- release-2.1
2020
- release-2.2
21+
- release-2.3
2122

2223
install:
2324
- npm uninstall typescript
2425
- npm uninstall tslint
2526
- npm install
26-
- npm update
2727

2828
cache:
2929
directories:

‎Gulpfile.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
4141
boolean: ["debug", "inspect", "light", "colors", "lint", "soft"],
4242
string: ["browser", "tests", "host", "reporter", "stackTraceLimit"],
4343
alias: {
44+
b: "browser",
4445
d: "debug",
4546
t: "tests",
4647
test: "tests",
@@ -162,7 +163,10 @@ const librarySourceMap = [
162163

163164
// JavaScript + all host library
164165
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
165-
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") }
166+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
167+
{ target: "lib.es2016.full.d.ts", sources: ["header.d.ts", "es2016.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
168+
{ target: "lib.es2017.full.d.ts", sources: ["header.d.ts", "es2017.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
169+
{ target: "lib.esnext.full.d.ts", sources: ["header.d.ts", "esnext.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
166170
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
167171

168172
const libraryTargets = librarySourceMap.map(function(f) {
@@ -1024,7 +1028,7 @@ gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are:
10241028
const fileMatcher = cmdLineOptions["files"];
10251029
const files = fileMatcher
10261030
? `src/**/${fileMatcher}`
1027-
: "Gulpfile.ts 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
1031+
: "Gulpfile.ts 'scripts/tslint/*.ts' 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
10281032
const cmd = `node node_modules/tslint/bin/tslint ${files} --format stylish`;
10291033
console.log("Linting: " + cmd);
10301034
child_process.execSync(cmd, { stdio: [0, 1, 2] });

‎Jakefile.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,10 @@ var librarySourceMap = [
205205

206206
// JavaScript + all host library
207207
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
208-
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") }
208+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") },
209+
{ target: "lib.es2016.full.d.ts", sources: ["header.d.ts", "es2016.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
210+
{ target: "lib.es2017.full.d.ts", sources: ["header.d.ts", "es2017.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
211+
{ target: "lib.esnext.full.d.ts", sources: ["header.d.ts", "esnext.d.ts"].concat(hostsLibrarySources, "dom.iterable.d.ts") },
209212
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap, esnextLibrarySourceMap);
210213

211214
var libraryTargets = librarySourceMap.map(function (f) {
@@ -1197,7 +1200,7 @@ task("lint", ["build-rules"], () => {
11971200
const fileMatcher = process.env.f || process.env.file || process.env.files;
11981201
const files = fileMatcher
11991202
? `src/**/${fileMatcher}`
1200-
: "Gulpfile.ts 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
1203+
: "Gulpfile.ts 'scripts/tslint/*.ts' 'src/**/*.ts' --exclude src/lib/es5.d.ts --exclude 'src/lib/*.generated.d.ts'";
12011204
const cmd = `node node_modules/tslint/bin/tslint ${files} --format stylish`;
12021205
console.log("Linting: " + cmd);
12031206
jake.exec([cmd], { interactive: true }, () => {

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
22
[![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
3-
[![Downloads](https://img.shields.io/npm/dm/TypeScript.svg)](https://www.npmjs.com/package/typescript)
3+
[![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
44

55
# TypeScript
66

‎scripts/tslint/booleanTriviaRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function walk(ctx: Lint.WalkContext<void>): void {
6767
return;
6868
}
6969

70-
let ranges = ts.getTrailingCommentRanges(sourceFile.text, arg.pos) || ts.getLeadingCommentRanges(sourceFile.text, arg.pos);
70+
const ranges = ts.getTrailingCommentRanges(sourceFile.text, arg.pos) || ts.getLeadingCommentRanges(sourceFile.text, arg.pos);
7171
if (ranges === undefined || ranges.length !== 1 || ranges[0].kind !== ts.SyntaxKind.MultiLineCommentTrivia) {
7272
ctx.addFailureAtNode(arg, "Tag boolean argument with parameter name");
7373
return;

‎src/compiler/binder.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,7 +2300,7 @@ namespace ts {
23002300

23012301
function isNameOfExportsOrModuleExportsAliasDeclaration(node: Node) {
23022302
if (node.kind === SyntaxKind.Identifier) {
2303-
const symbol = container.locals.get((<Identifier>node).text);
2303+
const symbol = lookupSymbolForName((<Identifier>node).text);
23042304
if (symbol && symbol.valueDeclaration && symbol.valueDeclaration.kind === SyntaxKind.VariableDeclaration) {
23052305
const declaration = symbol.valueDeclaration as VariableDeclaration;
23062306
if (declaration.initializer) {
@@ -2402,8 +2402,12 @@ namespace ts {
24022402
}
24032403
}
24042404

2405+
function lookupSymbolForName(name: string) {
2406+
return (container.symbol && container.symbol.exports && container.symbol.exports.get(name)) || container.locals.get(name);
2407+
}
2408+
24052409
function bindPropertyAssignment(functionName: string, propertyAccessExpression: PropertyAccessExpression, isPrototypeProperty: boolean) {
2406-
let targetSymbol = container.locals.get(functionName);
2410+
let targetSymbol = lookupSymbolForName(functionName);
24072411

24082412
if (targetSymbol && isDeclarationOfFunctionOrClassExpression(targetSymbol)) {
24092413
targetSymbol = (targetSymbol.valueDeclaration as VariableDeclaration).initializer.symbol;

0 commit comments

Comments
 (0)