fix: CatchClause body should be ScopedStatement (#24)

* feat: add numOfGoMod to count go.mod files in multi-module repositories

* fix: resolve index out of range when goModPath is empty

* fix: WhileStatement body should be ScopedStatement

* fix: CatchClause body should be ScopedStatement

---------

Co-authored-by: 王雅仪 <[email protected]>

Author: Arielwyy

parser-Python/uast/asttype.py

@@ -407,59 +407,48 @@ class DynamicType(BaseNode):
 Conditional = Union[IfStatement , SwitchStatement , ConditionalExpression]
 
 Node = Union[ArrayType
-, AssignmentExpression
-, BinaryExpression
+    , AssignmentExpression
+    , BinaryExpression
     , BreakStatement
-, CallExpression
+    , CallExpression
     , CaseClause
-    # , CastExpression
-    # , CatchClause
-    # , ChanType
-, ClassDefinition
-, CompileUnit
+    , CatchClause
+    , ClassDefinition
+    , CompileUnit
     , ConditionalExpression
     , ContinueStatement
     , DereferenceExpression
-, DynamicType
-, ExportStatement
-    # , ExpressionStatement
-, ForStatement
-    # , FuncType
-, FunctionDefinition
-, Identifier
-, IfStatement
+    , DynamicType
+    , ExportStatement
+    , ExpressionStatement
+    , ForStatement
+    , FunctionDefinition
+    , Identifier
+    , IfStatement
     , ImportExpression
-    # , LabeledStatement
-, Literal
-    # , MapType
-, MemberAccess
+    , Literal
+    , MemberAccess
     , NewExpression
-, Noop
-, ObjectExpression
-, ObjectProperty
-    # , PackageDeclaration
-    # , PointerType
-, PrimitiveType
-, RangeStatement
+    , Noop
+    , ObjectExpression
+    , ObjectProperty
+    , PrimitiveType
+    , RangeStatement
     , ReferenceExpression
     , ReturnStatement
-, ScopedStatement
-    # , ScopedType
+    , ScopedStatement
     , Sequence
     , SliceExpression
-, SpreadElement
-    # , SuperExpression
+    , SpreadElement
+    , SuperExpression
     , SwitchStatement
-    # , ThisExpression  test?: Expression | null
-    #   body: Instruction
-    # , ThrowStatement
+    , ThisExpression
+    , ThrowStatement
     , TryStatement
-, TupleExpression
-    # , TupleType
+    , TupleExpression
     , UnaryExpression
-, VariableDeclaration
-    # , VoidType
-, WhileStatement
+    , VariableDeclaration
+    , WhileStatement
     , YieldExpression
 ]
 

parser-Python/uast/visitor.py

@@ -1086,13 +1086,22 @@ def visit_UnaryOp(self, node):
                                                         self.packPos(node.operand, self.visit(node.operand))))
 
     def visit_ExceptHandler(self, node):
-        body = []
-        for stmt in node.body:
-            unode = self.packPos(stmt, self.visit(stmt))
-            if isinstance(unode, list):
-                body.extend(unode)
-            else:
-                body.append(unode)
+        bodys = []
+        if node.body:
+            col_offsets = [body.col_offset for body in node.body]
+            end_col_offsets = [body.end_col_offset for body in node.body]
+            min_col = min(col_offsets)
+            max_col = max(end_col_offsets)
+            body_loc = UNode.SourceLocation(
+                UNode.Position(node.body[0].lineno, min_col),
+                UNode.Position(node.body[-1].end_lineno, max_col),
+                self.sourcefile
+            )
+            # 处理 body
+            for body in node.body:
+                bodys.append(self.packPos(body, self.visit(body)))
+        else:
+            body_loc = UNode.SourceLocation()
         type = None
         if node.type is not None and node.name is not None:
             type = self.packPos(node.type, self.visit(node.type))
@@ -1105,7 +1114,7 @@ def visit_ExceptHandler(self, node):
                                                                            UNode.DynamicType(UNode.SourceLocation(),
                                                                                              UNode.Meta()))))
         return self.packPos(node, UNode.CatchClause(UNode.SourceLocation(), UNode.Meta(), parameter,
-                                                    body))
+                                                    UNode.ScopedStatement(body_loc, UNode.Meta(), bodys)))
 
     def visit_FormattedValue(self, node):
         return self.packPos(node.value, self.visit(node.value))