Merge branch 'main' into pr/2044

Author: thecoolwinter

CodeEdit.xcodeproj/project.pbxproj

@@ -1622,7 +1622,7 @@
 			repositoryURL = "https://github.com/CodeEditApp/CodeEditSymbols";
 			requirement = {
 				kind = exactVersion;
-				version = 0.2.2;
+				version = 0.2.3;
 			};
 		};
 		287136B1292A407E00E9F5F4 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */ = {
@@ -1749,8 +1749,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.12.0;
+				kind = exactVersion;
+				version = 0.13.2;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

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

@@ -103,12 +103,12 @@ final class CEWorkspaceFileManager {
                 return nil
             }
 
-            // Drill down towards the file, indexing any directories needed. 
-            // If file is not in the `workspaceSettingsFolderURL` or subdirectories, exit.
-            guard url.absoluteString.starts(with: folderUrl.absoluteString),
-                  url.pathComponents.count > folderUrl.pathComponents.count else {
+            // If file is not in the `folderUrl` or subdirectories, exit.
+            guard folderUrl.containsSubPath(url) else {
                 return nil
             }
+
+            // Drill down towards the file, indexing any directories needed.
             let pathComponents = url.pathComponents.dropFirst(folderUrl.pathComponents.count)
             var currentURL = folderUrl
 

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager.swift

@@ -59,8 +59,11 @@ final class CodeEditDocumentController: NSDocumentController {
         display displayDocument: Bool,
         completionHandler: @escaping (NSDocument?, Bool, Error?) -> Void
     ) {
-        super.openDocument(withContentsOf: url, display: displayDocument) { document, documentWasAlreadyOpen, error in
+        guard !openFileInExistingWorkspace(url: url) else {
+            return
+        }
 
+        super.openDocument(withContentsOf: url, display: displayDocument) { document, documentWasAlreadyOpen, error in
             if let document {
                 self.addDocument(document)
             } else {
@@ -73,6 +76,28 @@ final class CodeEditDocumentController: NSDocumentController {
         }
     }
 
+    /// Attempt to open the file URL in an open workspace, finding the nearest workspace to open it in if possible.
+    /// - Parameter url: The file URL to open.
+    /// - Returns: True, if the document was opened in a workspace.
+    private func openFileInExistingWorkspace(url: URL) -> Bool {
+        guard !url.isFolder else { return false }
+        let workspaces = documents.compactMap({ $0 as? WorkspaceDocument })
+
+        // Check open workspaces for the file being opened. Sorted by shared components with the url so we
+        // open the nearest workspace possible.
+        for workspace in workspaces.sorted(by: {
+            ($0.fileURL?.sharedComponents(url) ?? 0) > ($1.fileURL?.sharedComponents(url) ?? 0)
+        }) {
+            // createIfNotFound will still return `nil` if the files don't share a common ancestor.
+            if let newFile = workspace.workspaceFileManager?.getFile(url.absolutePath, createIfNotFound: true) {
+                workspace.editorManager?.openTab(item: newFile)
+                workspace.showWindows()
+                return true
+            }
+        }
+        return false
+    }
+
     override func removeDocument(_ document: NSDocument) {
         super.removeDocument(document)
 

CodeEdit/Features/Documents/Controllers/CodeEditDocumentController.swift

@@ -50,6 +50,10 @@ struct CodeFileView: View {
     var useSystemCursor
     @AppSettings(\.textEditing.showMinimap)
     var showMinimap
+    @AppSettings(\.textEditing.reformatAtColumn)
+    var reformatAtColumn
+    @AppSettings(\.textEditing.showReformattingGuide)
+    var showReformattingGuide
 
     @Environment(\.colorScheme)
     private var colorScheme
@@ -135,7 +139,9 @@ struct CodeFileView: View {
             useSystemCursor: useSystemCursor,
             undoManager: undoManager,
             coordinators: textViewCoordinators,
-            showMinimap: showMinimap
+            showMinimap: showMinimap,
+            reformatAtColumn: reformatAtColumn,
+            showReformattingGuide: showReformattingGuide
         )
         .id(codeFile.fileURL)
         .background {

CodeEdit/Features/Editor/Views/CodeFileView.swift

@@ -209,26 +209,69 @@ extension FindNavigatorListViewController: NSOutlineViewDelegate {
     }
 
     func outlineView(_ outlineView: NSOutlineView, heightOfRowByItem item: Any) -> CGFloat {
-        if let item = item as? SearchResultMatchModel {
-            let tempView = NSTextField(wrappingLabelWithString: item.attributedLabel().string)
-            tempView.allowsDefaultTighteningForTruncation = false
-            tempView.cell?.truncatesLastVisibleLine = true
+        if let matchItem = item as? SearchResultMatchModel {
+            guard let column = outlineView.tableColumns.first else {
+                return rowHeight
+            }
+            let columnWidth = column.width
+            let indentationLevel = outlineView.level(forItem: item)
+            let indentationSpace = CGFloat(indentationLevel) * outlineView.indentationPerLevel
+            let horizontalPaddingAndFixedElements: CGFloat = 24.0
+
+            let availableWidth = columnWidth - indentationSpace - horizontalPaddingAndFixedElements
+
+            guard availableWidth > 0 else {
+                // Not enough space to display anything, return minimum height
+                return max(rowHeight, Settings.shared.preferences.general.projectNavigatorSize.rowHeight)
+            }
+
+            let attributedString = matchItem.attributedLabel()
+
+            let tempView = NSTextField()
+            tempView.allowsEditingTextAttributes = true
+            tempView.attributedStringValue = attributedString
+
+            tempView.isEditable = false
+            tempView.isBordered = false
+            tempView.drawsBackground = false
+            tempView.alignment = .natural
+
             tempView.cell?.wraps = true
-            tempView.maximumNumberOfLines = 3
-            tempView.attributedStringValue = item.attributedLabel()
-            tempView.layout()
-            let width = outlineView.frame.width - outlineView.indentationPerLevel*2 - 24
-            return tempView.sizeThatFits(
-                NSSize(width: width, height: CGFloat.greatestFiniteMagnitude)
-            ).height + 8
-        } else {
-            return rowHeight
+            tempView.cell?.usesSingleLineMode = false
+            tempView.lineBreakMode = .byWordWrapping
+            tempView.maximumNumberOfLines = Settings.shared.preferences.general.findNavigatorDetail.rawValue
+            tempView.preferredMaxLayoutWidth = availableWidth
+
+            var calculatedHeight = tempView.sizeThatFits(
+                NSSize(width: availableWidth, height: .greatestFiniteMagnitude)
+            ).height
+
+            // Total vertical padding (top + bottom) within the cell around the text
+            let verticalPaddingInCell: CGFloat = 8.0
+            calculatedHeight += verticalPaddingInCell
+            return max(calculatedHeight, self.rowHeight)
         }
+        // For parent items
+        return prefs.general.projectNavigatorSize.rowHeight
     }
 
     func outlineViewColumnDidResize(_ notification: Notification) {
-        let indexes = IndexSet(integersIn: 0..<searchItems.count)
-        outlineView.noteHeightOfRows(withIndexesChanged: indexes)
+        // Disable animations temporarily
+        NSAnimationContext.beginGrouping()
+        NSAnimationContext.current.duration = 0
+
+        var rowsToUpdate = IndexSet()
+        for row in 0..<outlineView.numberOfRows {
+            if let item = outlineView.item(atRow: row), item is SearchResultMatchModel {
+                rowsToUpdate.insert(row)
+            }
+        }
+        if !rowsToUpdate.isEmpty {
+            outlineView.noteHeightOfRows(withIndexesChanged: rowsToUpdate)
+        }
+
+        NSAnimationContext.endGrouping()
+        outlineView.layoutSubtreeIfNeeded()
     }
 }
 

CodeEdit/Features/NavigatorArea/FindNavigator/FindNavigatorResultList/FindNavigatorListViewController.swift

@@ -29,6 +29,8 @@ extension SettingsData {
                 "Bracket Pair Emphasis",
                 "Bracket Pair Highlight",
                 "Show Minimap",
+                "Reformat at Column",
+                "Show Reformatting Guide",
             ]
             if #available(macOS 14.0, *) {
                 keys.append("System Cursor")
@@ -74,6 +76,12 @@ extension SettingsData {
         /// Toggle the minimap in the editor.
         var showMinimap: Bool = true
 
+        /// The column at which to reformat text
+        var reformatAtColumn: Int = 80
+
+        /// Show the reformatting guide in the editor
+        var showReformattingGuide: Bool = false
+
         /// Default initializer
         init() {
             self.populateCommands()
@@ -123,6 +131,11 @@ extension SettingsData {
             }
 
             self.showMinimap = try container.decodeIfPresent(Bool.self, forKey: .showMinimap) ?? true
+            self.reformatAtColumn = try container.decodeIfPresent(Int.self, forKey: .reformatAtColumn) ?? 80
+            self.showReformattingGuide = try container.decodeIfPresent(
+                Bool.self,
+                forKey: .showReformattingGuide
+            ) ?? false
 
             self.populateCommands()
         }

CodeEdit/Features/Settings/Pages/TextEditingSettings/Models/TextEditingSettings.swift

@@ -21,6 +21,7 @@ struct TextEditingSettingsView: View {
                 useSystemCursor
                 overscroll
                 showMinimap
+                reformatSettings
             }
             Section {
                 fontSelector
@@ -206,4 +207,21 @@ private extension TextEditingSettingsView {
             // swiftlint:disable:next line_length
             .help("The minimap gives you a high-level summary of your source code, with controls to quickly navigate your document.")
     }
+
+    @ViewBuilder private var reformatSettings: some View {
+        Stepper(
+            "Reformat at Column",
+            value: Binding<Double>(
+                get: { Double(textEditing.reformatAtColumn) },
+                set: { textEditing.reformatAtColumn = Int($0) }
+            ),
+            in: 40...200,
+            step: 1,
+            format: .number
+        )
+        .help("The column at which text should be reformatted")
+
+        Toggle("Show Reformatting Guide", isOn: $textEditing.showReformattingGuide)
+            .help("Shows a vertical guide at the reformat column")
+    }
 }

CodeEdit/Features/Settings/Pages/TextEditingSettings/TextEditingSettingsView.swift

@@ -15,4 +15,39 @@ extension URL {
     func componentCompare(_ other: URL) -> Bool {
         return self.pathComponents == other.pathComponents
     }
+
+    /// Determines if another URL is lower in the file system than this URL.
+    ///
+    /// Examples:
+    /// ```
+    /// URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/Desktop/file.txt")) // true
+    /// URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/Desktop/")) // false
+    /// URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/")) // false
+    /// URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/Desktop/Folder")) // true
+    /// ```
+    ///
+    /// - Parameter other: The URL to compare.
+    /// - Returns: True, if the other URL is lower in the file system.
+    func containsSubPath(_ other: URL) -> Bool {
+        other.absoluteString.starts(with: absoluteString)
+        && other.pathComponents.count > pathComponents.count
+    }
+
+    /// Compares this url with another, counting the number of shared path components. Stops counting once a
+    /// different component is found.
+    ///
+    /// - Note: URL treats a leading `/` as a component, so `/Users` and `/` will return `1`.
+    /// - Parameter other: The URL to compare against.
+    /// - Returns: The number of shared components.
+    func sharedComponents(_ other: URL) -> Int {
+        var count = 0
+        for (component, otherComponent) in zip(pathComponents, other.pathComponents) {
+            if component == otherComponent {
+                count += 1
+            } else {
+                return count
+            }
+        }
+        return count
+    }
 }

CodeEdit/Utils/Extensions/URL/URL+componentCompare.swift

@@ -196,4 +196,38 @@ final class CodeEditUtilsExtensionsUnitTests: XCTestCase {
         let path = #"/Hello World/ With Spaces/ And " Characters "#
         XCTAssertEqual(path.escapedDirectory(), #""/Hello World/ With Spaces/ And \" Characters ""#)
     }
+
+    // MARK: - URL + Contains
+
+    func testURLContainsSubPath() {
+        XCTAssertTrue(URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/Desktop/file.txt")))
+        XCTAssertFalse(URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/Desktop/")))
+        XCTAssertFalse(URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/")))
+        XCTAssertTrue(URL(filePath: "/Users/Bob/Desktop").containsSubPath(URL(filePath: "/Users/Bob/Desktop/Folder")))
+    }
+
+    func testURLSharedComponentsCount() {
+        // URL Treats the leading `/` as a component, so these all appear to have + 1 but are correct.
+        XCTAssertEqual(
+            URL(filePath: "/Users/Bob/Desktop").sharedComponents(URL(filePath: "/Users/Bob/Desktop/file.txt")),
+            4
+        )
+        XCTAssertEqual(
+            URL(filePath: "/Users/Bob/Desktop").sharedComponents(URL(filePath: "/Users/Bob/Desktop/")),
+            4
+        )
+        XCTAssertEqual(
+            URL(filePath: "/Users/Bob/Desktop").sharedComponents(URL(filePath: "/Users/Bob/")),
+            3
+        )
+        XCTAssertEqual(
+            URL(filePath: "/Users/Bob/Desktop").sharedComponents(URL(filePath: "/Users/Bob/Desktop/Folder")),
+            4
+        )
+
+        XCTAssertEqual(
+            URL(filePath: "/Users/Bob/Desktop").sharedComponents(URL(filePath: "/Some Other/ Path ")),
+            1
+        )
+    }
 }