fix(61258): handle const enum references when renaming namespaces

a-tarasyuk · a-tarasyuk · commit 61711e16421a · 2025-02-24T23:28:37.000+02:00
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -449,7 +449,7 @@ export function getMeaningFromDeclaration(node: Node): SemanticMeaning {
             if (isAmbientModule(node as ModuleDeclaration)) {
                 return SemanticMeaning.Namespace | SemanticMeaning.Value;
             }
-            else if (getModuleInstanceState(node as ModuleDeclaration) === ModuleInstanceState.Instantiated) {
+            else if (getModuleInstanceState(node as ModuleDeclaration) !== ModuleInstanceState.NonInstantiated) {
                 return SemanticMeaning.Namespace | SemanticMeaning.Value;
             }
             else {
diff --git a/tests/baselines/reference/constEnumMergingWithValues1.types b/tests/baselines/reference/constEnumMergingWithValues1.types
@@ -6,6 +6,9 @@ function foo() {}
 >    : ^^^^^^^^^^
 
 module foo {
+>foo : typeof foo
+>    : ^^^^^^^^^^
+
     const enum E { X }
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/constEnumMergingWithValues2.types b/tests/baselines/reference/constEnumMergingWithValues2.types
@@ -6,6 +6,9 @@ class foo {}
 >    : ^^^
 
 module foo {
+>foo : typeof foo
+>    : ^^^^^^^^^^
+
     const enum E { X }
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/constEnumMergingWithValues3.types b/tests/baselines/reference/constEnumMergingWithValues3.types
@@ -8,6 +8,9 @@ enum foo { A }
 >  : ^^^^^
 
 module foo {
+>foo : typeof foo
+>    : ^^^^^^^^^^
+
     const enum E { X }
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/constEnumMergingWithValues4.types b/tests/baselines/reference/constEnumMergingWithValues4.types
@@ -2,6 +2,9 @@
 
 === m1.ts ===
 module foo {
+>foo : typeof foo
+>    : ^^^^^^^^^^
+
     const enum E { X }
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/constEnumMergingWithValues5.types b/tests/baselines/reference/constEnumMergingWithValues5.types
@@ -2,6 +2,9 @@
 
 === m1.ts ===
 module foo {
+>foo : typeof foo
+>    : ^^^^^^^^^^
+
     const enum E { X }
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/constEnumOnlyModuleMerging.types b/tests/baselines/reference/constEnumOnlyModuleMerging.types
@@ -13,6 +13,9 @@ module Outer {
 }
 
 module Outer {
+>Outer : typeof Outer
+>      : ^^^^^^^^^^^^
+
     export const enum A { X }
 >A : A
 >  : ^
diff --git a/tests/baselines/reference/constEnums.types b/tests/baselines/reference/constEnums.types
@@ -329,8 +329,17 @@ const enum Comments {
 }
 
 module A {
+>A : typeof A
+>  : ^^^^^^^^
+
     export module B {
+>B : typeof B
+>  : ^^^^^^^^
+
         export module C {
+>C : typeof C
+>  : ^^^^^^^^
+
             export const enum E {
 >E : E
 >  : ^
@@ -372,8 +381,17 @@ module A {
 }
 
 module A {
+>A : typeof A
+>  : ^^^^^^^^
+
     export module B {
+>B : typeof B
+>  : ^^^^^^^^
+
         export module C {
+>C : typeof C
+>  : ^^^^^^^^
+
             export const enum E {
 >E : E
 >  : ^
@@ -435,8 +453,17 @@ module A {
 }
 
 module A1 {
+>A1 : typeof A1
+>   : ^^^^^^^^^
+
     export module B {
+>B : typeof B
+>  : ^^^^^^^^
+
         export module C {
+>C : typeof C
+>  : ^^^^^^^^
+
             export const enum E {
 >E : E
 >  : ^
@@ -466,6 +493,9 @@ module A2 {
 >  : ^^^^^^^^
 
         export module C {
+>C : typeof C
+>  : ^^^^^^^^
+
             export const enum E {
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/emitClassMergedWithConstNamespaceNotElided.types b/tests/baselines/reference/emitClassMergedWithConstNamespaceNotElided.types
@@ -2,6 +2,9 @@
 
 === enum.d.ts ===
 export namespace Clone {
+>Clone : typeof Clone
+>      : ^^^^^^^^^^^^
+
     const enum LOCAL {
 >LOCAL : LOCAL
 >      : ^^^^^
diff --git a/tests/baselines/reference/enumAssignmentCompat3.types b/tests/baselines/reference/enumAssignmentCompat3.types
@@ -97,6 +97,9 @@ namespace Cd {
     }
 }
 namespace Const {
+>Const : typeof Const
+>      : ^^^^^^^^^^^^
+
     export const enum E {
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/intersectionTypeNormalization.types b/tests/baselines/reference/intersectionTypeNormalization.types
@@ -201,6 +201,9 @@ function getValueAsString(value: IntersectionFail): string {
 // Repro from #12535
 
 namespace enums {
+>enums : typeof enums
+>      : ^^^^^^^^^^^^
+
     export const enum A {
 >A : A
 >  : ^
diff --git a/tests/baselines/reference/reachabilityChecks1.types b/tests/baselines/reference/reachabilityChecks1.types
@@ -79,6 +79,9 @@ module A4 {
 >     : ^^^^
 
     module A {
+>A : typeof A
+>  : ^^^^^^^^
+
         const enum E { X }
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/reachabilityChecks2.types b/tests/baselines/reference/reachabilityChecks2.types
@@ -20,6 +20,9 @@ module A4 {
 >     : ^^^^
 
     module A {
+>A : typeof A
+>  : ^^^^^^^^
+
         const enum E { X }
 >E : E
 >  : ^
diff --git a/tests/baselines/reference/renameNamespace.baseline.jsonc b/tests/baselines/reference/renameNamespace.baseline.jsonc
@@ -0,0 +1,9 @@
+// === findRenameLocations ===
+// === /tests/cases/fourslash/renameNamespace.ts ===
+// <|namespace /*RENAME*/[|NSRENAME|] {
+//     export const enum E {
+//         A = 'a'
+//     }
+// }|>
+// 
+// const a: [|NSRENAME|].E = [|NSRENAME|].E.A;
diff --git a/tests/baselines/reference/systemModuleConstEnums.types b/tests/baselines/reference/systemModuleConstEnums.types
@@ -44,6 +44,9 @@ export function foo() {
 }
 
 module M {
+>M : typeof M
+>  : ^^^^^^^^
+
     export const enum NonTopLevelConstEnum { X }
 >NonTopLevelConstEnum : NonTopLevelConstEnum
 >                     : ^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
@@ -44,6 +44,9 @@ export function foo() {
 }
 
 module M {
+>M : typeof M
+>  : ^^^^^^^^
+
     export const enum NonTopLevelConstEnum { X }
 >NonTopLevelConstEnum : NonTopLevelConstEnum
 >                     : ^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/cases/fourslash/renameNamespace.ts b/tests/cases/fourslash/renameNamespace.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts'/>
+
+////namespace /**/NS {
+////    export const enum E {
+////        A = 'a'
+////    }
+////}
+////
+////const a: NS.E = NS.E.A;
+
+verify.baselineRename("", { });

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ export function getMeaningFromDeclaration(node: Node): SemanticMeaning {`
`449`	`449`	`if (isAmbientModule(node as ModuleDeclaration)) {`
`450`	`450`	`return SemanticMeaning.Namespace \| SemanticMeaning.Value;`
`451`	`451`	`}`
`452`		`- else if (getModuleInstanceState(node as ModuleDeclaration) === ModuleInstanceState.Instantiated) {`
	`452`	`+ else if (getModuleInstanceState(node as ModuleDeclaration) !== ModuleInstanceState.NonInstantiated) {`
`453`	`453`	`return SemanticMeaning.Namespace \| SemanticMeaning.Value;`
`454`	`454`	`}`
`455`	`455`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ module Outer {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`module Outer {`
	`16`	`+>Outer : typeof Outer`
	`17`	`+> : ^^^^^^^^^^^^`
	`18`	`+`
`16`	`19`	`export const enum A { X }`
`17`	`20`	`>A : A`
`18`	`21`	`> : ^`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,9 @@ namespace Cd {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`namespace Const {`
	`100`	`+>Const : typeof Const`
	`101`	`+> : ^^^^^^^^^^^^`
	`102`	`+`
`100`	`103`	`export const enum E {`
`101`	`104`	`>E : E`
`102`	`105`	`> : ^`