fix(semantic): resolve function return type to function parent scope

closes #6387
oxc-project · Nov 12, 2024 · b576253 · b576253
1 parent 20fe3cd
commit b576253
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 0 deletions.
diff --git a/crates/oxc_semantic/src/builder.rs b/crates/oxc_semantic/src/builder.rs
@@ -1671,6 +1671,8 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
         self.visit_formal_parameters(&func.params);
         if let Some(return_type) = &func.return_type {
             self.visit_ts_type_annotation(return_type);
+            // Resolve identifier references in return type.
+            self.resolve_references_for_current_scope();
         }
         if let Some(body) = &func.body {
             self.visit_function_body(body);
@@ -1724,6 +1726,8 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
 
         if let Some(return_type) = &expr.return_type {
             self.visit_ts_type_annotation(return_type);
+            // Resolve identifier references in return type.
+            self.resolve_references_for_current_scope();
         }
 
         self.visit_function_body(&expr.body);

diff --git a/crates/oxc_semantic/tests/fixtures/oxc/function/arrow_return_type.snap b/crates/oxc_semantic/tests/fixtures/oxc/function/arrow_return_type.snap
@@ -0,0 +1,60 @@
+---
+source: crates/oxc_semantic/tests/main.rs
+input_file: crates/oxc_semantic/tests/fixtures/oxc/function/arrow_return_type.ts
+snapshot_kind: text
+---
+[
+  {
+    "children": [
+      {
+        "children": [],
+        "flags": "ScopeFlags(StrictMode)",
+        "id": 1,
+        "node": "TSTypeAliasDeclaration",
+        "symbols": []
+      },
+      {
+        "children": [
+          {
+            "children": [],
+            "flags": "ScopeFlags(StrictMode)",
+            "id": 3,
+            "node": "TSTypeAliasDeclaration",
+            "symbols": []
+          }
+        ],
+        "flags": "ScopeFlags(StrictMode | Function | Arrow)",
+        "id": 2,
+        "node": "ArrowFunctionExpression",
+        "symbols": [
+          {
+            "flags": "SymbolFlags(TypeAlias)",
+            "id": 1,
+            "name": "T",
+            "node": "TSTypeAliasDeclaration",
+            "references": []
+          }
+        ]
+      }
+    ],
+    "flags": "ScopeFlags(StrictMode | Top)",
+    "id": 0,
+    "node": "Program",
+    "symbols": [
+      {
+        "flags": "SymbolFlags(Export | TypeAlias)",
+        "id": 0,
+        "name": "T",
+        "node": "TSTypeAliasDeclaration",
+        "references": [
+          {
+            "flags": "ReferenceFlags(Type)",
+            "id": 0,
+            "name": "T",
+            "node_id": 13
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/crates/oxc_semantic/tests/fixtures/oxc/function/arrow_return_type.ts b/crates/oxc_semantic/tests/fixtures/oxc/function/arrow_return_type.ts
@@ -0,0 +1,5 @@
+export type T = void;
+
+((): T => { // Return type `T` resolves to top level `T`, not `T` in function body.
+  type T = string;
+});
diff --git a/crates/oxc_semantic/tests/fixtures/oxc/function/function_return_type.snap b/crates/oxc_semantic/tests/fixtures/oxc/function/function_return_type.snap
@@ -0,0 +1,60 @@
+---
+source: crates/oxc_semantic/tests/main.rs
+input_file: crates/oxc_semantic/tests/fixtures/oxc/function/function_return_type.ts
+snapshot_kind: text
+---
+[
+  {
+    "children": [
+      {
+        "children": [],
+        "flags": "ScopeFlags(StrictMode)",
+        "id": 1,
+        "node": "TSTypeAliasDeclaration",
+        "symbols": []
+      },
+      {
+        "children": [
+          {
+            "children": [],
+            "flags": "ScopeFlags(StrictMode)",
+            "id": 3,
+            "node": "TSTypeAliasDeclaration",
+            "symbols": []
+          }
+        ],
+        "flags": "ScopeFlags(StrictMode | Function)",
+        "id": 2,
+        "node": "Function(<anonymous>)",
+        "symbols": [
+          {
+            "flags": "SymbolFlags(TypeAlias)",
+            "id": 1,
+            "name": "T",
+            "node": "TSTypeAliasDeclaration",
+            "references": []
+          }
+        ]
+      }
+    ],
+    "flags": "ScopeFlags(StrictMode | Top)",
+    "id": 0,
+    "node": "Program",
+    "symbols": [
+      {
+        "flags": "SymbolFlags(Export | TypeAlias)",
+        "id": 0,
+        "name": "T",
+        "node": "TSTypeAliasDeclaration",
+        "references": [
+          {
+            "flags": "ReferenceFlags(Type)",
+            "id": 0,
+            "name": "T",
+            "node_id": 13
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/crates/oxc_semantic/tests/fixtures/oxc/function/function_return_type.ts b/crates/oxc_semantic/tests/fixtures/oxc/function/function_return_type.ts
@@ -0,0 +1,5 @@
+export type T = void;
+
+(function (): T { // Return type `T` resolves to top level `T`, not `T` in function body.
+  type T = string;
+});