Merge branch 'master' into better-js-constructor-checks

Author: sandersn

Gulpfile.js

@@ -350,10 +350,12 @@ const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lin
 /** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
 const eslint = (folder) => async () => {
 
+    const formatter = cmdLineOptions.ci ? "stylish" : "autolinkable-stylish";
     const args = [
         "node_modules/eslint/bin/eslint",
         "--cache",
         "--cache-location", `${folder}/.eslintcache`,
+        "--format", formatter,
         "--rulesdir", "scripts/eslint/built/rules",
         "--ext", ".ts",
     ];
@@ -362,14 +364,6 @@ const eslint = (folder) => async () => {
         args.push("--fix");
     }
 
-    // Use stylish format on CI, so that it can be picked up by GH Action's rule matchers
-    if (cmdLineOptions.ci) {
-        args.push("--format", "stylish");
-    }
-    else {
-        args.push("--format", "autolinkable-stylish");
-    }
-
     args.push(folder);
 
     log(`Linting: ${args.join(" ")}`);

package.json

@@ -54,7 +54,7 @@
         "@types/through2": "latest",
         "@types/travis-fold": "latest",
         "@types/xml2js": "^0.4.0",
-        "@typescript-eslint/eslint-plugin": "^3.4.1-alpha.1",
+        "@typescript-eslint/eslint-plugin": "^3.6.1-alpha.1",
         "@typescript-eslint/experimental-utils": "^3.4.1-alpha.1",
         "@typescript-eslint/parser": "^3.4.1-alpha.1",
         "async": "latest",

src/compiler/checker.ts

@@ -38257,7 +38257,7 @@ namespace ts {
                 if (prop.kind === SyntaxKind.ShorthandPropertyAssignment && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
-                    return grammarErrorOnNode(prop.equalsToken!, Diagnostics.Did_you_mean_to_use_a_Colon_When_following_property_names_in_an_object_literal_implies_a_destructuring_assignment);
+                    return grammarErrorOnNode(prop.equalsToken!, Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern);
                 }
 
                 if (name.kind === SyntaxKind.PrivateIdentifier) {

src/compiler/diagnosticMessages.json

@@ -880,7 +880,7 @@
         "category": "Error",
         "code": 1308
     },
-    "Did you mean to use a ':'? When following property names in an object literal, '=' implies a destructuring assignment.": {
+    "Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern.": {
         "category": "Error",
         "code": 1312
     },

src/services/codefixes/fixPropertyAssignment.ts

@@ -2,7 +2,7 @@
 namespace ts.codefix {
     const fixId = "fixPropertyAssignment";
     const errorCodes = [
-        Diagnostics.Did_you_mean_to_use_a_Colon_When_following_property_names_in_an_object_literal_implies_a_destructuring_assignment.code
+        Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern.code
     ];
 
     registerCodeFix({

src/services/completions.ts

@@ -2432,7 +2432,7 @@ namespace ts.Completions {
                 !existingMemberNames.has(propertySymbol.escapedName) &&
                 !!propertySymbol.declarations &&
                 !(getDeclarationModifierFlagsFromSymbol(propertySymbol) & ModifierFlags.Private) &&
-                !isPrivateIdentifierPropertyDeclaration(propertySymbol.valueDeclaration));
+                !(propertySymbol.valueDeclaration && isPrivateIdentifierPropertyDeclaration(propertySymbol.valueDeclaration)));
         }
 
         /**

tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring.errors.txt

@@ -11,7 +11,7 @@ tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring.ts(85,19): erro
   Types of property 'x' are incompatible.
     Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring.ts(85,26): error TS2322: Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring.ts(111,14): error TS1312: Did you mean to use a ':'? When following property names in an object literal, '=' implies a destructuring assignment.
+tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring.ts(111,14): error TS1312: Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern.
 
 
 ==== tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring.ts (12 errors) ====
@@ -153,7 +153,7 @@ tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring.ts(111,14): err
     (function() {
     	let a = { s = 5 };
     	            ~
-!!! error TS1312: Did you mean to use a ':'? When following property names in an object literal, '=' implies a destructuring assignment.
+!!! error TS1312: Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern.
     });
 
     function foo({a = 4, b = { x: 5 }}) {

tests/baselines/reference/shorthandPropertyAssignmentsInDestructuring_ES6.errors.txt

@@ -11,7 +11,7 @@ tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.ts(85,19):
   Types of property 'x' are incompatible.
     Type 'number' is not assignable to type 'string'.
 tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.ts(85,26): error TS2322: Type 'number' is not assignable to type 'string'.
-tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.ts(111,14): error TS1312: Did you mean to use a ':'? When following property names in an object literal, '=' implies a destructuring assignment.
+tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.ts(111,14): error TS1312: Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern.
 
 
 ==== tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.ts (12 errors) ====
@@ -153,7 +153,7 @@ tests/cases/compiler/shorthandPropertyAssignmentsInDestructuring_ES6.ts(111,14):
     (function() {
     	let a = { s = 5 };
     	            ~
-!!! error TS1312: Did you mean to use a ':'? When following property names in an object literal, '=' implies a destructuring assignment.
+!!! error TS1312: Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern.
     });
 
     function foo({a = 4, b = { x: 5 }}) {

tests/cases/fourslash/completionListInheritedClassMembers.ts

@@ -0,0 +1,43 @@
+/// <reference path="fourslash.ts"/>
+
+// @filename: a.ts
+////interface I {
+////    m2(): void;
+////    m3(): void;
+////}
+////
+////type T1 = I;
+////export interface A1 extends T1 {
+////    m1(): void;
+////}
+////export class A1 {}
+////
+////type T2 = Partial<I>
+////export interface A2 extends T2 {
+////    m1(): void;
+////}
+////export class A2 {}
+////
+////type T3 = Pick<I, "m3">
+////export interface A3 extends T3 {
+////    m1(): void;
+////}
+////export class A3 {}
+
+// @filename: b.ts
+////import { A1, A2, A3 } from './a';
+////class B1 extends A1 {
+////    /*1*/
+////}
+////class B2 extends A2 {
+////    /*2*/
+////}
+////class B3 extends A3 {
+////    /*3*/
+////}
+
+verify.completions(
+    { marker: "1", exact: ["m1", "m2", "m3", ...completion.classElementKeywords], isNewIdentifierLocation: true },
+    { marker: "2", exact: ["m1", "m2", "m3", ...completion.classElementKeywords], isNewIdentifierLocation: true },
+    { marker: "3", exact: ["m1", "m3", ...completion.classElementKeywords], isNewIdentifierLocation: true }
+);