Merge branch 'master' into signatureHelpTypeArguments

Author: Andy Hanson

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -32,8 +32,8 @@ What shortcomings exist with current approaches?
 ## Checklist
 
 My suggestion meets these guidelines:
- [ ] This wouldn't be a breaking change in existing TypeScript / JavaScript code
- [ ] This wouldn't change the runtime behavior of existing JavaScript code
- [ ] This could be implemented without emitting different JS based on the types of the expressions
- [ ] This isn't a runtime feature (e.g. new expression-level syntax)
+* [ ] This wouldn't be a breaking change in existing TypeScript / JavaScript code
+* [ ] This wouldn't change the runtime behavior of existing JavaScript code
+* [ ] This could be implemented without emitting different JS based on the types of the expressions
+* [ ] This isn't a runtime feature (e.g. new expression-level syntax)
 

.github/pull_request_template.md

@@ -2,15 +2,16 @@
 Thank you for submitting a pull request!
 
 Here's a checklist you might find useful.
-[ ] There is an associated issue that is labeled
+* [ ] There is an associated issue that is labeled
   'Bug' or 'help wanted' or is in the Community milestone
-[ ] Code is up-to-date with the `master` branch
-[ ] You've successfully run `jake runtests` locally
-[ ] You've signed the CLA
-[ ] There are new or updated unit tests validating the change
+* [ ] Code is up-to-date with the `master` branch
+* [ ] You've successfully run `jake runtests` locally
+* [ ] You've signed the CLA
+* [ ] There are new or updated unit tests validating the change
 
 Refer to CONTRIBUTING.MD for more details.
   https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md
 -->
 
 Fixes #
+

.gitignore

@@ -1,4 +1,5 @@
 node_modules/
