Fix typos

Author: ahoppen

Contributor Documentation/BSP Extensions.md

@@ -90,7 +90,7 @@ export interface SourceKitSourceItemData {
   isHeader?: bool;
 
   /**
-   * The output paths that are used during indexing for this file, ie. the `-index-unit-output-path`, if it is specified
+   * The output path that are is during indexing for this file, ie. the `-index-unit-output-path`, if it is specified
    * in the compiler arguments or the file that is passed as `-o`, if `-index-unit-output-path` is not specified.
    *
    * This allows SourceKit-LSP to remove index entries for source files that are removed from a target but remain

Sources/BuildServerProtocol/Messages/BuildTargetSourcesRequest.swift

@@ -134,7 +134,7 @@ public struct SourceKitSourceItemData: LSPAnyCodable, Codable {
   /// semantic functionality for header files if they haven't been included by any main file.
   public var isHeader: Bool?
 
-  /// The output paths that are used during indexing for this file, ie. the `-index-unit-output-path`, if it is specified
+  /// The output path that is used during indexing for this file, ie. the `-index-unit-output-path`, if it is specified
   /// in the compiler arguments or the file that is passed as `-o`, if `-index-unit-output-path` is not specified.
   ///
   /// This allows SourceKit-LSP to remove index entries for source files that are removed from a target but remain

Sources/BuildSystemIntegration/BuildSystemManager.swift

@@ -56,10 +56,10 @@ package struct SourceFileInfo: Sendable {
   ///  - `.path` if the build server supports output paths and produced a result
   ///  - `.notSupported` if the build server does not support output paths.
   ///  - `nil` if the build server supports output paths but did not return an output path for this file in this target.
-  package var targetsToOutputPaths: [BuildTargetIdentifier: OutputPath?]
+  package var targetsToOutputPath: [BuildTargetIdentifier: OutputPath?]
 
   /// The targets that this source file is a member of
-  package var targets: some Collection<BuildTargetIdentifier> & Sendable { targetsToOutputPaths.keys }
+  package var targets: some Collection<BuildTargetIdentifier> & Sendable { targetsToOutputPath.keys }
 
   /// `true` if this file belongs to the root project that the user is working on. It is false, if the file belongs
   /// to a dependency of the project.
@@ -79,8 +79,8 @@ package struct SourceFileInfo: Sendable {
     guard let other else {
       return self
     }
-    let mergedTargetsToOutputPaths = targetsToOutputPaths.merging(
-      other.targetsToOutputPaths,
+    let mergedTargetsToOutputPaths = targetsToOutputPath.merging(
+      other.targetsToOutputPath,
       uniquingKeysWith: { lhs, rhs in
         if lhs == rhs {
           return lhs
@@ -96,7 +96,7 @@ package struct SourceFileInfo: Sendable {
       }
     )
     return SourceFileInfo(
-      targetsToOutputPaths: mergedTargetsToOutputPaths,
+      targetsToOutputPath: mergedTargetsToOutputPaths,
       isPartOfRootProject: other.isPartOfRootProject || isPartOfRootProject,
       mayContainTests: other.mayContainTests || mayContainTests,
       isBuildable: other.isBuildable || isBuildable
@@ -1252,7 +1252,7 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
               nil
             }
           let info = SourceFileInfo(
-            targetsToOutputPaths: [sourcesItem.target: outputPath],
+            targetsToOutputPath: [sourcesItem.target: outputPath],
             isPartOfRootProject: isPartOfRootProject,
             mayContainTests: mayContainTests,
             isBuildable: !(target?.tags.contains(.notBuildable) ?? false)

Sources/SemanticIndex/SemanticIndexManager.swift

@@ -471,7 +471,7 @@ package final actor SemanticIndexManager {
     var filesToReIndex: [(FileIndexInfo, Date?)] = []
     for uri in files {
       var didFindTargetToIndex = false
-      for (target, outputPath) in await buildSystemManager.sourceFileInfo(for: uri)?.targetsToOutputPaths ?? [:] {
+      for (target, outputPath) in await buildSystemManager.sourceFileInfo(for: uri)?.targetsToOutputPath ?? [:] {
         // First, check if we know that the file is up-to-date, in which case we don't need to hit the index or file
         // system at all
         if !indexFilesWithUpToDateUnits, await indexStoreUpToDateTracker.isUpToDate(uri, target) {
@@ -510,7 +510,7 @@ package final actor SemanticIndexManager {
         logger.info("Not indexing \(uri.forLogging) because its main file could not be inferred")
         continue
       }
-      let targetAndOutputPath = (await buildSystemManager.sourceFileInfo(for: mainFile)?.targetsToOutputPaths ?? [:])
+      let targetAndOutputPath = (await buildSystemManager.sourceFileInfo(for: mainFile)?.targetsToOutputPath ?? [:])
         .sorted(by: { $0.key.uri.stringValue < $1.key.uri.stringValue }).first
       guard let targetAndOutputPath else {
         logger.info(