Skip to content

Commit 93c0be6

Browse files
Merge pull request #6517 from Microsoft/dependOnNightlyPackages
Go back to depending on nightly builds of TypeScript
2 parents c6b0cf1 + 26fdf89 commit 93c0be6

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"istanbul": "latest",
3737
"mocha-fivemat-progress-reporter": "latest",
3838
"tslint": "next",
39-
"typescript": "1.8.0-dev.20160113",
39+
"typescript": "next",
4040
"tsd": "latest"
4141
},
4242
"scripts": {

src/compiler/checker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14600,7 +14600,7 @@ namespace ts {
1460014600
}
1460114601

1460214602
function hasExportedMembers(moduleSymbol: Symbol) {
14603-
for (var id in moduleSymbol.exports) {
14603+
for (const id in moduleSymbol.exports) {
1460414604
if (id !== "export=") {
1460514605
return true;
1460614606
}

src/compiler/core.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,8 @@ namespace ts {
718718
}
719719

720720
// Find the component that differs
721-
for (var joinStartIndex = 0; joinStartIndex < pathComponents.length && joinStartIndex < directoryComponents.length; joinStartIndex++) {
721+
let joinStartIndex: number;
722+
for (joinStartIndex = 0; joinStartIndex < pathComponents.length && joinStartIndex < directoryComponents.length; joinStartIndex++) {
722723
if (getCanonicalFileName(directoryComponents[joinStartIndex]) !== getCanonicalFileName(pathComponents[joinStartIndex])) {
723724
break;
724725
}

src/compiler/emitter.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
12501250
else {
12511251
// One object literal with all the attributes in them
12521252
write("{");
1253-
for (var i = 0; i < attrs.length; i++) {
1253+
for (let i = 0, n = attrs.length; i < n; i++) {
12541254
if (i > 0) {
12551255
write(", ");
12561256
}
@@ -1262,7 +1262,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
12621262

12631263
// Children
12641264
if (children) {
1265-
for (var i = 0; i < children.length; i++) {
1265+
for (let i = 0; i < children.length; i++) {
12661266
// Don't emit empty expressions
12671267
if (children[i].kind === SyntaxKind.JsxExpression && !((<JsxExpression>children[i]).expression)) {
12681268
continue;
@@ -1356,7 +1356,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
13561356
function emitJsxElement(node: JsxElement) {
13571357
emitJsxOpeningOrSelfClosingElement(node.openingElement);
13581358

1359-
for (var i = 0, n = node.children.length; i < n; i++) {
1359+
for (let i = 0, n = node.children.length; i < n; i++) {
13601360
emit(node.children[i]);
13611361
}
13621362

@@ -5172,7 +5172,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
51725172
// a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
51735173

51745174
if (isClassExpressionWithStaticProperties) {
5175-
for (var property of staticProperties) {
5175+
for (const property of staticProperties) {
51765176
write(",");
51775177
writeLine();
51785178
emitPropertyDeclaration(node, property, /*receiver*/ tempVariable, /*isExpression*/ true);
@@ -5719,7 +5719,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
57195719
const parameters = valueDeclaration.parameters;
57205720
const parameterCount = parameters.length;
57215721
if (parameterCount > 0) {
5722-
for (var i = 0; i < parameterCount; i++) {
5722+
for (let i = 0; i < parameterCount; i++) {
57235723
if (i > 0) {
57245724
write(", ");
57255725
}

src/compiler/program.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ namespace ts {
12171217
if (sourceFiles) {
12181218
const absoluteRootDirectoryPath = host.getCanonicalFileName(getNormalizedAbsolutePath(rootDirectory, currentDirectory));
12191219

1220-
for (var sourceFile of sourceFiles) {
1220+
for (const sourceFile of sourceFiles) {
12211221
if (!isDeclarationFile(sourceFile)) {
12221222
const absoluteSourceFilePath = host.getCanonicalFileName(getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
12231223
if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {

src/services/services.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6828,7 +6828,8 @@ namespace ts {
68286828
function classifyDisabledMergeCode(text: string, start: number, end: number) {
68296829
// Classify the line that the ======= marker is on as a comment. Then just lex
68306830
// all further tokens and add them to the result.
6831-
for (var i = start; i < end; i++) {
6831+
let i: number;
6832+
for (i = start; i < end; i++) {
68326833
if (isLineBreak(text.charCodeAt(i))) {
68336834
break;
68346835
}

0 commit comments

Comments
 (0)