Merge branch 'master' into fix_lookup_regression_again_and_again

Author: Kingwl

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -16,7 +16,7 @@ Please fill in the *entire* template below.
 -->
 
 <!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
-**TypeScript Version:**  3.1.0-dev.201xxxxx
+**TypeScript Version:**  3.2.0-dev.201xxxxx
 
 <!-- Search terms you tried before logging this (so others can find this issue more easily) -->
 **Search Terms:**

.travis.yml

@@ -20,6 +20,7 @@ branches:
   - release-2.8
   - release-2.9
   - release-3.0
+  - release-3.1
 
 install:
   - npm uninstall typescript --no-save

CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

CONTRIBUTING.md

@@ -72,7 +72,7 @@ Your pull request should:
     * Requests need not be a single commit, but should be a linear sequence of commits (i.e. no merge commits in your PR)
 * It is desirable, but not necessary, for the tests to pass at each commit
 * Have clear commit messages 
-    * e.g. "Refactor feature", "Fix issue", "Add tests for issue"
+    * e.g. "Minor refactor in goToTypeDefinition", "Fix iterated type in for-await-of", "Add test for preserveWatchOutput on command line"
 * Include adequate tests 
     * At least one test should fail in the absence of your non-test code changes. If your PR does not match this criteria, please specify why
     * Tests should include reasonable permutations of the target fix/change
@@ -104,7 +104,7 @@ To run all tests, invoke the `runtests-parallel` target using jake:
 jake runtests-parallel
 ```
 
-This run will all tests; to run only a specific subset of tests, use:
+This will run all tests; to run only a specific subset of tests, use:
 
 ```Shell
 jake runtests tests=<regex>

README.md

@@ -61,7 +61,7 @@ Change to the TypeScript directory:
 cd TypeScript
 ```
 
-Install Jake tools and dev dependencies:
+Install [Jake](http://jakejs.com/) tools and dev dependencies:
 
 ```bash
 npm install -g jake

doc/spec.md

@@ -286,7 +286,7 @@ function f(s) {
 }
 ```
 
-In the JavaScript output, all type annotations have been erased. In general, TypeScript erases all type information before emiting JavaScript.
+In the JavaScript output, all type annotations have been erased. In general, TypeScript erases all type information before emitting JavaScript.
 
 ## <a name="1.1"/>1.1 Ambient Declarations
 

lib/tsc.js

@@ -63675,7 +63675,7 @@ var ts;
                 emitCallback(node);
             }
             if (extendedDiagnostics) {
-                ts.performance.mark("beginEmitBodyWithDetachedCommetns");
+                ts.performance.mark("beginEmitBodyWithDetachedComments");
             }
             if (!skipTrailingComments) {
                 emitLeadingComments(detachedRange.end, true);
@@ -63684,7 +63684,7 @@ var ts;
                 }
             }
             if (extendedDiagnostics) {
-                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedCommetns");
+                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedComments");
             }
         }
         function emitLeadingComments(pos, isEmittedNode) {

lib/tsserver.js

@@ -78883,7 +78883,7 @@ var ts;
                 emitCallback(node);
             }
             if (extendedDiagnostics) {
-                ts.performance.mark("beginEmitBodyWithDetachedCommetns");
+                ts.performance.mark("beginEmitBodyWithDetachedComments");
             }
             if (!skipTrailingComments) {
                 emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
@@ -78892,7 +78892,7 @@ var ts;
                 }
             }
             if (extendedDiagnostics) {
-                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedCommetns");
+                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedComments");
             }
         }
         function emitLeadingComments(pos, isEmittedNode) {

lib/tsserverlibrary.js

@@ -78870,7 +78870,7 @@ var ts;
                 emitCallback(node);
             }
             if (extendedDiagnostics) {
-                ts.performance.mark("beginEmitBodyWithDetachedCommetns");
+                ts.performance.mark("beginEmitBodyWithDetachedComments");
             }
             if (!skipTrailingComments) {
                 emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
@@ -78879,7 +78879,7 @@ var ts;
                 }
             }
             if (extendedDiagnostics) {
-                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedCommetns");
+                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedComments");
             }
         }
         function emitLeadingComments(pos, isEmittedNode) {

lib/typescript.js

@@ -78870,7 +78870,7 @@ var ts;
                 emitCallback(node);
             }
             if (extendedDiagnostics) {
-                ts.performance.mark("beginEmitBodyWithDetachedCommetns");
+                ts.performance.mark("beginEmitBodyWithDetachedComments");
             }
             if (!skipTrailingComments) {
                 emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
@@ -78879,7 +78879,7 @@ var ts;
                 }
             }
             if (extendedDiagnostics) {
-                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedCommetns");
+                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedComments");
             }
         }
         function emitLeadingComments(pos, isEmittedNode) {

lib/typescriptServices.js

@@ -78870,7 +78870,7 @@ var ts;
                 emitCallback(node);
             }
             if (extendedDiagnostics) {
-                ts.performance.mark("beginEmitBodyWithDetachedCommetns");
+                ts.performance.mark("beginEmitBodyWithDetachedComments");
             }
             if (!skipTrailingComments) {
                 emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
@@ -78879,7 +78879,7 @@ var ts;
                 }
             }
             if (extendedDiagnostics) {
-                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedCommetns");
+                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedComments");
             }
         }
         function emitLeadingComments(pos, isEmittedNode) {

lib/typingsInstaller.js

@@ -78883,7 +78883,7 @@ var ts;
                 emitCallback(node);
             }
             if (extendedDiagnostics) {
-                ts.performance.mark("beginEmitBodyWithDetachedCommetns");
+                ts.performance.mark("beginEmitBodyWithDetachedComments");
             }
             if (!skipTrailingComments) {
                 emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
@@ -78892,7 +78892,7 @@ var ts;
                 }
             }
             if (extendedDiagnostics) {
-                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedCommetns");
+                ts.performance.measure("commentTime", "beginEmitBodyWithDetachedComments");
             }
         }
         function emitLeadingComments(pos, isEmittedNode) {

package.json

@@ -1,8 +1,8 @@
 {
     "name": "typescript",
     "author": "Microsoft Corp.",
-    "homepage": "http://typescriptlang.org/",
-    "version": "3.1.0",
+    "homepage": "https://www.typescriptlang.org/",
+    "version": "3.2.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -75,6 +75,7 @@
         "gulp-typescript": "latest",
         "istanbul": "latest",
         "jake": "latest",
+        "lodash": "4.17.10",
         "merge2": "latest",
         "minimist": "latest",
         "mkdirp": "latest",