Merge branch 'main' into test-visit

oxc-project · Jul 19, 2024 · 8a2971b · 8a2971b
2 parents 062e3b3 + 6ffce86
commit 8a2971b
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 25 deletions.
diff --git a/crates/oxc_semantic/src/builder.rs b/crates/oxc_semantic/src/builder.rs
@@ -1671,6 +1671,10 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
         self.enter_node(kind);
         self.enter_scope(ScopeFlags::Function | ScopeFlags::Arrow, &expr.scope_id);
 
+        if let Some(parameters) = &expr.type_parameters {
+            self.visit_ts_type_parameter_declaration(parameters);
+        }
+
         self.visit_formal_parameters(&expr.params);
 
         /* cfg */
@@ -1681,6 +1685,10 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
         ));
         /* cfg */
 
+        if let Some(return_type) = &expr.return_type {
+            self.visit_ts_type_annotation(return_type);
+        }
+
         self.visit_function_body(&expr.body);
 
         /* cfg */
@@ -1692,9 +1700,6 @@ impl<'a> Visit<'a> for SemanticBuilder<'a> {
         });
         /* cfg */
 
-        if let Some(parameters) = &expr.type_parameters {
-            self.visit_ts_type_parameter_declaration(parameters);
-        }
         self.leave_node(kind);
         self.leave_scope();
     }

diff --git a/...ntic/tests/fixtures/typescript-eslint/functions/arrow/type-parameters/body-reference.snap b/...ntic/tests/fixtures/typescript-eslint/functions/arrow/type-parameters/body-reference.snap
@@ -11,26 +11,26 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
         "id": 1,
         "node": "ArrowFunctionExpression",
         "symbols": [
-          {
-            "flag": "SymbolFlags(BlockScopedVariable)",
-            "id": 1,
-            "name": "x",
-            "node": "VariableDeclarator",
-            "references": []
-          },
           {
             "flag": "SymbolFlags(TypeParameter)",
-            "id": 2,
+            "id": 1,
             "name": "T",
             "node": "TSTypeParameter",
             "references": [
               {
                 "flag": "ReferenceFlag(Type)",
                 "id": 0,
                 "name": "T",
-                "node_id": 13
+                "node_id": 16
               }
             ]
+          },
+          {
+            "flag": "SymbolFlags(BlockScopedVariable)",
+            "id": 2,
+            "name": "x",
+            "node": "VariableDeclarator",
+            "references": []
           }
         ]
       }

diff --git a/...tic/tests/fixtures/typescript-eslint/functions/arrow/type-parameters/param-reference.snap b/...tic/tests/fixtures/typescript-eslint/functions/arrow/type-parameters/param-reference.snap
@@ -12,17 +12,24 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
         "node": "ArrowFunctionExpression",
         "symbols": [
           {
-            "flag": "SymbolFlags(FunctionScopedVariable)",
+            "flag": "SymbolFlags(TypeParameter)",
             "id": 1,
-            "name": "a",
-            "node": "FormalParameter",
-            "references": []
+            "name": "T",
+            "node": "TSTypeParameter",
+            "references": [
+              {
+                "flag": "ReferenceFlag(Type)",
+                "id": 0,
+                "name": "T",
+                "node_id": 14
+              }
+            ]
           },
           {
-            "flag": "SymbolFlags(TypeParameter)",
+            "flag": "SymbolFlags(FunctionScopedVariable)",
             "id": 2,
-            "name": "T",
-            "node": "TSTypeParameter",
+            "name": "a",
+            "node": "FormalParameter",
             "references": []
           }
         ]

diff --git a/...ts/fixtures/typescript-eslint/functions/arrow/type-parameters/return-value-reference.snap b/...ts/fixtures/typescript-eslint/functions/arrow/type-parameters/return-value-reference.snap
@@ -16,7 +16,14 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
             "id": 1,
             "name": "T",
             "node": "TSTypeParameter",
-            "references": []
+            "references": [
+              {
+                "flag": "ReferenceFlag(Type)",
+                "id": 0,
+                "name": "T",
+                "node_id": 12
+              }
+            ]
           }
         ]
       }

diff --git a/...ests/fixtures/typescript-eslint/functions/arrow/type-parameters/type-param-reference.snap b/...ests/fixtures/typescript-eslint/functions/arrow/type-parameters/type-param-reference.snap
@@ -21,7 +21,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
                 "flag": "ReferenceFlag(Type)",
                 "id": 0,
                 "name": "T",
-                "node_id": 14
+                "node_id": 12
               }
             ]
           },

diff --git a/...xc_semantic/tests/fixtures/typescript-eslint/functions/arrow/type-predicate-asserts2.snap b/...xc_semantic/tests/fixtures/typescript-eslint/functions/arrow/type-predicate-asserts2.snap
@@ -37,7 +37,14 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
         "id": 0,
         "name": "T",
         "node": "TSTypeAliasDeclaration",
-        "references": []
+        "references": [
+          {
+            "flag": "ReferenceFlag(Type)",
+            "id": 0,
+            "name": "T",
+            "node_id": 18
+          }
+        ]
       },
       {
         "flag": "SymbolFlags(BlockScopedVariable | ConstVariable)",

diff --git a/crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow/type-predicate1.snap b/crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow/type-predicate1.snap
@@ -21,7 +21,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
                 "flag": "ReferenceFlag(Read)",
                 "id": 0,
                 "name": "arg",
-                "node_id": 14
+                "node_id": 18
               }
             ]
           }

diff --git a/crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow/type-predicate2.snap b/crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow/type-predicate2.snap
@@ -28,7 +28,7 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
                 "flag": "ReferenceFlag(Read)",
                 "id": 0,
                 "name": "arg",
-                "node_id": 17
+                "node_id": 23
               }
             ]
           }
@@ -44,7 +44,14 @@ input_file: crates/oxc_semantic/tests/fixtures/typescript-eslint/functions/arrow
         "id": 0,
         "name": "T",
         "node": "TSTypeAliasDeclaration",
-        "references": []
+        "references": [
+          {
+            "flag": "ReferenceFlag(Type)",
+            "id": 0,
+            "name": "T",
+            "node_id": 18
+          }
+        ]
       },
       {
         "flag": "SymbolFlags(BlockScopedVariable | ConstVariable)",