Merge branch 'master' into completionsCombineOverloads_2

Author: Andy Hanson

Gulpfile.js

@@ -46,7 +46,7 @@ const produceLKGJs = "scripts/produceLKG.js";
 const word2mdJs = "scripts/word2md.js";
 gulp.task("scripts", /*help*/ false, () => project.compile(scriptsProject), {
     aliases: [
-        configurePrereleaseJs, 
+        configurePrereleaseJs,
         processDiagnosticMessagesJs,
         generateLocalizedDiagnosticMessagesJs,
         produceLKGJs,
@@ -134,10 +134,11 @@ gulp.task(generatedLCGFile, /*help*/ false, [generateLocalizedDiagnosticMessages
 
 gulp.task("localize", /*help*/ false, [generatedLCGFile]);
 
+const servicesProject = "src/services/tsconfig.json";
 const typescriptServicesProject = "built/local/typescriptServices.tsconfig.json";
 gulp.task(typescriptServicesProject, /*help*/ false, () => {
     // NOTE: flatten services so that we can properly strip @internal
-    project.flatten("src/services/tsconfig.json", typescriptServicesProject, {
+    project.flatten(servicesProject, typescriptServicesProject, {
         compilerOptions: {
             "removeComments": true,
             "stripInternal": true,
@@ -148,7 +149,7 @@ gulp.task(typescriptServicesProject, /*help*/ false, () => {
 
 const typescriptServicesJs = "built/local/typescriptServices.js";
 const typescriptServicesDts = "built/local/typescriptServices.d.ts";
-gulp.task(typescriptServicesJs, /*help*/ false, ["lib", "generate-diagnostics", typescriptServicesProject], () => 
+gulp.task(typescriptServicesJs, /*help*/ false, ["lib", "generate-diagnostics", typescriptServicesProject], () =>
     project.compile(typescriptServicesProject, { dts: files => files.pipe(convertConstEnums()) }),
     { aliases: [typescriptServicesDts] });
 
@@ -225,7 +226,7 @@ gulp.task(tsserverlibraryProject, /*help*/ false, () => {
 const tsserverlibraryJs = "built/local/tsserverlibrary.js";
 const tsserverlibraryDts = "built/local/tsserverlibrary.d.ts";
 gulp.task(tsserverlibraryJs, /*help*/ false, [typescriptServicesJs, tsserverlibraryProject], () =>
-    project.compile(tsserverlibraryProject, { 
+    project.compile(tsserverlibraryProject, {
         dts: files => files
             .pipe(convertConstEnums())
             .pipe(append("\nexport = ts;\nexport as namespace ts;")),
@@ -253,21 +254,21 @@ gulp.task(specMd, /*help*/ false, [word2mdJs], () =>
     exec("cscript", ["//nologo", word2mdJs, path.resolve(specMd), path.resolve("doc/TypeScript Language Specification.docx")]));
 
 gulp.task(
-    "generate-spec", 
-    "Generates a Markdown version of the Language Specification", 
+    "generate-spec",
+    "Generates a Markdown version of the Language Specification",
     [specMd]);
 
 gulp.task("produce-LKG", /*help*/ false, ["scripts", "local", cancellationTokenJs, typingsInstallerJs, watchGuardJs, tscReleaseJs], () => {
     const expectedFiles = [
-        tscReleaseJs, 
-        typescriptServicesJs, 
-        tsserverJs, 
-        typescriptJs, 
-        typescriptDts, 
-        typescriptServicesDts, 
-        tsserverlibraryDts, 
-        tsserverlibraryDts, 
-        typingsInstallerJs, 
+        tscReleaseJs,
+        typescriptServicesJs,
+        tsserverJs,
+        typescriptJs,
+        typescriptDts,
+        typescriptServicesDts,
+        tsserverlibraryDts,
+        tsserverlibraryDts,
+        typingsInstallerJs,
         cancellationTokenJs
     ].concat(libraryTargets);
     const missingFiles = expectedFiles
@@ -286,8 +287,8 @@ gulp.task("produce-LKG", /*help*/ false, ["scripts", "local", cancellationTokenJ
 });
 
 gulp.task(
-    "LKG", 
-    "Makes a new LKG out of the built js files", 
+    "LKG",
+    "Makes a new LKG out of the built js files",
     () => runSequence("clean-built", "produce-LKG"));
 
 // Task to build the tests infrastructure using the built compiler
@@ -464,12 +465,40 @@ gulp.task(
     "Runs 'local'",
     ["local"]);
 
+gulp.task(
+    "watch-diagnostics",
+    /*help*/ false,
+    [processDiagnosticMessagesJs],
+    () => gulp.watch([diagnosticMessagesJson], [diagnosticInformationMapTs, builtGeneratedDiagnosticMessagesJson]));
+
+gulp.task(
+    "watch-lib",
+    /*help*/ false,
+    () => gulp.watch(["src/lib/**/*"], ["lib"]));
+
 gulp.task(
     "watch-tsc",
-    "Watches for changes to the build inputs for built/local/tsc.js",
-    [typescriptServicesJs],
+    /*help*/ false,
+    ["watch-diagnostics", "watch-lib", typescriptServicesJs],
     () => project.watch(tscProject, { typescript: "built" }));
 
+gulp.task(
+    "watch-services",
+    /*help*/ false,
+    ["watch-diagnostics", "watch-lib", typescriptServicesJs],
+    () => project.watch(servicesProject, { typescript: "built" }));
+
+gulp.task(
+    "watch-server",
+    /*help*/ false,
+    ["watch-diagnostics", "watch-lib", typescriptServicesJs],
+    () => project.watch(tsserverProject, { typescript: "built" }));
+
+gulp.task(
+    "watch-local",
+    /*help*/ false,
+    ["watch-lib", "watch-tsc", "watch-services", "watch-server"]);
+
 gulp.task(
     "watch",
     "Watches for changes to the build inputs for built/local/run.js executes runtests-parallel.",

README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
-[![VSTS Build Status](https://typescript.visualstudio.com/_apis/public/build/definitions/cf7ac146-d525-443c-b23c-0d58337efebc/4/badge)](https://typescript.visualstudio.com/TypeScript/_build/index?context=allDefinitions&path=%5C&definitionId=4&_a=completed) 
+[![VSTS Build Status](https://typescript.visualstudio.com/_apis/public/build/definitions/cf7ac146-d525-443c-b23c-0d58337efebc/4/badge)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=4&view=logs) 
 [![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
 [![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
 

lib/cs/diagnosticMessages.generated.json

@@ -49,8 +49,8 @@
   "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434": "Deklarace oboru názvů nemůže být umístěná před třídou nebo funkcí, se kterou se slučuje.",
   "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235": "Deklarace oboru názvů je povolená jenom v oboru názvů nebo v modulu.",
   "A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_7038": "Import stylu oboru názvů není možné vyvolat nebo konstruovat a způsobí selhání za běhu.",
-  "A_non_dry_build_would_build_project_0_6357": "Build nedodržující princip DRY by vytvořil projekt {0}.",
-  "A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Build nedodržující princip DRY by odstranil následující soubory: {0}",
+  "A_non_dry_build_would_build_project_0_6357": "Build bez příznaku -dry by vytvořil projekt {0}.",
+  "A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Build bez příznaku -dry by odstranil následující soubory: {0}",
   "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371": "Inicializátor parametru je povolený jenom v implementaci funkce nebo konstruktoru.",
   "A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317": "Vlastnost parametru se nedá deklarovat pomocí parametru rest.",
   "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369": "Vlastnost parametru je povolená jenom v implementaci konstruktoru.",

lib/de/diagnosticMessages.generated.json

@@ -49,8 +49,8 @@
   "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434": "Eine Namespacedeklaration darf nicht vor der Klasse oder Funktion positioniert werden, mit der sie zusammengeführt wird.",
   "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235": "Eine Namespacedeklaration ist nur in einem Namespace oder Modul zulässig.",
   "A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_7038": "Ein Import im Namespacestil kann nicht aufgerufen oder erstellt werden und verursacht zur Laufzeit einen Fehler.",
-  "A_non_dry_build_would_build_project_0_6357": "Bei einem echten Build würde das Projekt \"{0}\" erstellt.",
-  "A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Bei einem echten Build würden die folgenden Dateien gelöscht: {0}",
+  "A_non_dry_build_would_build_project_0_6357": "Bei einem Build mit dem Flag \"-dry\" würde das Projekt \"{0}\" erstellt.",
+  "A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Bei einem Build mit dem Flag \"-dry\" würden die folgenden Dateien gelöscht: {0}",
   "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371": "Ein Parameterinitialisierer ist nur in einer Funktions- oder Konstruktorimplementierung zulässig.",
   "A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317": "Eine Parametereigenschaft darf nicht mithilfe eines rest-Parameters deklariert werden.",
   "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369": "Eine Parametereigenschaft ist nur in einer Konstruktorimplementierung zulässig.",