Merge branch 'main' into feat/tahoe-tabbar

Author: thecoolwinter

CodeEdit/Features/Documents/Controllers/CodeEditWindowController+Toolbar.swift

@@ -59,6 +59,7 @@ extension CodeEditWindowController {
             items += [
                 .activityViewer,
                 .notificationItem,
+                .flexibleSpace,
             ]
         }
 

CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabView.swift

@@ -46,6 +46,8 @@ struct EditorTabView: View {
     /// By default, this value is `false`. When the root view is appeared, it turns `true`.
     @State private var isAppeared: Bool = false
 
+    @State private var keyMonitor: Any?
+
     /// The id associating with the tab that is currently being dragged.
     ///
     /// When `nil`, then there is no tab being dragged.
@@ -199,6 +201,22 @@ struct EditorTabView: View {
                 }
             }
         }
+        .onAppear {
+            keyMonitor = NSEvent.addLocalMonitorForEvents(matching: .otherMouseDown) { event in
+                if self.isHovering && event.type == .otherMouseDown && event.buttonNumber == 2 {
+                    DispatchQueue.main.async {
+                        editor.closeTab(file: tabFile)
+                    }
+                }
+                return event
+            }
+        }
+        .onDisappear {
+            if let keyMonitor = keyMonitor {
+                NSEvent.removeMonitor(keyMonitor)
+                self.keyMonitor = nil
+            }
+        }
     }
 
     var body: some View {

CodeEdit/Features/Editor/Views/EditorAreaView.swift

@@ -174,6 +174,7 @@ struct EditorAreaView: View {
                     // )
                     // ```
                     // When we can figure out how to disable the 'not focused' glass effect.
+
                     $0.background(EffectView(.headerView).ignoresSafeArea(.all))
                 } else: {
                     $0.background(EffectView(.headerView))

CodeEdit/Features/SourceControl/Client/GitClient+Status.swift

@@ -36,11 +36,25 @@ extension GitClient {
     /// - Throws: Can throw ``GitClient/GitClientError`` errors if it finds unexpected output.
     func getStatus() async throws -> Status {
         let output = try await run("status -z --porcelain=2 -u")
+        return try parseStatusString(output)
+    }
+
+    /// Parses a status string from ``getStatus()`` and returns a ``Status`` object if possible.
+    /// - Parameter output: The git output from running `status`. Expects a porcelain v2 string.
+    /// - Returns: A status object if parseable.
+    func parseStatusString(_ output: borrowing String) throws -> Status {
+        let endsInNull = output.last == Character(UnicodeScalar(0))
+        let endIndex: String.Index
+        if endsInNull && output.count > 1 {
+            endIndex = output.index(before: output.endIndex)
+        } else {
+            endIndex = output.endIndex
+        }
 
         var status = Status(changedFiles: [], unmergedChanges: [], untrackedFiles: [])
 
         var index = output.startIndex
-        while index < output.endIndex {
+        while index < endIndex {
             let typeIndex = index
 
             // Move ahead no matter what.
@@ -100,7 +114,11 @@ extension GitClient {
             }
             index = newIndex
         }
-        index = output.index(after: index)
+        defer {
+            if index < output.index(before: output.endIndex) {
+                index = output.index(after: index)
+            }
+        }
         return output[startIndex..<index]
     }
 
@@ -147,7 +165,8 @@ extension GitClient {
             try moveToNextSpace(from: &index, output: output)
         }
         try moveOneChar(from: &index, output: output)
-        let filename = String(try substringToNextNull(from: &index, output: output))
+        let substring = try substringToNextNull(from: &index, output: output)
+        let filename = String(substring)
         return GitChangedFile(
             status: status,
             stagedStatus: stagedStatus,

CodeEdit/Features/SourceControl/Clone/GitCloneView.swift

@@ -28,13 +28,12 @@ struct GitCloneView: View {
 
     var body: some View {
         VStack(spacing: 8) {
-            HStack {
+            HStack(alignment: .top) {
                 Image(nsImage: NSApp.applicationIconImage)
                     .resizable()
                     .frame(width: 64, height: 64)
-                    .padding(.bottom, 50)
                 VStack(alignment: .leading) {
-                    Text("Clone a repository")
+                    Text("Clone a Repository")
                         .bold()
                         .padding(.bottom, 2)
                     Text("Enter a git repository URL:")
@@ -46,9 +45,9 @@ struct GitCloneView: View {
                     TextField("Git Repository URL", text: $viewModel.repoUrlStr)
                         .lineLimit(1)
                         .padding(.bottom, 15)
-                        .frame(width: 300)
 
                     HStack {
+                        Spacer()
                         Button("Cancel") {
                             dismiss()
                         }
@@ -58,11 +57,8 @@ struct GitCloneView: View {
                         .keyboardShortcut(.defaultAction)
                         .disabled(!viewModel.isValidUrl(url: viewModel.repoUrlStr))
                     }
-                    .offset(x: 185)
-                    .alignmentGuide(.leading) { context in
-                        context[.leading]
-                    }
                 }
+                .frame(width: 300)
             }
             .padding(.top, 20)
             .padding(.horizontal, 20)
@@ -71,28 +67,32 @@ struct GitCloneView: View {
                 viewModel.checkClipboard()
             }
             .sheet(isPresented: $viewModel.isCloning) {
-                NavigationStack {
-                    VStack {
-                        ProgressView(
-                            viewModel.cloningProgress.state.label,
-                            value: viewModel.cloningProgress.progress,
-                            total: 100
-                        )
-                    }
-                }
-                .toolbar {
-                    ToolbarItem {
-                        Button("Cancel Cloning") {
-                            viewModel.cloningTask?.cancel()
-                            viewModel.cloningTask = nil
-                            viewModel.isCloning = false
-                        }
-                    }
+                cloningSheet
+            }
+        }
+    }
+
+    @ViewBuilder private var cloningSheet: some View {
+        NavigationStack {
+            VStack {
+                ProgressView(
+                    viewModel.cloningProgress.state.label,
+                    value: viewModel.cloningProgress.progress,
+                    total: 100
+                )
+            }
+        }
+        .toolbar {
+            ToolbarItem {
+                Button("Cancel Cloning") {
+                    viewModel.cloningTask?.cancel()
+                    viewModel.cloningTask = nil
+                    viewModel.isCloning = false
                 }
-                .padding()
-                .frame(width: 350)
             }
         }
+        .padding()
+        .frame(width: 350)
     }
 
     func cloneRepository() {

CodeEdit/Features/SourceControl/Clone/ViewModels/GitCloneViewModel.swift

@@ -184,7 +184,7 @@ class GitCloneViewModel: ObservableObject {
         dialog.prompt = "Clone"
         dialog.nameFieldStringValue = saveName
         dialog.nameFieldLabel = "Clone as"
-        dialog.title = "Clone"
+        dialog.title = "Clone a Repository"
 
         guard dialog.runModal() == NSApplication.ModalResponse.OK,
               let result = dialog.url else {

CodeEditTests/Features/SourceControl/GitClientTests.swift

@@ -0,0 +1,27 @@
+//
+//  GitClientTests.swift
+//  CodeEditTests
+//
+//  Created by Khan Winter on 9/11/25.
+//
+
+import Testing
+@testable import CodeEdit
+
+@Suite
+struct GitClientTests {
+    @Test
+    func statusParseNullAtEnd() throws {
+        try withTempDir { dirURL in
+            // swiftlint:disable:next line_length
+            let string = "1 .M N... 100644 100644 100644 eaef31cfa2a22418c00d7477da0b7151d122681e eaef31cfa2a22418c00d7477da0b7151d122681e CodeEdit/Features/SourceControl/Client/GitClient+Status.swift\01 AM N... 000000 100644 100644 0000000000000000000000000000000000000000 e0f5ce250b32cf6610a284b7a33ac114079f5159 CodeEditTests/Features/SourceControl/GitClientTests.swift\0"
+            let client = GitClient(directoryURL: dirURL, shellClient: .live())
+            let status = try client.parseStatusString(string)
+
+            #expect(status.changedFiles.count == 2)
+            // No null string at the end
+            #expect(status.changedFiles[0].fileURL.lastPathComponent == "GitClient+Status.swift")
+            #expect(status.changedFiles[1].fileURL.lastPathComponent == "GitClientTests.swift")
+        }
+    }
+}