Skip to content

Commit 0d7c9dc

Browse files
rbucktonrbuckton
committed
Merge branch 'master' into asyncGenerators
2 parents b0faa92 + 69e0677 commit 0d7c9dc

293 files changed

Lines changed: 7246 additions & 1554 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.

‎Jakefile.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,6 @@ task("update-sublime", ["local", serverFile], function () {
11801180
var tslintRuleDir = "scripts/tslint";
11811181
var tslintRules = [
11821182
"nextLineRule",
1183-
"preferConstRule",
11841183
"booleanTriviaRule",
11851184
"typeOperatorSpacingRule",
11861185
"noInOperatorRule",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"through2": "latest",
7676
"travis-fold": "latest",
7777
"ts-node": "latest",
78-
"tslint": "4.0.0-dev.3",
78+
"tslint": "next",
7979
"typescript": "next"
8080
},
8181
"scripts": {

‎scripts/tslint/preferConstRule.ts‎

Lines changed: 0 additions & 204 deletions
This file was deleted.

‎src/compiler/binder.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ namespace ts {
283283
// Parameters with names are handled at the top of this function. Parameters
284284
// without names can only come from JSDocFunctionTypes.
285285
Debug.assert(node.parent.kind === SyntaxKind.JSDocFunctionType);
286-
let functionType = <JSDocFunctionType>node.parent;
287-
let index = indexOf(functionType.parameters, node);
286+
const functionType = <JSDocFunctionType>node.parent;
287+
const index = indexOf(functionType.parameters, node);
288288
return "arg" + index;
289289
case SyntaxKind.JSDocTypedefTag:
290290
const parentNode = node.parent && node.parent.parent;
@@ -3140,6 +3140,7 @@ namespace ts {
31403140
case SyntaxKind.TaggedTemplateExpression:
31413141
case SyntaxKind.ShorthandPropertyAssignment:
31423142
case SyntaxKind.StaticKeyword:
3143+
case SyntaxKind.MetaProperty:
31433144
// These nodes are ES6 syntax.
31443145
transformFlags |= TransformFlags.AssertES2015;
31453146
break;

0 commit comments

Comments
 (0)