Skip to content

Commit 151dc07

Browse files
rbucktonrbuckton
committed
Merge branch 'master' into sourceMapGenerator
2 parents 4982803 + 9320699 commit 151dc07

1,703 files changed

Lines changed: 92587 additions & 54891 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: node_js
22

33
node_js:
4-
- 'stable'
5-
- '8'
4+
- 'node'
5+
- '10'
66
- '6'
77

88
sudo: false

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ You can specify which browser to use for debugging. Currently Chrome and IE are
137137
jake runtests-browser tests=2dArrays browser=chrome
138138
```
139139

140-
You can debug with VS Code or Node instead with `jake runtests debug=true`:
140+
You can debug with VS Code or Node instead with `jake runtests inspect=true`:
141141

142142
```Shell
143-
jake runtests tests=2dArrays debug=true
143+
jake runtests tests=2dArrays inspect=true
144144
```
145145

146146
## Adding a Test
@@ -153,7 +153,7 @@ The supported names and values are the same as those supported in the compiler i
153153
They are useful for tests relating to modules.
154154
See below for examples.
155155

156-
**Note** that if you have a test corresponding to a specific spec compliance item, you can place it in `tests\cases\conformance` in an appropriately-named subfolder.
156+
**Note** that if you have a test corresponding to a specific spec compliance item, you can place it in `tests\cases\conformance` in an appropriately-named subfolder.
157157
**Note** that filenames here must be distinct from all other compiler testcase names, so you may have to work a bit to find a unique name if it's something common.
158158

159159
### Tests for multiple files
@@ -194,6 +194,6 @@ to establish the new baselines as the desired behavior. This will change the fil
194194
## Localization
195195

196196
All strings the user may see are stored in [`diagnosticMessages.json`](./src/compiler/diagnosticMessages.json).
197-
If you make changes to it, run `jake generate-diagnostics` to push them to the `Diagnostic` interface in [`diagnosticInformationMap.generated.ts`](./src/compiler/diagnosticInformationMap.generated.ts).
197+
If you make changes to it, run `jake generate-diagnostics` to push them to the `Diagnostic` interface in `diagnosticInformationMap.generated.ts`.
198198

199199
See [coding guidelines on diagnostic messages](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines#diagnostic-messages).

‎Gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const exec = require("./scripts/build/exec");
2626
const browserify = require("./scripts/build/browserify");
2727
const prepend = require("./scripts/build/prepend");
2828
const { removeSourceMaps } = require("./scripts/build/sourcemaps");
29-
const { CancellationTokenSource, CancelError, delay, Semaphore } = require("prex");
29+
const { CancellationTokenSource, CancelError, delay, Semaphore } = require("prex");
3030
const { libraryTargets, generateLibs } = require("./scripts/build/lib");
3131
const { runConsoleTests, cleanTestDirs, writeTestConfigFile, refBaseline, localBaseline, refRwcBaseline, localRwcBaseline } = require("./scripts/build/tests");
3232

‎Jakefile.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ task(TaskNames.local, [
147147
task("default", [TaskNames.local]);
148148

149149
const RunTestsPrereqs = [TaskNames.lib, Paths.servicesDefinitionFile, Paths.typescriptDefinitionFile, Paths.tsserverLibraryDefinitionFile];
150-
desc("Runs all the tests in parallel using the built run.js file. Optional arguments are: t[ests]=category1|category2|... d[ebug]=true.");
150+
desc("Runs all the tests in parallel using the built run.js file. Optional arguments are: t[ests]=category1|category2|... i[nspect]=true.");
151151
task(TaskNames.runtestsParallel, RunTestsPrereqs, function () {
152152
tsbuild([ConfigFileFor.runjs], true, () => {
153153
runConsoleTests("min", /*parallel*/ true);
154154
});
155155
}, { async: true });
156156

157-
desc("Runs all the tests in parallel using the built run.js file. Optional arguments are: t[ests]=category1|category2|... d[ebug]=true.");
157+
desc("Runs all the tests in parallel using the built run.js file. Optional arguments are: t[ests]=category1|category2|... i[nspect]=true.");
158158
task(TaskNames.runtests, RunTestsPrereqs, function () {
159159
tsbuild([ConfigFileFor.runjs], true, () => {
160160
runConsoleTests('mocha-fivemat-progress-reporter', /*runInParallel*/ false);
@@ -520,7 +520,6 @@ function runConsoleTests(defaultReporter, runInParallel) {
520520
}
521521

522522
let testTimeout = process.env.timeout || defaultTestTimeout;
523-
const debug = process.env.debug || process.env["debug-brk"] || process.env.d;
524523
const inspect = process.env.inspect || process.env["inspect-brk"] || process.env.i;
525524
const runners = process.env.runners || process.env.runner || process.env.ru;
526525
const tests = process.env.test || process.env.tests || process.env.t;

‎lib/de/diagnosticMessages.generated.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@
938938
"Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322": "Der Typ iterierter Elemente eines \"yield*\"-Operanden muss entweder eine gültige Zusage sein oder darf keinen aufrufbaren \"then\"-Member enthalten.",
939939
"Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321": "Der Typ eines \"yield\"-Operanden in einem asynchronen Generator muss entweder eine gültige Zusage sein oder darf keinen aufrufbaren \"then\"-Member enthalten.",
940940
"Type_parameter_0_has_a_circular_constraint_2313": "Der Typparameter \"{0}\" weist eine zirkuläre Einschränkung auf.",
941-
"Type_parameter_0_has_a_circular_default_2716": "Der Typparameter \"{0}\" weist einen zirkulären Standard auf.",
941+
"Type_parameter_0_has_a_circular_default_2716": "Der Typparameter \"{0}\" besitzt einen zirkulären Standardwert.",
942942
"Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008": "Der Typparameter \"{0}\" der Aufrufsignatur aus der exportierten Schnittstelle besitzt oder verwendet den privaten Namen \"{1}\".",
943943
"Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006": "Der Typparameter \"{0}\" der Konstruktorsignatur aus der exportierten Schnittstelle besitzt oder verwendet den privaten Namen \"{1}\".",
944944
"Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002": "Der Typparameter \"{0}\" der exportierten Klasse besitzt oder verwendet den privaten Namen \"{1}\".",

0 commit comments

Comments
 (0)