[astgen] Fix the locations of a few visitors.

Author: zoecarver

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -116,7 +116,12 @@ extension ASTGenVisitor {
   }
 
   public func visit(_ node: FunctionDeclSyntax) -> ASTNode {
-    let loc = self.base.advanced(by: node.position.utf8Offset).raw
+    let staticLoc = self.base.advanced(by: node.position.utf8Offset).raw
+    let funcLoc = self.base.advanced(by: node.funcKeyword.position.utf8Offset).raw
+    let nameLoc = self.base.advanced(by: node.identifier.position.utf8Offset).raw
+    let rParamLoc = self.base.advanced(by: node.signature.input.leftParen.position.utf8Offset).raw
+    let lParamLoc = self.base.advanced(by: node.signature.input.rightParen.position.utf8Offset).raw
+    
 
     var nameText = node.identifier.text
     let name = nameText.withUTF8 { buf in
@@ -141,7 +146,7 @@ extension ASTGenVisitor {
     return .decl(
       params.withBridgedArrayRef { ref in
         FuncDecl_create(
-          ctx, loc, false, loc, name, loc, false, nil, false, nil, loc, ref, loc, body?.rawValue,
+          ctx, staticLoc, false, funcLoc, name, nameLoc, false, nil, false, nil, rParamLoc, ref, lParamLoc, body?.rawValue,
           returnType?.rawValue, declContext)
       })
   }

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -5,10 +5,11 @@ import SwiftSyntax
 extension ASTGenVisitor {
   public func visit(_ node: ClosureExprSyntax) -> ASTNode {
     let statements = node.statements.map(self.visit).map { $0.bridged() }
-    let loc = self.base.advanced(by: node.position.utf8Offset).raw
 
     let body = statements.withBridgedArrayRef { ref in
-      BraceStmt_create(ctx, loc, ref, loc)
+      let startLoc = self.base.advanced(by: node.leftBrace.position.utf8Offset).raw
+      let endLoc = self.base.advanced(by: node.rightBrace.position.utf8Offset).raw
+      return BraceStmt_create(ctx, startLoc, ref, endLoc)
     }
 
     return .expr(ClosureExpr_create(ctx, body, declContext))

lib/ASTGen/Sources/ASTGen/Stmts.swift

@@ -5,8 +5,8 @@ import SwiftSyntax
 extension ASTGenVisitor {
   public func visit(_ node: CodeBlockSyntax) -> ASTNode {
     let statements = node.statements.map(self.visit).map { $0.bridged() }
-    let startLoc = self.base.advanced(by: node.position.utf8Offset).raw
-    let endLoc = self.base.advanced(by: node.endPosition.utf8Offset).raw
+    let startLoc = self.base.advanced(by: node.leftBrace.position.utf8Offset).raw
+    let endLoc = self.base.advanced(by: node.rightBrace.position.utf8Offset).raw
 
     return .stmt(
       statements.withBridgedArrayRef { ref in