Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Copilot for Xcode.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = EditorExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "$(EXTESNION_BUNDLE_NAME)";
INFOPLIST_KEY_CFBundleDisplayName = "$(EXTENSION_BUNDLE_NAME)";
INFOPLIST_KEY_NSHumanReadableCopyright = "";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -803,7 +803,7 @@
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = EditorExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "$(EXTESNION_BUNDLE_NAME)";
INFOPLIST_KEY_CFBundleDisplayName = "$(EXTENSION_BUNDLE_NAME)";
INFOPLIST_KEY_NSHumanReadableCopyright = "";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
4 changes: 2 additions & 2 deletions Core/Sources/XcodeThemeController/XcodeThemeParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ struct XcodeThemeParser {
guard let theme = plist else { throw Error.invalidData }

/// The source value is an `r g b a` string, for example: `0.5 0.5 0.2 1`
func converColor(source: String) -> XcodeTheme.ThemeColor {
func convertColor(source: String) -> XcodeTheme.ThemeColor {
let components = source.split(separator: " ")
let red = (components[0] as NSString).doubleValue
let green = (components[1] as NSString).doubleValue
Expand All @@ -136,7 +136,7 @@ struct XcodeThemeParser {
currentDict = value
}
if let value = currentDict[path.last!] as? String {
return converColor(source: value)
return convertColor(source: value)
}
return defaultValue
}
Expand Down
2 changes: 1 addition & 1 deletion Tool/Sources/FileSystem/ByteString.swift
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ extension ByteString: ByteStreamable {
}
}

/// StringLiteralConvertable conformance for a ByteString.
/// StringLiteralConvertible conformance for a ByteString.
extension ByteString: ExpressibleByStringLiteral {
public typealias UnicodeScalarLiteralType = StringLiteralType
public typealias ExtendedGraphemeClusterLiteralType = StringLiteralType
Expand Down
10 changes: 5 additions & 5 deletions Tool/Sources/FileSystem/Lock.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation

public enum ProcessLockError: Error {
case unableToAquireLock(errno: Int32)
case unableToAcquireLock(errno: Int32)
}

extension ProcessLockError: CustomNSError {
Expand Down Expand Up @@ -42,7 +42,7 @@ public final class FileLock {
self.init(at: cachePath.appending(component: name + ".lock"))
}

/// Try to acquire a lock. This method will block until lock the already aquired by other process.
/// Try to acquire a lock. This method will block until lock the already acquired by other process.
///
/// Note: This method can throw if underlying POSIX methods fail.
public func lock(type: LockType = .exclusive, blocking: Bool = true) throws {
Expand Down Expand Up @@ -78,7 +78,7 @@ public final class FileLock {
}
if !LockFileEx(handle, DWORD(dwFlags), 0,
UInt32.max, UInt32.max, &overlapped) {
throw ProcessLockError.unableToAquireLock(errno: Int32(GetLastError()))
throw ProcessLockError.unableToAcquireLock(errno: Int32(GetLastError()))
}
#else
// Open the lock file.
Expand All @@ -97,14 +97,14 @@ public final class FileLock {
if !blocking {
flags |= LOCK_NB
}
// Aquire lock on the file.
// Acquire lock on the file.
while true {
if flock(fileDescriptor!, flags) == 0 {
break
}
// Retry if interrupted.
if errno == EINTR { continue }
throw ProcessLockError.unableToAquireLock(errno: errno)
throw ProcessLockError.unableToAcquireLock(errno: errno)
}
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion Tool/Sources/FileSystem/Path.swift
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ extension AbsolutePath {
public func relative(to base: AbsolutePath) -> RelativePath {
let result: RelativePath
// Split the two paths into their components.
// FIXME: The is needs to be optimized to avoid unncessary copying.
// FIXME: The is needs to be optimized to avoid unnecessary copying.
let pathComps = self.components
let baseComps = base.components

Expand Down
6 changes: 3 additions & 3 deletions Tool/Sources/FileSystem/WritableByteStream.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

/// Closable entity is one that manages underlying resources and needs to be closed for cleanup
/// The intent of this method is for the sole owner of the refernece/handle of the resource to close it completely, comapred to releasing a shared resource.
/// The intent of this method is for the sole owner of the refernece/handle of the resource to close it completely, compared to releasing a shared resource.
public protocol Closable {
func close() throws
}
Expand Down Expand Up @@ -156,7 +156,7 @@ extension WritableByteStream {

// MARK: helpers that return `self`

// FIXME: This override shouldn't be necesary but removing it causes a 30% performance regression. This problem is
// FIXME: This override shouldn't be necessary but removing it causes a 30% performance regression. This problem is
// tracked by the following bug: https://bugs.swift.org/browse/SR-8535
@discardableResult
public func send(_ value: ArraySlice<UInt8>) -> WritableByteStream {
Expand Down Expand Up @@ -408,7 +408,7 @@ precedencegroup StreamingPrecedence {

// MARK: Output Operator Implementations

// FIXME: This override shouldn't be necesary but removing it causes a 30% performance regression. This problem is
// FIXME: This override shouldn't be necessary but removing it causes a 30% performance regression. This problem is
// tracked by the following bug: https://bugs.swift.org/browse/SR-8535

@available(*, deprecated, message: "use send(_:) function on WritableByteStream instead")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ enum ObjectiveCNodeType: String {
/// `__GENERICS` in category interface and implementation.
case genericsTypeReference = "generics_type_reference"
/// `IB_DESIGNABLE`, etc. The typo is from the original source.
case classInterfaceAttributeSpecifier = "class_interface_attribute_sepcifier"
case classInterfaceAttributeSpecifier = "class_interface_attribute_specifier"
}

extension ObjectiveCNodeType {
Expand Down
4 changes: 2 additions & 2 deletions Tool/Sources/SuggestionInjector/SuggestionInjector.swift
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ public struct SuggestionInjector {

public struct SuggestionAnalyzer {
struct Result {
enum InsertPostion {
enum InsertPosition {
case currentLine
case nextLine
}

var insertPosition: InsertPostion
var insertPosition: InsertPosition
var commonPrefix: String?
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ final class SwiftFocusedCodeFinder_Selection_Tests: XCTestCase {

func test_selecting_a_static_function_from_an_actor_the_scope_should_be_the_actor() {
let code = """
@gloablActor
@globalActor
public actor A {
static func f() {}
static func g() {}
Expand All @@ -240,7 +240,7 @@ final class SwiftFocusedCodeFinder_Selection_Tests: XCTestCase {
XCTAssertEqual(context, .init(
scope: .scope(signature: [
.init(
signature: "@gloablActor public actor A",
signature: "@globalActor public actor A",
name: "A",
range: .init(startPair: (0, 0), endPair: (7, 1))
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import XCTest
@testable import SuggestionBasic

final class TextExtrationFromCodeTests: XCTestCase {
final class TextExtractionFromCodeTests: XCTestCase {
func test_empty_selection() {
let selection = CursorRange(
start: CursorPosition(line: 0, character: 0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
// *///======== End of Copilot Suggestion
// }
// """,
// "The user may want to keep typing on the empty line, so suggestion is addded to the next line"
// "The user may want to keep typing on the empty line, so suggestion is added to the next line"
// )
// }
//
Expand Down