Fix remaining SwiftSyntax warnings

peripheryapp · Sep 26, 2023 · 45ab5a4 · 45ab5a4
1 parent ab3c28e
commit 45ab5a4
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Tests/PeripheryTests/Syntax/TypeSyntaxInspectorTest.swift b/Tests/PeripheryTests/Syntax/TypeSyntaxInspectorTest.swift
@@ -134,7 +134,7 @@ private class TypeSyntaxInspectorTestVisitor: SyntaxVisitor {
     init(file: SourceFile) throws {
         let source = try String(contentsOf: file.path.url)
         self.syntax = Parser.parse(source: source)
-        self.locationConverter = .init(file: file.path.string, tree: syntax)
+        self.locationConverter = .init(fileName: file.path.string, tree: syntax)
         self.sourceLocationBuilder = .init(file: file, locationConverter: locationConverter)
         self.typeSyntaxInspector = .init(sourceLocationBuilder: sourceLocationBuilder)
         super.init(viewMode: .sourceAccurate)
@@ -155,30 +155,30 @@ private class TypeSyntaxInspectorTestVisitor: SyntaxVisitor {
     }
 
     override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
-        if let returnTypeSyntax = node.signature.output?.returnType {
-            if let someTypeSyntax = returnTypeSyntax.as(ConstrainedSugarTypeSyntax.self) {
-                addResult(for: someTypeSyntax.baseType)
+        if let returnTypeSyntax = node.signature.returnClause?.type {
+            if let someTypeSyntax = returnTypeSyntax.as(SomeOrAnyTypeSyntax.self) {
+                addResult(for: someTypeSyntax.constraint)
             } else {
                 addResult(for: returnTypeSyntax)
             }
         }
 
-        for functionParameterSyntax in node.signature.input.parameterList {
+        for functionParameterSyntax in node.signature.parameterClause.parameters {
             addResult(for: functionParameterSyntax.type)
         }
 
-        if let genericParameterList = node.genericParameterClause?.genericParameterList {
+        if let genericParameterList = node.genericParameterClause?.parameters {
             for param in genericParameterList  {
                 if let inheritedType = param.inheritedType {
                     addResult(for: inheritedType)
                 }
             }
         }
 
-        if let requirementList = node.genericWhereClause?.requirementList {
+        if let requirementList = node.genericWhereClause?.requirements {
             for requirement in requirementList {
-                if let conformanceRequirementType = requirement.body.as(ConformanceRequirementSyntax.self) {
-                    addResult(for: conformanceRequirementType.rightTypeIdentifier)
+                if let conformanceRequirementType = requirement.requirement.as(ConformanceRequirementSyntax.self) {
+                    addResult(for: conformanceRequirementType.rightType)
                 }
             }
         }