diff --git a/internal/checker/checker.go b/internal/checker/checker.go index 6a2fac5cf7..e5d55a929d 100644 --- a/internal/checker/checker.go +++ b/internal/checker/checker.go @@ -15800,7 +15800,7 @@ func (c *Checker) resolveAlias(symbol *ast.Symbol) *ast.Symbol { } func (c *Checker) resolveIndirectionAlias(source *ast.Symbol, target *ast.Symbol) *ast.Symbol { - result := c.resolveAlias(target) + result := c.getMergedSymbol(c.resolveAlias(target)) if targetLinks := c.aliasSymbolLinks.Get(target); targetLinks.typeOnlyDeclaration != nil { if sourceLinks := c.aliasSymbolLinks.Get(source); sourceLinks.typeOnlyDeclaration == nil { sourceLinks.typeOnlyDeclaration = targetLinks.typeOnlyDeclaration diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types index 95571b6025..73c994f78d 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types @@ -48,7 +48,7 @@ var t = p.x; === node_modules/math2d/index.d.ts === export as namespace Math2d; ->Math2d : typeof import("node_modules/math2d/index") +>Math2d : typeof import("node_modules/math2d/index.d.ts") export = M2D; >M2D : typeof import("node_modules/math2d/index.d.ts") diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff index c2336b4c0a..e3de594a27 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.types.diff @@ -12,16 +12,7 @@ var t = p.x; >t : number -@@= skipped -12, +12 lines =@@ - - === node_modules/math2d/index.d.ts === - export as namespace Math2d; -->Math2d : typeof import("node_modules/math2d/index.d.ts") -+>Math2d : typeof import("node_modules/math2d/index") - - export = M2D; - >M2D : typeof import("node_modules/math2d/index.d.ts") -@@= skipped -53, +53 lines =@@ +@@= skipped -65, +65 lines =@@ // Add a method to the class interface Vector { reverse(): Math2d.Point; diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types index b500a26acd..c49c821777 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types @@ -46,7 +46,7 @@ var t = p.x; === node_modules/math2d/index.d.ts === export as namespace Math2d; ->Math2d : typeof import("node_modules/math2d/index") +>Math2d : typeof import("node_modules/math2d/index.d.ts") export = M2D; >M2D : typeof import("node_modules/math2d/index.d.ts") diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff index 7d963e8c01..ee8caf02b3 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-4.types.diff @@ -1,15 +1,6 @@ --- old.umd-augmentation-4.types +++ new.umd-augmentation-4.types -@@= skipped -45, +45 lines =@@ - - === node_modules/math2d/index.d.ts === - export as namespace Math2d; -->Math2d : typeof import("node_modules/math2d/index.d.ts") -+>Math2d : typeof import("node_modules/math2d/index") - - export = M2D; - >M2D : typeof import("node_modules/math2d/index.d.ts") -@@= skipped -53, +53 lines =@@ +@@= skipped -98, +98 lines =@@ // Add a method to the class interface Vector { reverse(): Math2d.Point;