Merge branch 'main' into itembox

Author: FastestMolasses

CodeEdit.xcodeproj/project.pbxproj

@@ -20,7 +20,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
     @LazyService var lspService: LSPService
 
     func applicationDidFinishLaunching(_ notification: Notification) {
-        setupServiceContainer()
         enableWindowSizeSaveOnQuit()
         Settings.shared.preferences.general.appAppearance.applyAppearance()
         checkForFilesToOpen()
@@ -271,14 +270,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
             workspace.taskManager?.stopAllTasks()
         }
     }
-
-    /// Setup all the services into a ServiceContainer for the application to use.
-    @MainActor
-    private func setupServiceContainer() {
-        ServiceContainer.register(
-            LSPService()
-        )
-    }
 }
 
 extension AppDelegate {

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -15,6 +15,11 @@ struct CodeEditApp: App {
     let updater: SoftwareUpdater = SoftwareUpdater()
 
     init() {
+        // Register singleton services before anything else
+        ServiceContainer.register(
+            LSPService()
+        )
+
         _ = CodeEditDocumentController.shared
         NSMenuItem.swizzle()
         NSSplitViewItem.swizzle()

CodeEdit/AppDelegate.swift

@@ -30,7 +30,7 @@ extension CEWorkspaceFileManager {
                     // Can be ignored for now, these I think not related to tree changes
                     continue
                 case .rootChanged:
-                    // TODO: Handle workspace root changing.
+                    // TODO: #1880 - Handle workspace root changing.
                     continue
                 case .itemCreated, .itemCloned, .itemRemoved, .itemRenamed:
                     for fileItem in fileItems {
@@ -48,7 +48,10 @@ extension CEWorkspaceFileManager {
                 self.notifyObservers(updatedItems: files)
             }
 
-            self.handleGitEvents(events: events)
+            if Settings.shared.preferences.sourceControl.general.sourceControlIsEnabled &&
+                Settings.shared.preferences.sourceControl.general.refreshStatusLocally {
+                self.handleGitEvents(events: events)
+            }
         }
     }
 

CodeEdit/CodeEditApp.swift

@@ -71,8 +71,10 @@ struct ToolbarBranchPicker: View {
             isHovering = active
         }
         .onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { (_) in
-            Task {
-                await sourceControlManager?.refreshCurrentBranch()
+            if self.currentBranch != nil {
+                Task {
+                    await sourceControlManager?.refreshCurrentBranch()
+                }
             }
         }
         .onReceive(
@@ -82,8 +84,10 @@ struct ToolbarBranchPicker: View {
             self.currentBranch = branch
         }
         .task {
-            await self.sourceControlManager?.refreshCurrentBranch()
-            await self.sourceControlManager?.refreshBranches()
+            if Settings.shared.preferences.sourceControl.general.sourceControlIsEnabled {
+                await self.sourceControlManager?.refreshCurrentBranch()
+                await self.sourceControlManager?.refreshBranches()
+            }
         }
     }
 

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager+DirectoryEvents.swift

@@ -28,7 +28,10 @@ final class CodeFileDocument: NSDocument, ObservableObject {
 
     static let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "CodeFileDocument")
 
-    @Service var lspService: LSPService
+    /// Sent when the document is opened. The document will be sent in the notification's object.
+    static let didOpenNotification = Notification.Name(rawValue: "CodeFileDocument.didOpen")
+    /// Sent when the document is closed. The document's `fileURL` will be sent in the notification's object.
+    static let didCloseNotification = Notification.Name(rawValue: "CodeFileDocument.didClose")
 
     /// The text content of the document, stored as a text storage
     ///
@@ -46,11 +49,8 @@ final class CodeFileDocument: NSDocument, ObservableObject {
     /// See ``CodeEditSourceEditor/CombineCoordinator``.
     @Published var contentCoordinator: CombineCoordinator = CombineCoordinator()
 
-    lazy var languageServerCoordinator: LSPContentCoordinator = {
-        let coordinator = LSPContentCoordinator()
-        coordinator.uri = self.languageServerURI
-        return coordinator
-    }()
+    /// Set by ``LanguageServer`` when initialized.
+    @Published var lspCoordinator: LSPContentCoordinator?
 
     /// Used to override detected languages.
     @Published var language: CodeLanguage?
@@ -83,7 +83,7 @@ final class CodeFileDocument: NSDocument, ObservableObject {
     }
 
     /// A stable string to use when identifying documents with language servers.
-    var languageServerURI: String? { fileURL?.languageServerURI }
+    var languageServerURI: String? { fileURL?.absolutePath }
 
     /// Specify options for opening the file such as the initial cursor positions.
     /// Nulled by ``CodeFileView`` on first load.
@@ -160,6 +160,7 @@ final class CodeFileDocument: NSDocument, ObservableObject {
         } else {
             Self.logger.error("Failed to read file from data using encoding: \(rawEncoding)")
         }
+        NotificationCenter.default.post(name: Self.didOpenNotification, object: self)
     }
 
     /// Triggered when change occurred
@@ -186,7 +187,7 @@ final class CodeFileDocument: NSDocument, ObservableObject {
 
     override func close() {
         super.close()
-        lspService.closeDocument(self)
+        NotificationCenter.default.post(name: Self.didCloseNotification, object: fileURL)
     }
 
     func getLanguage() -> CodeLanguage {
@@ -201,15 +202,6 @@ final class CodeFileDocument: NSDocument, ObservableObject {
     }
 
     func findWorkspace() -> WorkspaceDocument? {
-        CodeEditDocumentController.shared.documents.first(where: { doc in
-            guard let workspace = doc as? WorkspaceDocument, let path = self.languageServerURI else { return false }
-            // createIfNotFound is safe here because it will still exit if the file and the workspace
-            // do not share a path prefix
-            return workspace
-                .workspaceFileManager?
-                .getFile(path, createIfNotFound: true)?
-                .fileDocument?
-                .isEqual(self) ?? false
-        }) as? WorkspaceDocument
+        fileURL?.findWorkspace()
     }
 }

CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift

@@ -12,7 +12,7 @@ final class CodeEditDocumentController: NSDocumentController {
     @Environment(\.openWindow)
     private var openWindow
 
-    @LazyService var lspService: LSPService
+    @Service var lspService: LSPService
 
     private let fileManager = FileManager.default
 
@@ -92,13 +92,6 @@ final class CodeEditDocumentController: NSDocumentController {
             }
         }
     }
-
-    override func addDocument(_ document: NSDocument) {
-        super.addDocument(document)
-        if let document = document as? CodeFileDocument {
-            lspService.openDocument(document)
-        }
-    }
 }
 
 extension NSDocumentController {

CodeEdit/Features/Documents/CodeFileDocument/CodeFileDocument.swift

@@ -56,10 +56,9 @@ struct CodeFileView: View {
 
     init(codeFile: CodeFileDocument, textViewCoordinators: [TextViewCoordinator] = [], isEditable: Bool = true) {
         self._codeFile = .init(wrappedValue: codeFile)
-        self.textViewCoordinators = textViewCoordinators + [
-            codeFile.contentCoordinator,
-            codeFile.languageServerCoordinator,
-        ]
+        self.textViewCoordinators = textViewCoordinators
+            + [codeFile.contentCoordinator]
+            + [codeFile.lspCoordinator].compactMap({ $0 })
         self.isEditable = isEditable
 
         if let openOptions = codeFile.openOptions {

CodeEdit/Features/Documents/Controllers/CodeEditDocumentController.swift

@@ -40,7 +40,11 @@ final class HistoryInspectorModel: ObservableObject {
         do {
             let commitHistory = try await sourceControlManager
                 .gitClient
-                .getCommitHistory(maxCount: 40, fileLocalPath: fileURL)
+                .getCommitHistory(
+                    maxCount: 40,
+                    fileLocalPath: fileURL,
+                    showMergeCommits: Settings.shared.preferences.sourceControl.git.showMergeCommitsPerFileLog
+                )
             await setCommitHistory(commitHistory)
         } catch {
             await setCommitHistory([])