+.node_modules/
 built/*
 tests/cases/rwc/*
 tests/cases/test262/*

.mailmap

@@ -308,7 +308,7 @@ Remo H. Jansen  <[email protected]>
 Sean Barag  <[email protected]>
 Sharon Rolel  <[email protected]>
 Stanislav Iliev  <[email protected]>
-Wenlu Wang  <[email protected]> wenlu.wang  <[email protected]> kingwl  <[email protected]>
+Wenlu Wang  <[email protected]> wenlu.wang  <[email protected]> kingwl  <[email protected]> 王文璐 <[email protected]> 王文璐 <[email protected]>
 Wilson Hobbs  <[email protected]>
 Yuval Greenfield  <[email protected]>
 Daniel  <[email protected]> # @nieltg
@@ -321,4 +321,23 @@ AdityaDaflapurkar  <[email protected]> # Aditya Daflapurkar
 Eric Grube  <[email protected]>
 Martyn Janes  <[email protected]>
 Ricardo N Feliciano  <[email protected]>
-Sergii Bezliudnyi  <[email protected]>
+Sergii Bezliudnyi  <[email protected]>
+Adrien Gibrat  <[email protected]>
+Alex Ryan  <[email protected]>
+Alexader  <[email protected]> Alexander T  <[email protected]> # Alexander Tarasyuk
+Andrew Faulkner  <[email protected]>
+Artem Tyurin  <[email protected]>
+Brandon Slade  <[email protected]>
+Derek P Sifford  <[email protected]>
+Dhruv Rajvanshi  <[email protected]>
+Holger Jeromin  <[email protected]>
+Jordi Oliveras Rovira  <[email protected]>
+Joscha Feth  <[email protected]> Joscha Feth  <[email protected]>
+Ken703  <[email protected]> # Bowden Kenny
+Kevin Donnelly  <[email protected]>
+Maarten Sijm  <[email protected]>
+Paul Koerbitz  <[email protected]>
+EcoleKeine  <[email protected]> # Ecole Keine
+Khải  <[email protected]>
+rhysd  <[email protected]> # @rhysd
+Zen  <[email protected]> Zzzen  <[email protected]> # @Zzzen

.npmignore

@@ -1,6 +1,6 @@
 built
 doc
-Gulpfile.ts
+Gulpfile.js
 internal
 jenkins.sh
 lib/README.md
@@ -23,3 +23,4 @@ test.config
 package-lock.json
 yarn.lock
 .github/
+CONTRIBUTING.md

AUTHORS.md

@@ -6,14 +6,17 @@ TypeScript is authored by:
 * Aditya Daflapurkar
 * Adnan Chowdhury 
 * Adrian Leonhard 
+* Adrien Gibrat 
 * Ahmad Farid
 * Akshar Patel
 * Alan Agius 
 * Alex Chugaev 
 * Alex Eagle
 * Alex Khomchenko 
+* Alex Ryan 
 * Alexander Kuvaev
 * Alexander Rusakov 
+* Alexander Tarasyuk
 * Ali Sabzevari
 * Aliaksandr Radzivanovich
 * Aluan Haddad 
@@ -22,6 +25,7 @@ TypeScript is authored by:
 * Andreas Martin
 * Andrej Baran 
 * Andrew Casey 
+* Andrew Faulkner 
 * Andrew Ochsner 
 * Andrew Stegmaier 
 * Andrew Z Allen
@@ -34,6 +38,7 @@ TypeScript is authored by:
 * Armando Aguirre 
 * Arnaud Tournier 
 * Arnav Singh
+* Artem Tyurin 
 * Arthur Ozga
 * Asad Saeeduddin
 * Avery Morin
@@ -49,6 +54,8 @@ TypeScript is authored by:
 * Blake Embrey
 * @bootstraponline
 * Bowden Kelly
+* Bowden Kenny
+* Brandon Slade 
 * Brett Mayen
 * Bryan Forbes
 * Caitlin Potter
@@ -76,6 +83,8 @@ TypeScript is authored by:
 * David Sheldrick 
 * David Souther
 * Denis Nedelyaev
+* Derek P Sifford 
+* Dhruv Rajvanshi 
 * Dick van den Brink
 * Diogo Franco (Kovensky) 
 * Dirk Bäumer
@@ -84,6 +93,7 @@ TypeScript is authored by:
 * Donald Pipowitch 
 * Doug Ilijev
 * @e-cloud
+* Ecole Keine
 * Elisée Maurer
 * Emilio García-Pumarino
 * Eric Grube 
@@ -118,6 +128,7 @@ TypeScript is authored by:
 * Hendrik Liebau 
 * Henry Mercer 
 * Herrington Darkholme
+* Holger Jeromin 
 * Homa Wong 
 * Iain Monro
 * @IdeaHunter
@@ -155,6 +166,8 @@ TypeScript is authored by:
 * Jonathan Toland
 * Jonathan Turner
 * Jonathon Smith
+* Jordi Oliveras Rovira 
+* Joscha Feth 
 * Josh Abernathy 
 * Josh Goldberg 
 * Josh Kalderimis
@@ -170,7 +183,9 @@ TypeScript is authored by:
 * Keith Mashinter
 * Ken Howard
 * Kenji Imamula
+* Kevin Donnelly 
 * Kevin Lang 
+* Khải 
 * Kitson Kelly 
 * Klaus Meinhardt 
 * Kris Zyp 
@@ -179,6 +194,7 @@ TypeScript is authored by:
 * Lorant Pinter
 * Lucien Greathouse
 * Lukas Elmer 
+* Maarten Sijm 
 * Magnus Hiie 
 * Magnus Kulke 
 * Manish Giri
@@ -223,6 +239,7 @@ TypeScript is authored by:
 * Oussama Ben Brahim 
 * Patrick Zhong
 * Paul Jolly
+* Paul Koerbitz 
 * Paul van Brenk
 * @pcbro
 * Pedro Maltez
@@ -240,6 +257,7 @@ TypeScript is authored by:
 * Raj Dosanjh
 * Reiner Dolp 
 * Remo H. Jansen 
+* @rhysd
 * Ricardo N Feliciano 
 * Richard Karmazín 
 * Richard Knoll
@@ -309,4 +327,5 @@ TypeScript is authored by:
 * Yuval Greenfield 
 * Zeeshan Ahmed 
 * Zev Spitz
-* Zhengbo Li
+* Zhengbo Li
+* @Zzzen

Gulpfile.js

@@ -36,7 +36,7 @@ const constEnumCaptureRegexp = /^(\s*)(export )?const enum (\S+) {(\s*)$/gm;
 const constEnumReplacement = "$1$2enum $3 {$4";
 
 const cmdLineOptions = minimist(process.argv.slice(2), {
-    boolean: ["debug", "inspect", "light", "colors", "lint", "soft"],
+    boolean: ["debug", "inspect", "light", "colors", "lint", "soft", "fix"],
     string: ["browser", "tests", "host", "reporter", "stackTraceLimit", "timeout"],
     alias: {
         "b": "browser",
@@ -47,6 +47,7 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
         "r": "reporter",
         "c": "colors", "color": "colors",
         "w": "workers",
+        "f": "fix",
     },
     default: {
         soft: false,
@@ -61,6 +62,7 @@ const cmdLineOptions = minimist(process.argv.slice(2), {
         light: process.env.light === undefined || process.env.light !== "false",
         reporter: process.env.reporter || process.env.r,
         lint: process.env.lint || true,
+        fix: process.env.fix || process.env.f,
         workers: process.env.workerCount || os.cpus().length,
     }
 });
@@ -260,6 +262,7 @@ function getCompilerSettings(base, useBuiltCompiler) {
     for (const key in base) {
         copy[key] = base[key];
     }
+    copy.strictNullChecks = true;
     if (!useDebugMode) {
         if (copy.removeComments === undefined) copy.removeComments = true;
     }
@@ -1069,7 +1072,7 @@ gulp.task("build-rules", "Compiles tslint rules to js", () => {
 gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are: --f[iles]=regex", ["build-rules"], () => {
     if (fold.isTravis()) console.log(fold.start("lint"));
     for (const project of ["scripts/tslint/tsconfig.json", "src/tsconfig-base.json"]) {
-        const cmd = `node node_modules/tslint/bin/tslint --project ${project} --formatters-dir ./built/local/tslint/formatters --format autolinkableStylish`;
+        const cmd = `node node_modules/tslint/bin/tslint --project ${project} --formatters-dir ./built/local/tslint/formatters --format autolinkableStylish${cmdLineOptions.fix ? " --fix" : ""}`;
         console.log("Linting: " + cmd);
         child_process.execSync(cmd, { stdio: [0, 1, 2] });
     }

Jakefile.js

@@ -251,7 +251,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
         else {
             options += " --lib es5";
         }
-        options += " --noUnusedLocals --noUnusedParameters";
+        options += " --noUnusedLocals --noUnusedParameters --strictNullChecks";
 
         var cmd = host + " " + compilerPath + " " + options + " ";
         cmd = cmd + sources.join(" ");
@@ -1114,65 +1114,17 @@ task("build-rules-end", [], function () {
     if (fold.isTravis()) console.log(fold.end("build-rules"));
 });
 
-var lintTargets = compilerSources
-    .concat(harnessSources)
-    // Other harness sources
-    .concat(["instrumenter.ts"].map(function (f) { return path.join(harnessDirectory, f); }))
-    .concat(serverSources)
-    .concat(tslintRulesFiles)
-    .concat(servicesSources)
-    .concat(typingsInstallerSources)
-    .concat(cancellationTokenSources)
-    .concat(["Gulpfile.ts"])
-    .concat([nodeServerInFile, perftscPath, "tests/perfsys.ts", webhostPath])
-    .map(function (p) { return path.resolve(p); });
-// keep only unique items
-lintTargets = Array.from(new Set(lintTargets));
-
-function sendNextFile(files, child, callback, failures) {
-    var file = files.pop();
-    if (file) {
-        console.log("Linting '" + file + "'.");
-        child.send({ kind: "file", name: file });
-    }
-    else {
-        child.send({ kind: "close" });
-        callback(failures);
-    }
-}
-
-function spawnLintWorker(files, callback) {
-    var child = child_process.fork("./scripts/parallel-lint");
-    var failures = 0;
-    child.on("message", function (data) {
-        switch (data.kind) {
-            case "result":
-                if (data.failures > 0) {
-                    failures += data.failures;
-                    console.log(data.output);
-                }
-                sendNextFile(files, child, callback, failures);
-                break;
-            case "error":
-                console.error(data.error);
-                failures++;
-                sendNextFile(files, child, callback, failures);
-                break;
-        }
-    });
-    sendNextFile(files, child, callback, failures);
-}
-
 desc("Runs tslint on the compiler sources. Optional arguments are: f[iles]=regex");
 task("lint", ["build-rules"], () => {
     if (fold.isTravis()) console.log(fold.start("lint"));
-   function lint(project, cb) {
-        const cmd = `node node_modules/tslint/bin/tslint --project ${project} --formatters-dir ./built/local/tslint/formatters --format autolinkableStylish`;
+    function lint(project, cb) {
+        const fix = process.env.fix || process.env.f;
+        const cmd = `node node_modules/tslint/bin/tslint --project ${project} --formatters-dir ./built/local/tslint/formatters --format autolinkableStylish${fix ? " --fix" : ""}`;
         console.log("Linting: " + cmd);
         jake.exec([cmd], cb, /** @type {jake.ExecOptions} */({ interactive: true, windowsVerbatimArguments: true }));
-   }
-   lint("scripts/tslint/tsconfig.json", () => lint("src/tsconfig-base.json", () => {
+    }
+    lint("scripts/tslint/tsconfig.json", () => lint("src/tsconfig-base.json", () => {
         if (fold.isTravis()) console.log(fold.end("lint"));
         complete();
-   }));
+    }));
 });