Skip to content

Commit deed5e4

Browse files
committed
Remove a couple underscored properties/methods
1 parent b104d54 commit deed5e4

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

Sources/SKCore/BuildSystemManager.swift

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public actor BuildSystemManager {
4545
let fallbackBuildSystem: FallbackBuildSystem?
4646

4747
/// Provider of file to main file mappings.
48-
var _mainFilesProvider: MainFilesProvider?
48+
var mainFilesProvider: MainFilesProvider?
4949

5050
/// Build system delegate that will receive notifications about setting changes, etc.
51-
var _delegate: BuildSystemDelegate?
51+
var delegate: BuildSystemDelegate?
5252

5353
/// The root of the project that this build system manages. For example, for SwiftPM packages, this is the folder
5454
/// containing Package.swift. For compilation databases it is the root folder based on which the compilation database
@@ -71,7 +71,7 @@ public actor BuildSystemManager {
7171
precondition(!buildSystemHasDelegate)
7272
self.buildSystem = buildSystem
7373
self.fallbackBuildSystem = fallbackBuildSystem
74-
self._mainFilesProvider = mainFilesProvider
74+
self.mainFilesProvider = mainFilesProvider
7575
self.fallbackSettingsTimeout = fallbackSettingsTimeout
7676
await self.buildSystem?.setDelegate(self)
7777
}
@@ -82,21 +82,11 @@ public actor BuildSystemManager {
8282
}
8383

8484
extension BuildSystemManager {
85-
public var delegate: BuildSystemDelegate? {
86-
get { _delegate }
87-
set { _delegate = newValue }
88-
}
89-
9085
/// - Note: Needed so we can set the delegate from a different isolation context.
9186
public func setDelegate(_ delegate: BuildSystemDelegate?) {
9287
self.delegate = delegate
9388
}
9489

95-
public var mainFilesProvider: MainFilesProvider? {
96-
get { _mainFilesProvider }
97-
set { _mainFilesProvider = newValue }
98-
}
99-
10090
/// - Note: Needed so we can set the delegate from a different isolation context.
10191
public func setMainFilesProvider(_ mainFilesProvider: MainFilesProvider?) {
10292
self.mainFilesProvider = mainFilesProvider
@@ -204,15 +194,15 @@ extension BuildSystemManager: BuildSystemDelegate {
204194
public func fileBuildSettingsChanged(_ changedFiles: Set<DocumentURI>) async {
205195
let changedWatchedFiles = watchedFilesReferencing(mainFiles: changedFiles)
206196

207-
if !changedWatchedFiles.isEmpty, let delegate = self._delegate {
197+
if !changedWatchedFiles.isEmpty, let delegate = self.delegate {
208198
await delegate.fileBuildSettingsChanged(changedWatchedFiles)
209199
}
210200
}
211201

212202
public func filesDependenciesUpdated(_ changedFiles: Set<DocumentURI>) async {
213203
// Empty changes --> assume everything has changed.
214204
guard !changedFiles.isEmpty else {
215-
if let delegate = self._delegate {
205+
if let delegate = self.delegate {
216206
await delegate.filesDependenciesUpdated(changedFiles)
217207
}
218208
return
@@ -226,13 +216,13 @@ extension BuildSystemManager: BuildSystemDelegate {
226216
}
227217

228218
public func buildTargetsChanged(_ changes: [BuildTargetEvent]) async {
229-
if let delegate = self._delegate {
219+
if let delegate = self.delegate {
230220
await delegate.buildTargetsChanged(changes)
231221
}
232222
}
233223

234224
public func fileHandlingCapabilityChanged() async {
235-
if let delegate = self._delegate {
225+
if let delegate = self.delegate {
236226
await delegate.fileHandlingCapabilityChanged()
237227
}
238228
}

Sources/SourceKitLSP/SourceKitIndexDelegate.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ public actor SourceKitIndexDelegate: IndexDelegate {
5151
private func processCompleted(_ count: Int) {
5252
pendingUnitCount -= count
5353
if pendingUnitCount == 0 {
54-
_indexChanged()
54+
indexChanged()
5555
}
5656

5757
if pendingUnitCount < 0 {
5858
assertionFailure("pendingUnitCount = \(pendingUnitCount) < 0")
5959
pendingUnitCount = 0
60-
_indexChanged()
60+
indexChanged()
6161
}
6262
}
6363

64-
func _indexChanged() {
64+
private func indexChanged() {
6565
for callback in mainFilesChangedCallbacks {
6666
queue.async {
6767
await callback()

0 commit comments

Comments
 (0)