Skip to content

Commit d3ad334

Browse files
Address code-style feedback
1 parent 864af4d commit d3ad334

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

SourceKitLSPDevUtils/Sources/ConfigSchemaGen/ConfigSchemaGen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public struct ConfigSchemaGen {
6464
}
6565
let sourceText = try String(contentsOf: fileURL)
6666
let sourceFile = Parser.parse(source: sourceText)
67-
typeNameResolver.append(sourceFile)
67+
typeNameResolver.collect(from: sourceFile)
6868
}
6969
let rootTypeDecl = try typeNameResolver.lookupType(fullyQualified: ["SourceKitLSPOptions"])
7070
let context = OptionSchemaContext(typeNameResolver: typeNameResolver)

SourceKitLSPDevUtils/Sources/ConfigSchemaGen/TypeDeclResolver.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import SwiftSyntax
1616
class TypeDeclResolver {
1717
typealias TypeDecl = NamedDeclSyntax & DeclGroupSyntax & DeclSyntaxProtocol
1818
typealias QualifiedName = [String]
19-
var typeDeclByQualifiedName: [QualifiedName: TypeDecl] = [:]
19+
private var typeDeclByQualifiedName: [QualifiedName: TypeDecl] = [:]
2020

2121
enum Error: Swift.Error {
2222
case typeNotFound(QualifiedName)
2323
}
2424

25-
class TypeDeclCollector: SyntaxVisitor {
25+
private class TypeDeclCollector: SyntaxVisitor {
2626
let resolver: TypeDeclResolver
2727
var scope: [TypeDecl] = []
2828
var rootTypeDecls: [TypeDecl] = []
@@ -34,7 +34,7 @@ class TypeDeclResolver {
3434

3535
func visitNominalDecl(_ node: TypeDecl) -> SyntaxVisitorContinueKind {
3636
let name = node.name.text
37-
let qualifiedName = scope.map { $0.name.text } + [name]
37+
let qualifiedName = scope.map(\.name.text) + [name]
3838
resolver.typeDeclByQualifiedName[qualifiedName] = node
3939
scope.append(node)
4040
return .visitChildren
@@ -61,7 +61,8 @@ class TypeDeclResolver {
6161
}
6262
}
6363

64-
func append(_ schema: SourceFileSyntax) {
64+
/// Collects type declarations from a parsed Swift source file
65+
func collect(from schema: SourceFileSyntax) {
6566
let collector = TypeDeclCollector(resolver: self)
6667
collector.walk(schema)
6768
}

0 commit comments

Comments
 (0)