Merge pull request #1274 from ahoppen/indexing-review-comments

Author: ahoppen

Sources/SemanticIndex/SemanticIndexManager.swift

@@ -97,16 +97,10 @@ public final actor SemanticIndexManager {
     logger.info(
       "Waiting for up-to-date index for \(uris.map { $0.fileURL?.lastPathComponent ?? $0.stringValue }.joined(separator: ", "))"
     )
-    let filesWithOutOfDateIndex = uris.filter { uri in
-      switch indexStatus[uri] {
-      case .inProgress, nil: return true
-      case .upToDate: return false
-      }
-    }
     // Create a new index task for the files that aren't up-to-date. The newly scheduled index tasks will
     // - Wait for the existing index operations to finish if they have the same number of files.
     // - Reschedule the background index task in favor of an index task with fewer source files.
-    await self.index(files: filesWithOutOfDateIndex, priority: nil).value
+    await self.index(files: uris, priority: nil).value
     index.pollForUnitChangesAndWait()
     logger.debug("Done waiting for up-to-date index")
   }

Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift

@@ -176,18 +176,18 @@ public struct UpdateIndexStoreTaskDescription: TaskDescriptionProtocol {
     buildSettings: FileBuildSettings,
     toolchain: Toolchain
   ) async throws {
-    let indexingArguments = adjustSwiftCompilerArgumentsForIndexStoreUpdate(
-      buildSettings.compilerArguments,
-      fileToIndex: uri
-    )
-
     guard let swiftc = toolchain.swiftc else {
       logger.error(
         "Not updating index store for \(uri.forLogging) because toolchain \(toolchain.identifier) does not contain a Swift compiler"
       )
       return
     }
 
+    let indexingArguments = adjustSwiftCompilerArgumentsForIndexStoreUpdate(
+      buildSettings.compilerArguments,
+      fileToIndex: uri
+    )
+
     let process = try Process.launch(
       arguments: [swiftc.pathString] + indexingArguments,
       workingDirectory: buildSettings.workingDirectory.map(AbsolutePath.init(validating:))
@@ -289,7 +289,6 @@ private func adjustSwiftCompilerArgumentsForIndexStoreUpdate(
         result += [argument, nextArgument]
         continue
       }
-      result.append(argument)
     }
     result.append(argument)
   }
@@ -299,7 +298,7 @@ private func adjustSwiftCompilerArgumentsForIndexStoreUpdate(
     // batch mode is not compatible with -index-file
     "-disable-batch-mode",
     // Fake an output path so that we get a different unit file for every Swift file we background index
-    "-o", fileToIndex.pseudoPath + ".o",
+    "-index-unit-output-path", fileToIndex.pseudoPath + ".o",
   ]
   return result
 }