Skip to content

Commit 6ed5cbe

Browse files
minor code quality improvements
1 parent f5a57bc commit 6ed5cbe

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Sources/SourceKitLSP/Documentation/DocumentationManager.swift

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ fileprivate final class DocumentableSymbolFinder: SyntaxAnyVisitor {
188188
name: TokenSyntax,
189189
memberBlock: MemberBlockSyntax
190190
) -> SyntaxVisitorContinueKind {
191-
192191
if cursorPosition <= memberBlock.leftBrace.positionAfterSkippingLeadingTrivia {
193192
setResult(node: node, position: name.positionAfterSkippingLeadingTrivia)
194193
} else if let child = DocumentableSymbolFinder.find(
@@ -203,23 +202,23 @@ fileprivate final class DocumentableSymbolFinder: SyntaxAnyVisitor {
203202
}
204203

205204
override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind {
206-
return visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
205+
visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
207206
}
208207

209208
override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind {
210-
return visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
209+
visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
211210
}
212211

213212
override func visit(_ node: ActorDeclSyntax) -> SyntaxVisitorContinueKind {
214-
return visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
213+
visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
215214
}
216215

217216
override func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind {
218-
return visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
217+
visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
219218
}
220219

221220
override func visit(_ node: ProtocolDeclSyntax) -> SyntaxVisitorContinueKind {
222-
return visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
221+
visitNamedDeclWithMemberBlock(node: node, name: node.name, memberBlock: node.memberBlock)
223222
}
224223

225224
override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {

Sources/SourceKitLSP/SourceKitLSPServer.swift

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,13 @@ package actor SourceKitLSPServer {
9393
package let documentManager = DocumentManager()
9494

9595
#if canImport(SwiftDocC)
96-
/// The documentation manager
97-
private var documentationManager: DocumentationManager {
98-
guard let cachedDocumentationManager = cachedDocumentationManager else {
99-
let documentationManager = DocumentationManager(sourceKitLSPServer: self)
100-
cachedDocumentationManager = documentationManager
101-
return documentationManager
102-
}
103-
return cachedDocumentationManager
104-
}
105-
private var cachedDocumentationManager: DocumentationManager? = nil
96+
/// The `DocumentationManager` that handles all documentation related requests
97+
///
98+
/// Implicitly unwrapped optional so we can create an `DocumentationManager` that has a weak reference to
99+
/// `SourceKitLSPServer`.
100+
/// `nonisolated(unsafe)` because `documentationManager` will not be modified after it is assigned from the
101+
/// initializer.
102+
private(set) nonisolated(unsafe) var documentationManager: DocumentationManager!
106103
#endif
107104

108105
/// The `TaskScheduler` that schedules all background indexing tasks.
@@ -184,6 +181,10 @@ package actor SourceKitLSPServer {
184181
(TaskPriority.low, max(Int(lowPriorityCores), 1)),
185182
])
186183
self.indexProgressManager = nil
184+
#if canImport(SwiftDocC)
185+
self.documentationManager = nil
186+
self.documentationManager = DocumentationManager(sourceKitLSPServer: self)
187+
#endif
187188
self.indexProgressManager = IndexProgressManager(sourceKitLSPServer: self)
188189
self.sourcekitdCrashedWorkDoneProgress = SharedWorkDoneProgressManager(
189190
sourceKitLSPServer: self,

0 commit comments

Comments
 (0)