Asyncify MainFilesDelegate

Author: ahoppen

Sources/SKCore/BuildSystemManager.swift

@@ -295,15 +295,8 @@ extension BuildSystemManager: BuildSystemDelegate {
 }
 
 extension BuildSystemManager: MainFilesDelegate {
-  // FIXME: (async) Make this method isolated once `MainFilesDelegate` has ben asyncified
-  public nonisolated func mainFilesChanged() {
-    Task {
-      await mainFilesChangedImpl()
-    }
-  }
-
   // FIXME: Consider debouncing/limiting this, seems to trigger often during a build.
-  public func mainFilesChangedImpl() async {
+  public func mainFilesChanged() async {
     let origWatched = self.watchedFiles
     self.watchedFiles = [:]
     var buildSettingsChanges = Set<DocumentURI>()

Sources/SKCore/MainFilesProvider.swift

@@ -30,5 +30,5 @@ public protocol MainFilesProvider: AnyObject {
 public protocol MainFilesDelegate: AnyObject {
 
   /// The mapping from files to main files (may have) changed.
-  func mainFilesChanged()
+  func mainFilesChanged() async
 }

Sources/SourceKitLSP/SourceKitIndexDelegate.swift

@@ -56,7 +56,9 @@ public final class SourceKitIndexDelegate: IndexDelegate {
   /// *Must be called on queue*.
   func _indexChanged() {
     for delegate in mainFilesDelegates {
-      delegate.mainFilesChanged()
+      Task {
+        await delegate.mainFilesChanged()
+      }
     }
   }
 

Tests/SKCoreTests/BuildSystemManagerTests.swift

@@ -66,7 +66,7 @@ final class BuildSystemManagerTests: XCTestCase {
     await assertEqual(bsm._cachedMainFile(for: c), c)
     await assertEqual(bsm._cachedMainFile(for: d), d)
 
-    await bsm.mainFilesChangedImpl()
+    await bsm.mainFilesChanged()
 
     await assertEqual(bsm._cachedMainFile(for: a), a)
     await assertEqual(bsm._cachedMainFile(for: b), bMain) // never changes to a
@@ -80,7 +80,7 @@ final class BuildSystemManagerTests: XCTestCase {
     await assertEqual(bsm._cachedMainFile(for: d), d)
 
     await bsm.unregisterForChangeNotifications(for: b)
-    await bsm.mainFilesChangedImpl()
+    await bsm.mainFilesChanged()
     await bsm.unregisterForChangeNotifications(for: c)
     await bsm.unregisterForChangeNotifications(for: d)
     await assertEqual(bsm._cachedMainFile(for: a), nil)
@@ -261,28 +261,28 @@ final class BuildSystemManagerTests: XCTestCase {
 
     let changed = expectation(description: "changed settings to cpp2")
     await del.setExpected([(h, .c, bs.map[cpp2]!, changed, #file, #line)])
-    await bsm.mainFilesChangedImpl()
+    await bsm.mainFilesChanged()
     try await fulfillmentOfOrThrow([changed])
 
     let changed2 = expectation(description: "still cpp2, no update")
     changed2.isInverted = true
     await del.setExpected([(h, .c, nil, changed2, #file, #line)])
-    await bsm.mainFilesChangedImpl()
+    await bsm.mainFilesChanged()
     try await fulfillmentOfOrThrow([changed2], timeout: 1)
 
     mainFiles.mainFiles[h] = Set([cpp1, cpp2])
 
     let changed3 = expectation(description: "added main file, no update")
     changed3.isInverted = true
     await del.setExpected([(h, .c, nil, changed3, #file, #line)])
-    await bsm.mainFilesChangedImpl()
+    await bsm.mainFilesChanged()
     try await fulfillmentOfOrThrow([changed3], timeout: 1)
 
     mainFiles.mainFiles[h] = Set([])
 
     let changed4 = expectation(description: "changed settings to []")
     await del.setExpected([(h, .c, nil, changed4, #file, #line)])
-    await bsm.mainFilesChangedImpl()
+    await bsm.mainFilesChanged()
     try await fulfillmentOfOrThrow([changed4])
   }