From fd1c46ca9e29c3a3528c00ef7669a939ca1dec44 Mon Sep 17 00:00:00 2001
From: Dunqing <29533304+Dunqing@users.noreply.github.com>
Date: Sun, 22 Sep 2024 13:41:47 +0000
Subject: [PATCH] fix(isolated-declarations): infer failed if there are two
 setter/getter methods that need to be inferred (#5967)

---
 .../oxc_isolated_declarations/src/signatures.rs | 17 ++++++++---------
 .../tests/fixtures/signatures.ts                |  7 +++++++
 .../tests/snapshots/signatures.snap             |  6 ++++++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/crates/oxc_isolated_declarations/src/signatures.rs b/crates/oxc_isolated_declarations/src/signatures.rs
index 54af9ea94..35ffd361b 100644
--- a/crates/oxc_isolated_declarations/src/signatures.rs
+++ b/crates/oxc_isolated_declarations/src/signatures.rs
@@ -29,12 +29,12 @@ impl<'a> IsolatedDeclarations<'a> {
                             return;
                         };
 
-                        let entry = method_annotations.entry(name).or_default();
+                        let entry = method_annotations.entry(name.clone()).or_default();
                         entry.0 |= first_param.pattern.type_annotation.is_none();
                         entry.1 = Some(&mut first_param.pattern.type_annotation);
                     }
                     TSMethodSignatureKind::Get => {
-                        let entry = method_annotations.entry(name).or_default();
+                        let entry = method_annotations.entry(name.clone()).or_default();
                         entry.0 |= method.return_type.is_none();
                         entry.2 = Some(&mut method.return_type);
                     }
@@ -43,13 +43,12 @@ impl<'a> IsolatedDeclarations<'a> {
         });
 
         for (requires_inference, param, return_type) in method_annotations.into_values() {
-            if !requires_inference {
-                return;
-            }
-            if let (Some(Some(annotation)), Some(option)) | (Some(option), Some(Some(annotation))) =
-                (param, return_type)
-            {
-                option.replace(annotation.clone_in(self.ast.allocator));
+            if requires_inference {
+                if let (Some(Some(annotation)), Some(option))
+                | (Some(option), Some(Some(annotation))) = (param, return_type)
+                {
+                    option.replace(annotation.clone_in(self.ast.allocator));
+                }
             }
         }
     }
diff --git a/crates/oxc_isolated_declarations/tests/fixtures/signatures.ts b/crates/oxc_isolated_declarations/tests/fixtures/signatures.ts
index aa7c76012..0b9a1bc6d 100644
--- a/crates/oxc_isolated_declarations/tests/fixtures/signatures.ts
+++ b/crates/oxc_isolated_declarations/tests/fixtures/signatures.ts
@@ -17,4 +17,11 @@ export interface I {
 export interface Ref<T = any, S = T> {
   get value(): T
   set value(_: S)
+}
+
+export interface MultipleSetterAndGetter {
+  get ok(): string
+  set ok(_: string)
+  get bad() // infer return type
+  set bad(_: string)
 }
\ No newline at end of file
diff --git a/crates/oxc_isolated_declarations/tests/snapshots/signatures.snap b/crates/oxc_isolated_declarations/tests/snapshots/signatures.snap
index 8a3e70ee9..985606a9b 100644
--- a/crates/oxc_isolated_declarations/tests/snapshots/signatures.snap
+++ b/crates/oxc_isolated_declarations/tests/snapshots/signatures.snap
@@ -31,3 +31,9 @@ export interface Ref<
 	get value(): T;
 	set value(_: S);
 }
+export interface MultipleSetterAndGetter {
+	get ok(): string;
+	set ok(_: string);
+	get bad(): string;
+	set bad(_: string);
+}