Allow functions and ambient classes to merge (microsoft#32584)

Author: weswigham

src/compiler/checker.ts

@@ -26276,8 +26276,9 @@ namespace ts {
 
             let duplicateFunctionDeclaration = false;
             let multipleConstructorImplementation = false;
+            let hasNonAmbientClass = false;
             for (const current of declarations) {
-                const node = <SignatureDeclaration>current;
+                const node = <SignatureDeclaration | ClassDeclaration | ClassExpression>current;
                 const inAmbientContext = node.flags & NodeFlags.Ambient;
                 const inAmbientContextOrInterface = node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral || inAmbientContext;
                 if (inAmbientContextOrInterface) {
@@ -26291,6 +26292,10 @@ namespace ts {
                     previousDeclaration = undefined;
                 }
 
+                if ((node.kind === SyntaxKind.ClassDeclaration || node.kind === SyntaxKind.ClassExpression) && !inAmbientContext) {
+                    hasNonAmbientClass = true;
+                }
+
                 if (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || node.kind === SyntaxKind.Constructor) {
                     const currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
@@ -26339,6 +26344,16 @@ namespace ts {
                 });
             }
 
+            if (hasNonAmbientClass && !isConstructor && symbol.flags & SymbolFlags.Function) {
+                // A non-ambient class cannot be an implementation for a non-constructor function/class merge
+                // TODO: The below just replicates our older error from when classes and functions were
+                // entirely unable to merge - a more helpful message like "Class declaration cannot implement overload list"
+                // might be warranted. :shrug:
+                forEach(declarations, declaration => {
+                    addDuplicateDeclarationError(getNameOfDeclaration(declaration) || declaration, Diagnostics.Duplicate_identifier_0, symbolName(symbol), filter(declarations, d => d !== declaration));
+                });
+            }
+
             // Abstract methods can't have an implementation -- in particular, they don't need one.
             if (lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
                 !hasModifier(lastSeenNonAmbientDeclaration, ModifierFlags.Abstract) && !lastSeenNonAmbientDeclaration.questionToken) {
@@ -31650,7 +31665,7 @@ namespace ts {
             if (!symbol || !(symbol.flags & SymbolFlags.Function)) {
                 return false;
             }
-            return !!forEachEntry(getExportsOfSymbol(symbol), p => p.flags & SymbolFlags.Value && isPropertyAccessExpression(p.valueDeclaration));
+            return !!forEachEntry(getExportsOfSymbol(symbol), p => p.flags & SymbolFlags.Value && p.valueDeclaration && isPropertyAccessExpression(p.valueDeclaration));
         }
 
         function getPropertiesOfContainerFunction(node: Declaration): Symbol[] {

src/compiler/types.ts

@@ -3678,8 +3678,8 @@ namespace ts {
         ParameterExcludes = Value,
         PropertyExcludes = None,
         EnumMemberExcludes = Value | Type,
-        FunctionExcludes = Value & ~(Function | ValueModule),
-        ClassExcludes = (Value | Type) & ~(ValueModule | Interface), // class-interface mergability done in checker.ts
+        FunctionExcludes = Value & ~(Function | ValueModule | Class),
+        ClassExcludes = (Value | Type) & ~(ValueModule | Interface | Function), // class-interface mergability done in checker.ts
         InterfaceExcludes = Type & ~(Interface | Class),
         RegularEnumExcludes = (Value | Type) & ~(RegularEnum | ValueModule), // regular enums merge only with regular enums and modules
         ConstEnumExcludes = (Value | Type) & ~ConstEnum, // const enums merge only with const enums

tests/baselines/reference/ambientClassOverloadForFunction.errors.txt

@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientClassOverloadForFunction.ts ===
 declare class foo{};
->foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 0))
+>foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 20), Decl(ambientClassOverloadForFunction.ts, 0, 0))
 
 function foo() { return null; }
->foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 20))
+>foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 20), Decl(ambientClassOverloadForFunction.ts, 0, 0))
 

tests/baselines/reference/ambientClassOverloadForFunction.symbols

@@ -3,6 +3,6 @@ declare class foo{};
 >foo : foo
 
 function foo() { return null; }
->foo : () => any
+>foo : typeof foo
 >null : null
 

tests/baselines/reference/ambientClassOverloadForFunction.types

@@ -2137,8 +2137,8 @@ declare namespace ts {
         ParameterExcludes = 111551,
         PropertyExcludes = 0,
         EnumMemberExcludes = 900095,
-        FunctionExcludes = 111023,
-        ClassExcludes = 899519,
+        FunctionExcludes = 110991,
+        ClassExcludes = 899503,
         InterfaceExcludes = 788872,
         RegularEnumExcludes = 899327,
         ConstEnumExcludes = 899967,

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -2137,8 +2137,8 @@ declare namespace ts {
         ParameterExcludes = 111551,
         PropertyExcludes = 0,
         EnumMemberExcludes = 900095,
-        FunctionExcludes = 111023,
-        ClassExcludes = 899519,
+        FunctionExcludes = 110991,
+        ClassExcludes = 899503,
         InterfaceExcludes = 788872,
         RegularEnumExcludes = 899327,
         ConstEnumExcludes = 899967,

tests/baselines/reference/api/typescript.d.ts

@@ -1,15 +1,23 @@
 tests/cases/compiler/augmentedTypesClass2a.ts(2,7): error TS2300: Duplicate identifier 'c2'.
+tests/cases/compiler/augmentedTypesClass2a.ts(2,7): error TS2300: Duplicate identifier 'c2'.
+tests/cases/compiler/augmentedTypesClass2a.ts(3,10): error TS2300: Duplicate identifier 'c2'.
 tests/cases/compiler/augmentedTypesClass2a.ts(3,10): error TS2300: Duplicate identifier 'c2'.
 tests/cases/compiler/augmentedTypesClass2a.ts(4,5): error TS2300: Duplicate identifier 'c2'.
 
 
-==== tests/cases/compiler/augmentedTypesClass2a.ts (3 errors) ====
+==== tests/cases/compiler/augmentedTypesClass2a.ts (5 errors) ====
     //// class then function
     class c2 { public foo() { } } // error
           ~~
+!!! error TS2300: Duplicate identifier 'c2'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesClass2a.ts:3:10: 'c2' was also declared here.
+          ~~
 !!! error TS2300: Duplicate identifier 'c2'.
     function c2() { } // error
              ~~
+!!! error TS2300: Duplicate identifier 'c2'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesClass2a.ts:2:7: 'c2' was also declared here.
+             ~~
 !!! error TS2300: Duplicate identifier 'c2'.
     var c2 = () => { }
         ~~

tests/baselines/reference/augmentedTypesClass2a.errors.txt

@@ -1,11 +1,11 @@
 === tests/cases/compiler/augmentedTypesClass2a.ts ===
 //// class then function
 class c2 { public foo() { } } // error
->c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 0, 0))
+>c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 1, 29), Decl(augmentedTypesClass2a.ts, 0, 0))
 >foo : Symbol(c2.foo, Decl(augmentedTypesClass2a.ts, 1, 10))
 
 function c2() { } // error
->c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 1, 29))
+>c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 1, 29), Decl(augmentedTypesClass2a.ts, 0, 0))
 
 var c2 = () => { }
 >c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 3, 3))

tests/baselines/reference/augmentedTypesClass2a.symbols

@@ -5,7 +5,7 @@ class c2 { public foo() { } } // error
 >foo : () => void
 
 function c2() { } // error
->c2 : () => void
+>c2 : typeof c2
 
 var c2 = () => { }
 >c2 : () => void