Skip to content

Commit 4af0e2a

Browse files
author
Arthur Ozga
committed
Merge branch 'master' into interfaceFixes
2 parents 69118cd + 88b7d53 commit 4af0e2a

284 files changed

Lines changed: 7134 additions & 5083 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: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ var harnessSources = harnessCoreSources.concat([
265265
"commandLineParsing.ts",
266266
"configurationExtension.ts",
267267
"convertCompilerOptionsFromJson.ts",
268-
"convertTypingOptionsFromJson.ts",
268+
"convertTypeAcquisitionFromJson.ts",
269269
"tsserverProjectSystem.ts",
270270
"compileOnSave.ts",
271271
"typingsInstaller.ts",
@@ -939,7 +939,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
939939
}
940940

941941
if (tests && tests.toLocaleLowerCase() === "rwc") {
942-
testTimeout = 400000;
942+
testTimeout = 800000;
943943
}
944944

945945
colors = process.env.colors || process.env.color;
@@ -1095,12 +1095,10 @@ task("tests-debug", ["setDebugMode", "tests"]);
10951095
// Makes the test results the new baseline
10961096
desc("Makes the most recent test results the new baseline, overwriting the old baseline");
10971097
task("baseline-accept", function () {
1098-
acceptBaseline("");
1098+
acceptBaseline(localBaseline, refBaseline);
10991099
});
11001100

1101-
function acceptBaseline(containerFolder) {
1102-
var sourceFolder = path.join(localBaseline, containerFolder);
1103-
var targetFolder = path.join(refBaseline, containerFolder);
1101+
function acceptBaseline(sourceFolder, targetFolder) {
11041102
console.log('Accept baselines from ' + sourceFolder + ' to ' + targetFolder);
11051103
var files = fs.readdirSync(sourceFolder);
11061104
var deleteEnding = '.delete';
@@ -1124,12 +1122,12 @@ function acceptBaseline(containerFolder) {
11241122

11251123
desc("Makes the most recent rwc test results the new baseline, overwriting the old baseline");
11261124
task("baseline-accept-rwc", function () {
1127-
acceptBaseline("rwc");
1125+
acceptBaseline(localRwcBaseline, refRwcBaseline);
11281126
});
11291127

11301128
desc("Makes the most recent test262 test results the new baseline, overwriting the old baseline");
11311129
task("baseline-accept-test262", function () {
1132-
acceptBaseline("test262");
1130+
acceptBaseline(localTest262Baseline, refTest262Baseline);
11331131
});
11341132

11351133

‎scripts/parallel-lint.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
var Linter = require("tslint");
1+
var tslint = require("tslint");
22
var fs = require("fs");
33

44
function getLinterOptions() {
55
return {
6-
configuration: require("../tslint.json"),
76
formatter: "prose",
87
formattersDirectory: undefined,
98
rulesDirectory: "built/local/tslint"
109
};
1110
}
11+
function getLinterConfiguration() {
12+
return require("../tslint.json");
13+
}
1214

13-
function lintFileContents(options, path, contents) {
14-
var ll = new Linter(path, contents, options);
15-
return ll.lint();
15+
function lintFileContents(options, configuration, path, contents) {
16+
var ll = new tslint.Linter(options);
17+
ll.lint(path, contents, configuration);
18+
return ll.getResult();
1619
}
1720

18-
function lintFileAsync(options, path, cb) {
21+
function lintFileAsync(options, configuration, path, cb) {
1922
fs.readFile(path, "utf8", function (err, contents) {
2023
if (err) {
2124
return cb(err);
2225
}
23-
var result = lintFileContents(options, path, contents);
26+
var result = lintFileContents(options, configuration, path, contents);
2427
cb(undefined, result);
2528
});
2629
}
@@ -30,7 +33,8 @@ process.on("message", function (data) {
3033
case "file":
3134
var target = data.name;
3235
var lintOptions = getLinterOptions();
33-
lintFileAsync(lintOptions, target, function (err, result) {
36+
var lintConfiguration = getLinterConfiguration();
37+
lintFileAsync(lintOptions, lintConfiguration, target, function (err, result) {
3438
if (err) {
3539
process.send({ kind: "error", error: err.toString() });
3640
return;

‎scripts/tslint/booleanTriviaRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44
export class Rule extends Lint.Rules.AbstractRule {

‎scripts/tslint/nextLineRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44
const OPTION_CATCH = "check-catch";

‎scripts/tslint/noInOperatorRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/noIncrementDecrementRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/noTypeAssertionWhitespaceRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/objectLiteralSurroundingSpaceRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

‎scripts/tslint/preferConstRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44
export class Rule extends Lint.Rules.AbstractRule {

‎scripts/tslint/typeOperatorSpacingRule.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Lint from "tslint/lib/lint";
1+
import * as Lint from "tslint/lib";
22
import * as ts from "typescript";
33

44

0 commit comments

Comments
 (0)