Skip to content

Commit eea1268

Browse files
Merge remote-tracking branch 'origin/master' into release-3.7
2 parents 20983ae + f84fd30 commit eea1268

File tree

530 files changed

+56485
-42382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

530 files changed

+56485
-42382
lines changed

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ Please help us by doing the following steps before logging an issue:
1515
Please fill in the *entire* template below.
1616
-->
1717

18-
<!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
19-
**TypeScript Version:** 3.4.0-dev.201xxxxx
18+
<!--
19+
Please try to reproduce the issue with the latest published version. It may have already been fixed.
20+
For npm: `typescript@next`
21+
This is also the 'Nightly' version in the playground: http://www.typescriptlang.org/play/?ts=Nightly
22+
-->
23+
**TypeScript Version:** 3.7.x-dev.201xxxxx
2024

2125
<!-- Search terms you tried before logging this (so others can find this issue more easily) -->
2226
**Search Terms:**

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ internal/
6161
**/.DS_Store
6262
.settings
6363
**/.vs
64-
**/.vscode
64+
**/.vscode/*
6565
!**/.vscode/tasks.json
66-
!**/.vscode/settings.json
66+
!**/.vscode/settings.template.json
67+
!**/.vscode/launch.template.json
6768
!**/.vscode/extensions.json
6869
!tests/cases/projects/projectOption/**/node_modules
6970
!tests/cases/projects/NodeModulesSearch/**/*

.vscode/launch.template.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
3+
Copy this file into '.vscode/launch.json' or merge its
4+
contents into your existing configurations.
5+
6+
If you want to remove the errors in comments for all JSON
7+
files, add this to your settings in ~/.vscode/User/settings.json
8+
9+
"files.associations": {
10+
"*.json": "jsonc"
11+
},
12+
13+
*/
14+
15+
{
16+
// Use IntelliSense to learn about possible attributes.
17+
// Hover to view descriptions of existing attributes.
18+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
19+
"version": "0.2.0",
20+
"configurations": [
21+
{
22+
"type": "node",
23+
"protocol": "inspector",
24+
"request": "launch",
25+
"name": "Mocha Tests (currently opened test)",
26+
"runtimeArgs": ["--nolazy"],
27+
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
28+
"args": [
29+
"-u",
30+
"bdd",
31+
"--no-timeouts",
32+
"--colors",
33+
"built/local/run.js",
34+
"-f",
35+
// You can change this to be the name of a specific test file (without the file extension)
36+
// to consistently launch the same test
37+
"${fileBasenameNoExtension}",
38+
"--skip-percent",
39+
"0"
40+
],
41+
"env": {
42+
"NODE_ENV": "testing"
43+
},
44+
"sourceMaps": true,
45+
"smartStep": true,
46+
"preLaunchTask": "tests",
47+
"console": "integratedTerminal",
48+
"outFiles": [
49+
"${workspaceRoot}/built/local/run.js"
50+
]
51+
},
52+
{
53+
// See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
54+
"type": "node",
55+
"request": "attach",
56+
"name": "Attach to VS Code TS Server via Port",
57+
"processId": "${command:PickProcess}"
58+
}
59+
]
60+
}

.vscode/settings.json

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

