Fixed some typos (#4170)

Fixed some typos.

Author: BenedictSt

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -764,10 +764,10 @@ fileprivate struct CommandTaskTracker {
     private func progressText(of command: SPMLLBuild.Command, targetName: String?) -> String {
         // Transforms descriptions like "Linking ./.build/x86_64-apple-macosx/debug/foo" into "Linking foo".
         if let firstSpaceIndex = command.description.firstIndex(of: " "),
-           let lastDirectorySeperatorIndex = command.description.lastIndex(of: "/")
+           let lastDirectorySeparatorIndex = command.description.lastIndex(of: "/")
         {
             let action = command.description[..<firstSpaceIndex]
-            let fileNameStartIndex = command.description.index(after: lastDirectorySeperatorIndex)
+            let fileNameStartIndex = command.description.index(after: lastDirectorySeparatorIndex)
             let fileName = command.description[fileNameStartIndex...]
 
             if let targetName = targetName {

Sources/Build/BuildPlan.swift

@@ -388,7 +388,7 @@ public final class ClangTargetBuildDescription {
         }
         args += buildParameters.sanitizers.compileCFlags()
 
-        // Add agruments from declared build settings.
+        // Add arguments from declared build settings.
         args += self.buildSettingsFlags()
 
         if let resourceAccessorHeaderFile = self.resourceAccessorHeaderFile {
@@ -1855,7 +1855,7 @@ public class BuildPlan {
 
                 // Based on the debugging strategy, we either need to pass swiftmodule paths to the
                 // product or link in the wrapped module object. This is required for properly debugging
-                // Swift products. Debugging statergy is computed based on the current platform we're
+                // Swift products. Debugging strategy is computed based on the current platform we're
                 // building for and is nil for the release configuration.
                 switch buildParameters.debuggingStrategy {
                 case .swiftAST:
@@ -1908,7 +1908,7 @@ public class BuildPlan {
         let nodes: [ResolvedTarget.Dependency] = product.targets.map { .target($0, conditions: []) }
         let allTargets = try topologicalSort(nodes, successors: { dependency in
             switch dependency {
-            // Include all the depenencies of a target.
+            // Include all the dependencies of a target.
             case .target(let target, _):
                 return target.dependencies.filter { $0.satisfies(self.buildEnvironment) }
 

Sources/Build/LLBuildManifestBuilder.swift

@@ -322,7 +322,7 @@ extension LLBuildManifestBuilder {
     // Consider an example SwiftPM package with two targets: target B, and target A, where A
     // depends on B:
     // SwiftPM will process targets in a topological order and “bubble-up” each target’s
-    // inter-module dependency graph to its dependees. First, SwiftPM will process B, and be
+    // inter-module dependency graph to its dependencies. First, SwiftPM will process B, and be
     // able to plan its full build because it does not have any target dependencies. Then the
     // driver is tasked with planning a build for A. SwiftPM will pass as input to the driver
     // the module dependency graph of its target’s dependencies, in this case, just the
@@ -655,7 +655,7 @@ extension LLBuildManifestBuilder {
     }
 
     private func addModuleWrapCmd(_ target: SwiftTargetBuildDescription) throws {
-        // Add commands to perform the module wrapping Swift modules when debugging statergy is `modulewrap`.
+        // Add commands to perform the module wrapping Swift modules when debugging strategy is `modulewrap`.
         guard buildParameters.debuggingStrategy == .modulewrap else { return }
         var moduleWrapArgs = [
             target.buildParameters.toolchain.swiftCompiler.pathString,

Sources/Commands/WatchmanHelper.swift

@@ -67,7 +67,7 @@ public final class WatchmanHelper {
     }
 
     private func run(_ scriptPath: AbsolutePath) throws {
-        // Construct the arugments.
+        // Construct the arguments.
         var args = [String]()
         args += ["--settle", "2"]
         args += ["-p", "Package.swift", "Package.resolved"]

Sources/PackageCollectionsModel/PackageCollectionModel+v1.swift

@@ -383,7 +383,7 @@ extension PackageCollectionModel.V1.ProductType: Codable {
 // MARK: - Signed package collection
 
 extension PackageCollectionModel.V1 {
-    /// A  signed packge collection. The only difference between this and `Collection`
+    /// A  signed package collection. The only difference between this and `Collection`
     /// is the presence of `signature`.
     public struct SignedCollection: Equatable {
         /// The package collection

Sources/PackageCollectionsSigning/Key/ASN1/ASN1.swift

@@ -342,7 +342,7 @@ extension ArraySlice where Element == UInt8 {
             let requiredBits = UInt.bitWidth - length.leadingZeroBitCount
             switch requiredBits {
             case 0 ... 7:
-                // For 0 to 7 bits, the long form is unnacceptable and we require the short.
+                // For 0 to 7 bits, the long form is unacceptable and we require the short.
                 throw ASN1Error.unsupportedFieldLength
             case 8...:
                 // For 8 or more bits, fieldLength should be the minimum required.

Sources/PackageDescription/Version.swift

@@ -62,8 +62,8 @@ public struct Version {
     ///   - buildMetaDataIdentifiers: Build metadata that identifies a build.
     ///
     /// - Precondition: `major >= 0 && minor >= 0 && patch >= 0`.
-    /// - Precondition: `prereleaseIdentifiers` can conatin only ASCII alpha-numeric characters and "-".
-    /// - Precondition: `buildMetaDataIdentifiers` can conatin only ASCII alpha-numeric characters and "-".
+    /// - Precondition: `prereleaseIdentifiers` can contain only ASCII alpha-numeric characters and "-".
+    /// - Precondition: `buildMetaDataIdentifiers` can contain only ASCII alpha-numeric characters and "-".
     public init(
         _ major: Int,
         _ minor: Int,

Sources/PackageGraph/PackageGraph+Loading.swift

@@ -606,7 +606,7 @@ private class ResolvedBuilder<T> {
 
     /// Construct the object with the accumulated data.
     ///
-    /// Note that once the object is constucted, future calls to
+    /// Note that once the object is constructed, future calls to
     /// this method will return the same object.
     final func construct() throws -> T {
         if let constructedObject = _constructedObject {

Sources/PackageGraph/Pubgrub/PartialSolution.swift

@@ -18,7 +18,7 @@ import struct TSCUtility.Version
 public struct PartialSolution {
     var root: DependencyResolutionNode?
 
-    /// All known assigments.
+    /// All known assignments.
     public private(set) var assignments: [Assignment]
 
     /// All known decisions.
@@ -68,7 +68,7 @@ public struct PartialSolution {
         register(decision)
     }
 
-    /// Populates the _positive and _negative poperties with the assignment.
+    /// Populates the _positive and _negative properties with the assignment.
     private mutating func register(_ assignment: Assignment) {
         let term = assignment.term
         let pkg = term.node

Sources/PackageGraph/Pubgrub/PubgrubDependencyResolver.swift

@@ -310,15 +310,15 @@ public struct PubgrubDependencyResolver {
                         }
                     } else if !overriddenPackages.keys.contains(dependency.package) {
                         // Add the constraint if its not already present. This will ensure we don't
-                        // end up looping infinitely due to a cycle (which are diagnosed seperately).
+                        // end up looping infinitely due to a cycle (which are diagnosed separately).
                         constraints.append(dependency)
                     }
                 }
             }
         }
 
         // Process revision-based constraints in the second phase. Here we do the similar processing
-        // as the first phase but we also ignore the constraints that are overriden due to
+        // as the first phase but we also ignore the constraints that are overridden due to
         // presence of unversioned constraints.
         while let constraint = constraints.first(where: { $0.requirement.isRevision }) {
             guard case .revision(let revision) = constraint.requirement else {
@@ -331,7 +331,7 @@ public struct PubgrubDependencyResolver {
             switch overriddenPackages[package]?.version {
             case .excluded?, .version?:
                 // These values are not possible.
-                throw InternalError("Unexpected value for overriden package \(package) in \(overriddenPackages)")
+                throw InternalError("Unexpected value for overridden package \(package) in \(overriddenPackages)")
             case .unversioned?:
                 // This package is overridden by an unversioned package so we can ignore this constraint.
                 continue
@@ -1187,7 +1187,7 @@ internal final class PubGrubPackageContainer {
                 return [try Incompatibility(Term(node, .exact(version)), root: root, cause: cause)]
             }
 
-            // Skip if this package is overriden.
+            // Skip if this package is overridden.
             if overriddenPackages.keys.contains(dep.package) {
                 continue
             }

Sources/PackageGraph/ResolvedTarget.swift

@@ -42,7 +42,7 @@ public final class ResolvedTarget {
             }
         }
 
-        /// Returns the direct dependencies of the underlying dependency, accross the package graph.
+        /// Returns the direct dependencies of the underlying dependency, across the package graph.
         public var dependencies: [ResolvedTarget.Dependency] {
             switch self {
             case .target(let target, _):
@@ -85,17 +85,17 @@ public final class ResolvedTarget {
         return dependencies.filter { $0.satisfies(environment) }
     }
 
-    /// Returns the recursive dependencies, accross the whole package-graph.
+    /// Returns the recursive dependencies, across the whole package-graph.
     public func recursiveDependencies() throws -> [Dependency] {
         return try topologicalSort(self.dependencies) { $0.dependencies }
     }
 
-    /// Returns the recursive target dependencies, accross the whole package-graph.
+    /// Returns the recursive target dependencies, across the whole package-graph.
     public func recursiveTargetDependencies() throws -> [ResolvedTarget] {
         return try topologicalSort(self.dependencies) { $0.dependencies }.compactMap { $0.target }
     }
 
-    /// Returns the recursive dependencies, accross the whole package-graph, which satisfy the input build environment,
+    /// Returns the recursive dependencies, across the whole package-graph, which satisfy the input build environment,
     /// based on their conditions.
     /// - Parameters:
     ///     - environment: The build environment to use to filter dependencies on.

Sources/PackageLoading/PkgConfig.swift

@@ -128,7 +128,7 @@ public struct PkgConfig {
 }
 
 extension PkgConfig {
-    /// Informations to track circular dependencies and other PkgConfig issues
+    /// Information to track circular dependencies and other PkgConfig issues
     public class LoadingContext {
         public init() {
             pkgConfigStack = [String]()
@@ -218,8 +218,8 @@ internal struct PkgConfigParser {
 
     /// Parses `Requires: ` string into array of dependencies.
     ///
-    /// The dependency string has seperator which can be (multiple) space or a
-    /// comma.  Additionally each there can be an optional version constaint to
+    /// The dependency string has separator which can be (multiple) space or a
+    /// comma. Additionally each there can be an optional version constraint to
     /// a dependency.
     private func parseDependencies(_ depString: String) throws -> [String] {
         let operators = ["=", "<", ">", "<=", ">="]
@@ -237,7 +237,7 @@ internal struct PkgConfigParser {
             var tokens = [String]()
             var token = ""
             for (idx, char) in depString.enumerated() {
-                // Encountered a seperator, use the token.
+                // Encountered a separator, use the token.
                 if separators.contains(String(char)) {
                     // If next character is a space skip.
                     if let peeked = peek(idx: idx+1), peeked == " " { continue }

Sources/PackageLoading/PlatformRegistry.swift

@@ -13,7 +13,7 @@ import PackageModel
 /// A registry for available platforms.
 public final class PlatformRegistry {
 
-    /// The current registery is hardcoded and static so we can just use
+    /// The current registry is hardcoded and static so we can just use
     /// a singleton for now.
     public static let `default`: PlatformRegistry = .init()
 

Sources/PackageModel/Manifest.swift

@@ -153,7 +153,7 @@ public final class Manifest {
     /// Returns the targets required for a particular product filter.
     public func targetsRequired(for productFilter: ProductFilter) -> [TargetDescription] {
         #if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
-        // If we have already calcualted it, returned the cached value.
+        // If we have already calculated it, returned the cached value.
         if let targets = _requiredTargets[productFilter] {
             return targets
         } else {
@@ -328,7 +328,7 @@ public final class Manifest {
     ///
     /// - Parameters:
     ///   - targetDependency: The target dependency to register.
-    ///   - registry: The registry in which to record the assocation.
+    ///   - registry: The registry in which to record the association.
     ///   - availablePackages: The set of available packages.
     private func register(
         targetDependency: TargetDescription.Dependency,
@@ -387,7 +387,7 @@ public final class Manifest {
     ///
     /// - Parameters:
     ///   - requiredPlugIn: The plug‐in to register.
-    ///   - registry: The registry in which to record the assocation.
+    ///   - registry: The registry in which to record the association.
     ///   - availablePackages: The set of available packages.
     private func register(
         requiredPlugIn: TargetDescription.PluginUsage,

Sources/PackageModel/ManifestSourceGeneration.swift

@@ -560,13 +560,13 @@ public struct SourceCodeFragment {
     /// A literal prefix to emit at the start of the source code fragment.
     var literal: String
 
-    /// The type of delimeters to use around the subfragments (if any).
+    /// The type of delimiters to use around the subfragments (if any).
     var delimiters: Delimiters
 
     /// Whether or not to emit newlines before the subfragments (if any).
     var multiline: Bool
 
-    /// Any subfragments; no delimeters are emitted if none.
+    /// Any subfragments; no delimiters are emitted if none.
     var subnodes: [SourceCodeFragment]?
 
     /// Type of delimiters to emit around any subfragments.

Sources/PackageModel/Product.swift

@@ -104,9 +104,9 @@ public enum ProductType: Equatable, Hashable {
 
 /// The products requested of a package.
 ///
-/// Any product which matches the filter will be used for dependency resolution, whereas unrequested products will be ingored.
+/// Any product which matches the filter will be used for dependency resolution, whereas unrequested products will be ignored.
 ///
-/// Requested products need not actually exist in the package. Under certain circumstances, the resolver may request names whose package of origin are unknown. The intended package will recognize and fullfill the request; packages that do not know what it is will simply ignore it.
+/// Requested products need not actually exist in the package. Under certain circumstances, the resolver may request names whose package of origin are unknown. The intended package will recognize and fulfill the request; packages that do not know what it is will simply ignore it.
 public enum ProductFilter: Equatable, Hashable {
 
     /// All products, targets, and tests are requested.

Sources/PackagePlugin/PackageManagerProxy.swift

@@ -75,7 +75,7 @@ public struct PackageManager {
     }
 
     /// Represents an overall purpose of the build, which affects such things
-    /// asoptimization and generation of debug symbols.
+    /// as optimization and generation of debug symbols.
     public enum BuildConfiguration: String {
         case debug, release
     }

Sources/SPMPackageEditor/ManifestRewriter.swift

@@ -411,7 +411,7 @@ final class NewTargetWriter: SyntaxRewriter {
         )
 
         let emptyArray = SyntaxFactory.makeArrayExpr(leftSquare: SyntaxFactory.makeLeftSquareBracketToken(), elements: SyntaxFactory.makeBlankArrayElementList(), rightSquare: SyntaxFactory.makeRightSquareBracketToken())
-        let depenenciesArg = SyntaxFactory.makeFunctionCallArgument(
+        let dependenciesArg = SyntaxFactory.makeFunctionCallArgument(
             label: SyntaxFactory.makeIdentifier("dependencies", leadingTrivia: leadingTriviaArgs),
             colon: SyntaxFactory.makeColonToken(trailingTrivia: .spaces(1)),
             expression: emptyArray,
@@ -422,7 +422,7 @@ final class NewTargetWriter: SyntaxRewriter {
             calledExpression: dotPackageExpr,
             leftParen: SyntaxFactory.makeLeftParenToken(),
             argumentList: SyntaxFactory.makeFunctionCallArgumentList([
-                nameArg, depenenciesArg,
+                nameArg, dependenciesArg,
                 ]),
             rightParen: SyntaxFactory.makeRightParenToken(),
             trailingClosure: nil

Sources/SPMTestSupport/InMemoryGitRepository.swift

@@ -35,7 +35,7 @@ public final class InMemoryGitRepository {
     /// A struct representing a revision state. Minimally it contains a hash identifier for the revision
     /// and the file system state.
     fileprivate struct RevisionState {
-        /// The revision identifier hash. It should be unique amoung all the identifiers.
+        /// The revision identifier hash. It should be unique among all the identifiers.
         var hash: RevisionIdentifier
 
         /// The filesystem state contained in this revision.
@@ -141,7 +141,7 @@ public final class InMemoryGitRepository {
             throw InMemoryGitRepositoryError.unknownTag
         }
         // Point the head to the revision state of the tag.
-        // It should be impossible that a tag exisits which doesnot have a state.
+        // It should be impossible that a tag exists which does not have a state.
         try self.lock.withLock {
             guard let head = history[hash] else {
                 throw InternalError("unknown hash \(hash)")

Sources/SourceControl/GitRepository.swift

@@ -1017,7 +1017,7 @@ public enum GitProgressParser: FetchProgress {
     case receivingObjects(progress: Double, currentObjects: Int, totalObjects: Int, downloadProgress: String?, downloadSpeed: String?)
     case resolvingDeltas(progress: Double, currentObjects: Int, totalObjects: Int)
 
-    /// The pattern used to match git output. Caputre groups are labled from ?<i0> to ?<i19>.
+    /// The pattern used to match git output. Capture groups are labeled from ?<i0> to ?<i19>.
     static let pattern = #"""
 (?xi)
 (?:

Sources/Workspace/DefaultPluginScriptRunner.swift

@@ -35,7 +35,7 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner {
         self.enableSandbox = enableSandbox
     }
 
-    /// Public protocol function that starts compiling the plugin script to an exectutable. The tools version controls the availability of APIs in PackagePlugin, and should be set to the tools version of the package that defines the plugin (not of the target to which it is being applied). This function returns immediately and then calls the completion handler on the callbackq queue when compilation ends.
+    /// Public protocol function that starts compiling the plugin script to an executable. The tools version controls the availability of APIs in PackagePlugin, and should be set to the tools version of the package that defines the plugin (not of the target to which it is being applied). This function returns immediately and then calls the completion handler on the callbackq queue when compilation ends.
     public func compilePluginScript(
         sources: Sources,
         toolsVersion: ToolsVersion,

Sources/XCBuildSupport/PIF.swift

@@ -242,7 +242,7 @@ public enum PIF {
         }
     }
 
-    /// Abstract base class for all items in the group hierarhcy.
+    /// Abstract base class for all items in the group hierarchy.
     public class Reference: TypedObject {
         /// Determines the base path for a reference's relative path.
         public enum SourceTree: String, Codable {
@@ -1103,7 +1103,7 @@ public enum PIF {
     }
 }
 
-/// Repesents a filetype recognized by the Xcode build system.
+/// Represents a filetype recognized by the Xcode build system.
 public struct XCBuildFileType: CaseIterable {
     public static let xcdatamodeld: XCBuildFileType = XCBuildFileType(
         fileType: "xcdatamodeld",