Merge branch 'main' into improveIntersectionReduction

ahejlsberg · ahejlsberg · commit a25388d6c62f · 2022-05-15T15:42:27.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -35407,6 +35407,10 @@ namespace ts {
             // Grammar checking
             if (!checkGrammarMethod(node)) checkGrammarComputedPropertyName(node.name);
 
+            if (isMethodDeclaration(node) && node.asteriskToken && isIdentifier(node.name) && idText(node.name) === "constructor") {
+                error(node.name, Diagnostics.Class_constructor_may_not_be_a_generator);
+            }
+
             // Grammar checking for modifiers is done inside the function checkGrammarFunctionLikeDeclaration
             checkFunctionOrMethodDeclaration(node);
 
@@ -35559,6 +35563,9 @@ namespace ts {
         }
 
         function checkAccessorDeclaration(node: AccessorDeclaration) {
+            if (isIdentifier(node.name) && idText(node.name) === "constructor") {
+                error(node.name, Diagnostics.Class_constructor_may_not_be_an_accessor);
+            }
             addLazyDiagnostic(checkAccessorDeclarationDiagnostics);
             checkSourceElement(node.body);
             setNodeLinksForPrivateIdentifierScope(node);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -1020,6 +1020,10 @@
         "category": "Error",
         "code": 1340
     },
+    "Class constructor may not be an accessor.": {
+        "category": "Error",
+        "code": 1341
+    },
     "Type arguments cannot be used here.": {
         "category": "Error",
         "code": 1342
@@ -1092,6 +1096,10 @@
         "category": "Error",
         "code": 1359
     },
+    "Class constructor may not be a generator.": {
+        "category": "Error",
+        "code": 1360
+    },
     "'{0}' cannot be used as a value because it was imported using 'import type'.": {
         "category": "Error",
         "code": 1361
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -966,6 +966,8 @@ namespace ts {
         Diagnostics.extends_clause_already_seen.code,
         Diagnostics.let_declarations_can_only_be_declared_inside_a_block.code,
         Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations.code,
+        Diagnostics.Class_constructor_may_not_be_a_generator.code,
+        Diagnostics.Class_constructor_may_not_be_an_accessor.code,
     ]);
 
     /**
diff --git a/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/deu/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -16416,6 +16416,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";or_JSX_element_expected_1145" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA['{' or JSX element expected.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['{' oder JSX-Element erwartet.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";or_expected_1144" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{' or ';' expected.]]></Val>
diff --git a/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -16434,6 +16434,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";or_JSX_element_expected_1145" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA['{' or JSX element expected.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['{' ou élément JSX attendu.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";or_expected_1144" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{' or ';' expected.]]></Val>
diff --git a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -16422,6 +16422,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";or_JSX_element_expected_1145" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA['{' or JSX element expected.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Previsto elemento '{' o JSX.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";or_expected_1144" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{' or ';' expected.]]></Val>
diff --git a/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/trk/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -16415,6 +16415,15 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";or_JSX_element_expected_1145" ItemType="0" PsrId="306" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA['{' or JSX element expected.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA['{' veya JSX öğesi bekleniyor.]]></Val>
+          </Tgt>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";or_expected_1144" ItemType="0" PsrId="306" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA['{' or ';' expected.]]></Val>
diff --git a/tests/baselines/reference/constructorNameInAccessor.errors.txt b/tests/baselines/reference/constructorNameInAccessor.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/conformance/salsa/constructorNameInAccessor.ts(2,9): error TS1341: Class constructor may not be an accessor.
+tests/cases/conformance/salsa/constructorNameInAccessor.ts(3,9): error TS1341: Class constructor may not be an accessor.
+
+
+==== tests/cases/conformance/salsa/constructorNameInAccessor.ts (2 errors) ====
+    class C1 {
+        get constructor() { return }
+            ~~~~~~~~~~~
+!!! error TS1341: Class constructor may not be an accessor.
+        set constructor(value) {}
+            ~~~~~~~~~~~
+!!! error TS1341: Class constructor may not be an accessor.
+    }
+    
diff --git a/tests/baselines/reference/constructorNameInAccessor.js b/tests/baselines/reference/constructorNameInAccessor.js
@@ -0,0 +1,12 @@
+//// [constructorNameInAccessor.ts]
+class C1 {
+    get constructor() { return }
+    set constructor(value) {}
+}
+
+
+//// [constructorNameInAccessor.js]
+class C1 {
+    get constructor() { return; }
+    set constructor(value) { }
+}
diff --git a/tests/baselines/reference/constructorNameInAccessor.symbols b/tests/baselines/reference/constructorNameInAccessor.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/salsa/constructorNameInAccessor.ts ===
+class C1 {
+>C1 : Symbol(C1, Decl(constructorNameInAccessor.ts, 0, 0))
+
+    get constructor() { return }
+>constructor : Symbol(C1.constructor, Decl(constructorNameInAccessor.ts, 0, 10), Decl(constructorNameInAccessor.ts, 1, 32))
+
+    set constructor(value) {}
+>constructor : Symbol(C1.constructor, Decl(constructorNameInAccessor.ts, 0, 10), Decl(constructorNameInAccessor.ts, 1, 32))
+>value : Symbol(value, Decl(constructorNameInAccessor.ts, 2, 20))
+}
+
diff --git a/tests/baselines/reference/constructorNameInAccessor.types b/tests/baselines/reference/constructorNameInAccessor.types
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/salsa/constructorNameInAccessor.ts ===
+class C1 {
+>C1 : C1
+
+    get constructor() { return }
+>constructor : void
+
+    set constructor(value) {}
+>constructor : void
+>value : void
+}
+
diff --git a/tests/baselines/reference/constructorNameInGenerator.errors.txt b/tests/baselines/reference/constructorNameInGenerator.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/salsa/constructorNameInGenerator.ts(2,6): error TS1360: Class constructor may not be a generator.
+
+
+==== tests/cases/conformance/salsa/constructorNameInGenerator.ts (1 errors) ====
+    class C2 {
+        *constructor() {}
+         ~~~~~~~~~~~
+!!! error TS1360: Class constructor may not be a generator.
+    }
+    
diff --git a/tests/baselines/reference/constructorNameInGenerator.js b/tests/baselines/reference/constructorNameInGenerator.js
@@ -0,0 +1,10 @@
+//// [constructorNameInGenerator.ts]
+class C2 {
+    *constructor() {}
+}
+
+
+//// [constructorNameInGenerator.js]
+class C2 {
+    *constructor() { }
+}
diff --git a/tests/baselines/reference/constructorNameInGenerator.symbols b/tests/baselines/reference/constructorNameInGenerator.symbols
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/salsa/constructorNameInGenerator.ts ===
+class C2 {
+>C2 : Symbol(C2, Decl(constructorNameInGenerator.ts, 0, 0))
+
+    *constructor() {}
+>constructor : Symbol(C2.constructor, Decl(constructorNameInGenerator.ts, 0, 10))
+}
+
diff --git a/tests/baselines/reference/constructorNameInGenerator.types b/tests/baselines/reference/constructorNameInGenerator.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/salsa/constructorNameInGenerator.ts ===
+class C2 {
+>C2 : C2
+
+    *constructor() {}
+>constructor : () => Generator<never, void, unknown>
+}
+
diff --git a/tests/cases/conformance/salsa/constructorNameInAccessor.ts b/tests/cases/conformance/salsa/constructorNameInAccessor.ts
@@ -0,0 +1,5 @@
+// @target: esnext
+class C1 {
+    get constructor() { return }
+    set constructor(value) {}
+}
diff --git a/tests/cases/conformance/salsa/constructorNameInGenerator.ts b/tests/cases/conformance/salsa/constructorNameInGenerator.ts
@@ -0,0 +1,4 @@
+// @target: esnext
+class C2 {
+    *constructor() {}
+}