.vscode/settings.template.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Rename this file 'settings.json' or merge its
2+
// contents into your existing settings.
3+
{
4+
"eslint.validate": [
5+
{
6+
"language": "typescript",
7+
"autoFix": true
8+
}
9+
],
10+
"eslint.options": {
11+
"rulePaths": ["./scripts/eslint/built/rules/"],
12+
"ext": [".ts"]
13+
},
14+
// To use the last-known-good (LKG) compiler version:
15+
// "typescript.tsdk": "lib"
16+
17+
// To use the locally built compiler, after 'npm run build':
18+
// "typescript.tsdk": "built/local"
19+
}

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ You can debug with VS Code or Node instead with `gulp runtests --inspect=true`:
160160
gulp runtests --tests=2dArrays --inspect=true
161161
```
162162

163+
You can also use the [provided VS Code launch configuration](./.vscode/launch.template.json) to launch a debug session for an open test file. Rename the file 'launch.json', open the test file of interest, and launch the debugger from the debug panel (or press F5).
164+
163165
## Adding a Test
164166

165167
To add a new test case, simply place a `.ts` file in `tests\cases\compiler` containing code that exemplifies the bugfix or change you are making.

Gulpfile.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,18 @@ const localize = async () => {
9090
}
9191
};
9292

93+
const buildShims = () => buildProject("src/shims");
94+
const cleanShims = () => cleanProject("src/shims");
95+
cleanTasks.push(cleanShims);
96+
97+
const buildDebugTools = () => buildProject("src/debug");
98+
const cleanDebugTools = () => cleanProject("src/debug");
99+
cleanTasks.push(cleanDebugTools);
100+
101+
const buildShimsAndTools = parallel(buildShims, buildDebugTools);
102+
93103
// Pre-build steps when targeting the LKG compiler
94-
const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics));
104+
const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildShimsAndTools));
95105

96106
const buildTsc = () => buildProject("src/tsc");
97107
task("tsc", series(lkgPreBuild, buildTsc));
@@ -107,7 +117,7 @@ task("watch-tsc", series(lkgPreBuild, parallel(watchLib, watchDiagnostics, watch
107117
task("watch-tsc").description = "Watch for changes and rebuild the command-line compiler only.";
108118

109119
// Pre-build steps when targeting the built/local compiler.
110-
const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildTsc));
120+
const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildShimsAndTools, buildTsc));
111121

112122
// Pre-build steps to use based on supplied options.
113123
const preBuild = cmdLineOptions.lkg ? lkgPreBuild : localPreBuild;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ with any additional questions or comments.
4242

4343
## Documentation
4444

45-
* [Quick tutorial](https://www.typescriptlang.org/docs/tutorial.html)
45+
* [TypeScript in 5 minutes](https://www.typescriptlang.org/docs/handbook/typescript-in-5-minutes.html)
4646
* [Programming handbook](https://www.typescriptlang.org/docs/handbook/basic-types.html)
4747
* [Language specification](https://github.com/microsoft/TypeScript/blob/master/doc/spec.md)
4848
* [Homepage](https://www.typescriptlang.org/)

lib/cs/diagnosticMessages.generated.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@
441441
"Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391": "Implementace funkce chybí nebo nenásleduje hned po deklaraci.",
442442
"Function_implementation_name_must_be_0_2389": "Název implementace funkce musí být {0}.",
443443
"Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024": "Funkce implicitně obsahuje návratový typ any, protože neobsahuje anotaci návratového typu a odkazuje se na ni přímo nebo nepřímo v jednom z jejích návratových výrazů.",
444-
"Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366": "Ve funkci chybí koncový návratový příkaz a návratový typ neobsahuje undefined.",
444+
"Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366": "Ve funkci chybí koncový příkaz return a návratový typ neobsahuje undefined.",
445445
"Function_overload_must_be_static_2387": "Přetížení funkce musí být statické.",
446446
"Function_overload_must_not_be_static_2388": "Přetížení funkce nesmí být statické.",
447447
"Generate_get_and_set_accessors_95046": "Generovat přístupové objekty get a set",

lib/de/diagnosticMessages.generated.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@
10321032
"await_expression_is_only_allowed_within_an_async_function_1308": "Der Ausdruck \"await\" ist nur in einer asynchronen Funktion zulässig.",
10331033
"await_expressions_cannot_be_used_in_a_parameter_initializer_2524": "await-Ausdrücke dürfen nicht in einem Parameterinitialisierer verwendet werden.",
10341034
"baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106": "Die Option \"baseUrl\" ist auf \"{0}\" festgelegt. Dieser Wert wird verwendet, um den nicht relativen Modulnamen \"{1}\" aufzulösen.",
1035-
"can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312": "\"=\" kann nur in einer Objektliteraleigenschaft innerhalb eines Destrukturierungsauftrags verwendet werden.",
1035+
"can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312": "\"=\" kann nur in einer Objektliteraleigenschaft innerhalb eines Destrukturierungszuweisung verwendet werden.",
10361036
"case_or_default_expected_1130": "\"case\" oder \"default\" wurde erwartet.",
10371037
"class_expressions_are_not_currently_supported_9003": "class-Ausdrücke werden zurzeit nicht unterstützt.",
10381038
"const_declarations_can_only_be_declared_inside_a_block_1156": "const-Deklarationen können nur innerhalb eines Blocks deklariert werden.",

0 commit comments

Comments
 (0)