Skip to content

Commit 39099a0

Browse files
ahejlsbergahejlsberg
committed
Merge branch 'master' into restTuples
# Conflicts: # tests/baselines/reference/api/tsserverlibrary.d.ts # tests/baselines/reference/api/typescript.d.ts
2 parents 5245642 + d0391d2 commit 39099a0

372 files changed

Lines changed: 450240 additions & 490008 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.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ tests/services/browser/typescriptServices.js
2323
src/harness/*.js
2424
src/compiler/diagnosticInformationMap.generated.ts
2525
src/compiler/diagnosticMessages.generated.json
26+
src/parser/diagnosticInformationMap.generated.ts
27+
src/parser/diagnosticMessages.generated.json
2628
rwc-report.html
2729
*.swp
2830
build.json

‎Gulpfile.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const clone = require("gulp-clone");
1212
const newer = require("gulp-newer");
1313
const tsc = require("gulp-typescript");
1414
const tsc_oop = require("./scripts/build/gulp-typescript-oop");
15+
const getDirSize = require("./scripts/build/getDirSize");
1516
const insert = require("gulp-insert");
1617
const sourcemaps = require("gulp-sourcemaps");
1718
const Q = require("q");
@@ -588,7 +589,13 @@ gulp.task("VerifyLKG", /*help*/ false, [], () => {
588589
gulp.task("LKGInternal", /*help*/ false, ["lib", "local"]);
589590

590591
gulp.task("LKG", "Makes a new LKG out of the built js files", ["clean", "dontUseDebugMode"], () => {
591-
return runSequence("LKGInternal", "VerifyLKG");
592+
const sizeBefore = getDirSize(lkgDirectory);
593+
const seq = runSequence("LKGInternal", "VerifyLKG");
594+
const sizeAfter = getDirSize(lkgDirectory);
595+
if (sizeAfter > (sizeBefore * 1.10)) {
596+
throw new Error("The lib folder increased by 10% or more. This likely indicates a bug.");
597+
}
598+
return seq;
592599
});
593600

594601

‎Jakefile.js‎

Lines changed: 164 additions & 124 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,29 +61,29 @@ Change to the TypeScript directory:
6161
cd TypeScript
6262
```
6363

64-
Install Gulp tools and dev dependencies:
64+
Install Jake tools and dev dependencies:
6565

6666
```bash
67-
npm install -g gulp
67+
npm install -g jake
6868
npm install
6969
```
7070

7171
Use one of the following to build and test:
7272

7373
```
74-
gulp local # Build the compiler into built/local
75-
gulp clean # Delete the built compiler
76-
gulp LKG # Replace the last known good with the built one.
74+
jake local # Build the compiler into built/local
75+
jake clean # Delete the built compiler
76+
jake LKG # Replace the last known good with the built one.
7777
# Bootstrapping step to be executed when the built compiler reaches a stable state.
78-
gulp tests # Build the test infrastructure using the built compiler.
79-
gulp runtests # Run tests using the built compiler and test infrastructure.
78+
jake tests # Build the test infrastructure using the built compiler.
79+
jake runtests # Run tests using the built compiler and test infrastructure.
8080
# You can override the host or specify a test for this command.
8181
# Use host=<hostName> or tests=<testPath>.
82-
gulp runtests-browser # Runs the tests using the built run.js file. Syntax is gulp runtests. Optional
82+
jake runtests-browser # Runs the tests using the built run.js file. Syntax is jake runtests. Optional
8383
parameters 'host=', 'tests=[regex], reporter=[list|spec|json|<more>]'.
84-
gulp baseline-accept # This replaces the baseline test results with the results obtained from gulp runtests.
85-
gulp lint # Runs tslint on the TypeScript source.
86-
gulp help # List the above commands.
84+
jake baseline-accept # This replaces the baseline test results with the results obtained from jake runtests.
85+
jake lint # Runs tslint on the TypeScript source.
86+
jake help # List the above commands.
8787
```
8888

8989

‎ThirdPartyNoticeText.txt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
/*!----------------- TypeScript ThirdPartyNotices -------------------------------------------------------
22

3-
The TypeScript software is based on or incorporates material and code from the projects listed below (collectively "Third Party Code"). Microsoft is not the original author of the Third Party Code. The original copyright notice and the license, under which Microsoft received such Third Party Code, are set forth below. Such license and notices are provided for informational purposes only. Microsoft licenses the Third Party Code to you under the terms of the Apache 2.0 License.
4-
All Third Party Code licensed by Microsoft under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
3+
The TypeScript software incorporates third party material from the projects listed below. The original copyright notice and the license under which Microsoft received such third party material are set forth below. Microsoft reserves all other rights not expressly granted, whether by implication, estoppel or otherwise.
54

6-
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
7-
8-
See the Apache Version 2.0 License for specific language governing permissions and
9-
limitations under the License.
105
---------------------------------------------
116
Third Party Code Components
127
--------------------------------------------

‎lib/cancellationToken.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/cs/diagnosticMessages.generated.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@
208208
"Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057": "Soubor tsconfig.json nejde najít v zadaném adresáři: {0}",
209209
"Cannot_find_global_type_0_2318": "Globální typ {0} se nenašel.",
210210
"Cannot_find_global_value_0_2468": "Globální hodnota {0} se nenašla.",
211+
"Cannot_find_lib_definition_for_0_2726": "Nepovedlo se najít definici knihovny pro {0}.",
212+
"Cannot_find_lib_definition_for_0_Did_you_mean_1_2727": "Nepovedlo se najít definici knihovny pro {0}. Neměli jste na mysli spíš {1}?",
211213
"Cannot_find_module_0_2307": "Nenašel se modul {0}.",
212214
"Cannot_find_name_0_2304": "Název {0} se nenašel.",
213215
"Cannot_find_name_0_Did_you_mean_1_2552": "Nepovedlo se najít název {0}. Měli jste na mysli {1}?",
@@ -941,6 +943,7 @@
941943
"Unexpected_end_of_text_1126": "Neočekávaný konec textu",
942944
"Unexpected_token_1012": "Neočekávaný token",
943945
"Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068": "Neočekávaný token. Očekával se konstruktor, metoda, přístupový objekt nebo vlastnost.",
946+
"Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069": "Neočekávaný token. Očekával se název parametru typu bez složených závorek.",
944947
"Unexpected_token_expected_1179": "Neočekávaný token. Očekává se znak {.",
945948
"Unknown_compiler_option_0_5023": "Neznámá možnost kompilátoru {0}",
946949
"Unknown_option_excludes_Did_you_mean_exclude_6114": "Neznámá možnost excludes. Měli jste na mysli exclude?",

0 commit comments

Comments
 (0)