Merge branch 'master' into patch-32

Author: sandersn

.eslintrc.json

@@ -26,6 +26,10 @@
         "@typescript-eslint/no-inferrable-types": "error",
         "@typescript-eslint/no-misused-new": "error",
         "@typescript-eslint/no-this-alias": "error",
+
+        "no-unused-expressions": "off",
+        "@typescript-eslint/no-unused-expressions": ["error", { "allowTernary": true }],
+
         "@typescript-eslint/prefer-for-of": "error",
         "@typescript-eslint/prefer-function-type": "error",
         "@typescript-eslint/prefer-namespace-keyword": "error",
@@ -36,6 +40,13 @@
         "semi": "off",
         "@typescript-eslint/semi": "error",
 
+        "space-before-function-paren": "off",
+        "@typescript-eslint/space-before-function-paren": ["error", {
+            "asyncArrow": "always",
+            "anonymous": "always",
+            "named": "never"
+        }],
+
         "@typescript-eslint/triple-slash-reference": "error",
         "@typescript-eslint/type-annotation-spacing": "error",
         "@typescript-eslint/unified-signatures": "error",
@@ -97,7 +108,6 @@
         "no-trailing-spaces": "error",
         "no-undef-init": "error",
         "no-unsafe-finally": "error",
-        "no-unused-expressions": ["error", { "allowTernary": true }],
         "no-unused-labels": "error",
         "no-var": "error",
         "object-shorthand": "error",

package.json

@@ -54,9 +54,9 @@
         "@types/through2": "latest",
         "@types/travis-fold": "latest",
         "@types/xml2js": "^0.4.0",
-        "@typescript-eslint/eslint-plugin": "2.3.2",
-        "@typescript-eslint/experimental-utils": "2.3.2",
-        "@typescript-eslint/parser": "2.3.2",
+        "@typescript-eslint/eslint-plugin": "2.18.0",
+        "@typescript-eslint/experimental-utils": "2.18.0",
+        "@typescript-eslint/parser": "2.18.0",
         "async": "latest",
         "azure-devops-node-api": "^8.0.0",
         "browser-resolve": "^1.11.2",
@@ -65,10 +65,10 @@
         "chalk": "latest",
         "convert-source-map": "latest",
         "del": "5.1.0",
-        "eslint": "6.5.1",
-        "eslint-formatter-autolinkable-stylish": "1.0.3",
-        "eslint-plugin-import": "2.18.2",
-        "eslint-plugin-jsdoc": "15.9.9",
+        "eslint": "6.8.0",
+        "eslint-formatter-autolinkable-stylish": "1.1.1",
+        "eslint-plugin-import": "2.20.0",
+        "eslint-plugin-jsdoc": "21.0.0",
         "eslint-plugin-no-null": "1.0.2",
         "fancy-log": "latest",
         "fs-extra": "^6.0.1",

scripts/open-cherry-pick-pr.ts

@@ -2,7 +2,7 @@
 // Must reference esnext.asynciterable lib, since octokit uses AsyncIterable internally
 /// <reference types="node" />
 
-import Octokit = require("@octokit/rest");
+import { Octokit } from "@octokit/rest";
 const {runSequence} = require("./run-sequence");
 import fs = require("fs");
 import path = require("path");
@@ -26,18 +26,34 @@ async function main() {
     const currentAuthor = runSequence([
         ["git", ["log", "-1", `--pretty="%aN <%aE>"`]]
     ]);
+
+    const gh = new Octokit();
+    gh.authenticate({
+        type: "token",
+        token: process.argv[2]
+    });
+
+    const inputPR = (await gh.pulls.get({ pull_number: +process.env.SOURCE_ISSUE, owner: "microsoft", repo: "TypeScript" })).data;
+    let remoteName = "origin";
+    if (inputPR.base.repo.git_url !== `git:github.com/microsoft/TypeScript`) {
+        runSequence([
+            ["git", ["remote", "add", "nonlocal", inputPR.base.repo.git_url]]
+        ]);
+        remoteName = "nonlocal";
+    }
+    const baseBranchName = inputPR.base.ref;
     runSequence([
-        ["git", ["fetch", "origin", "master"]]
+        ["git", ["fetch", remoteName, baseBranchName]]
     ]);
     let logText = runSequence([
-        ["git", ["log", `origin/master..${currentSha.trim()}`, `--pretty="%h %s%n%b"`, "--reverse"]]
+        ["git", ["log", `${remoteName}/${baseBranchName}..${currentSha.trim()}`, `--pretty="%h %s%n%b"`, "--reverse"]]
     ]);
     logText = `Cherry-pick PR #${process.env.SOURCE_ISSUE} into ${process.env.TARGET_BRANCH}
 
 Component commits:
 ${logText.trim()}`;
     const logpath = path.join(__dirname, "../", "logmessage.txt");
-    const mergebase = runSequence([["git", ["merge-base", "origin/master", currentSha]]]).trim();
+    const mergebase = runSequence([["git", ["merge-base", `${remoteName}/${baseBranchName}`, currentSha]]]).trim();
     runSequence([
         ["git", ["checkout", "-b", "temp-branch"]],
         ["git", ["reset", mergebase, "--soft"]]
@@ -67,11 +83,6 @@ ${logText.trim()}`;
         ["git", ["push", "--set-upstream", "fork", branchName, "-f"]] // push the branch
     ]);
 
-    const gh = new Octokit();
-    gh.authenticate({
-        type: "token",
-        token: process.argv[2]
-    });
     const r = await gh.pulls.create({
         owner: "Microsoft",
         repo: "TypeScript",

src/compiler/binder.ts

@@ -4124,8 +4124,18 @@ namespace ts {
             case SyntaxKind.TemplateHead:
             case SyntaxKind.TemplateMiddle:
             case SyntaxKind.TemplateTail:
-            case SyntaxKind.TemplateExpression:
+                if ((<NoSubstitutionTemplateLiteral | TemplateHead | TemplateMiddle | TemplateTail>node).templateFlags) {
+                    transformFlags |= TransformFlags.AssertES2018;
+                    break;
+                }
+                // falls through
             case SyntaxKind.TaggedTemplateExpression:
+                if (hasInvalidEscape((<TaggedTemplateExpression>node).template)) {
+                    transformFlags |= TransformFlags.AssertES2018;
+                    break;
+                }
+                // falls through
+            case SyntaxKind.TemplateExpression:
             case SyntaxKind.ShorthandPropertyAssignment:
             case SyntaxKind.StaticKeyword:
             case SyntaxKind.MetaProperty: