Merge branch 'CodeEditApp:main' into select-multiple-files

Author: LeonardoLarranaga

.all-contributorsrc

@@ -776,6 +776,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Kihron",
+      "name": "Kihron",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30128800?v=4",
+      "profile": "https://github.com/Kihron",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

CodeEdit/AppDelegate.swift

@@ -69,12 +69,15 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
     }
 
     func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
-        if flag {
+        guard flag else {
+            handleOpen()
             return false
         }
 
-        handleOpen()
-
+        /// Check if all windows are either miniaturized or not visible.
+        /// If so, attempt to find the first miniaturized window and deminiaturize it.
+        guard sender.windows.allSatisfy({ $0.isMiniaturized || !$0.isVisible }) else { return false }
+        sender.windows.first(where: { $0.isMiniaturized })?.deminiaturize(sender)
         return false
     }
 

CodeEdit/Features/Editor/TabBar/Views/EditorTabBarContextMenu.swift

@@ -53,10 +53,11 @@ struct EditorTabBarContextMenu: ViewModifier {
                         }
                     }
                 }
+
                 Button("Close Tabs to the Right") {
                     withAnimation {
-                        if let index = tabs.tabs.firstIndex(where: { $0.file == item }) {
-                            tabs.tabs[index...].forEach {
+                        if let index = tabs.tabs.firstIndex(where: { $0.file == item }), index + 1 < tabs.tabs.count {
+                            tabs.tabs[(index + 1)...].forEach {
                                 tabs.closeTab(file: $0.file)
                             }
                         }

CodeEdit/Features/Editor/Views/CodeFileView.swift

@@ -80,11 +80,10 @@ struct CodeFileView: View {
             .textUpdatePublisher
             .debounce(for: 1.0, scheduler: DispatchQueue.main)
             .sink { _ in
+                // updateChangeCount is automatically managed by autosave(), so no manual call is necessary
                 codeFile.autosave(withImplicitCancellability: false) { error in
                     if let error {
                         CodeFileDocument.logger.error("Failed to autosave document, error: \(error)")
-                    } else {
-                        codeFile.updateChangeCount(.changeCleared)
                     }
                 }
             }

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

@@ -165,7 +165,7 @@ extension FindNavigatorListViewController: NSOutlineViewDelegate {
     func outlineView(_ outlineView: NSOutlineView, viewFor tableColumn: NSTableColumn?, item: Any) -> NSView? {
         guard let tableColumn else { return nil }
         if let item = item as? SearchResultMatchModel {
-            let frameRect = NSRect(x: 0, y: 0, width: tableColumn.width, height: CGFloat.greatestFiniteMagnitude)
+            let frameRect = NSRect(x: 0, y: 0, width: tableColumn.width, height: outlineView.rowHeight)
             return FindNavigatorListMatchCell(frame: frameRect, matchItem: item)
         } else {
             let frameRect = NSRect(

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

@@ -20,7 +20,7 @@ final class FindNavigatorListMatchCell: NSTableCellView {
             x: frame.origin.x,
             y: frame.origin.y,
             width: frame.width,
-            height: CGFloat.greatestFiniteMagnitude
+            height: frame.height
         ))
 
         // Create the label

CodeEdit/Features/NavigatorArea/OutlineView/FileSystemTableViewCell.swift

@@ -46,55 +46,45 @@ class FileSystemTableViewCell: StandardTableViewCell {
         imageView?.contentTintColor = color(for: item)
 
         let fileName = item.labelFileName()
+        let fontSize = textField?.font?.pointSize ?? 12
 
-        guard let navigatorFilter else {
+        guard let filter = navigatorFilter?.trimmingCharacters(in: .whitespacesAndNewlines), !filter.isEmpty else {
             textField?.stringValue = fileName
             return
         }
 
-        // Apply bold style if the filename matches the workspace filter
-        if !navigatorFilter.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-            let attributedString = NSMutableAttributedString(string: fileName)
-
-            // Check if the filename contains the filter text
-            let range = NSString(string: fileName).range(of: navigatorFilter, options: .caseInsensitive)
-            if range.location != NSNotFound {
-                // Set the label color to secondary
-                attributedString.addAttribute(
-                    .foregroundColor,
-                    value: NSColor.secondaryLabelColor,
-                    range: NSRange(location: 0, length: attributedString.length)
-                )
-
-                // If the filter text matches, bold the matching text and set primary label color
-                attributedString.addAttributes(
-                    [
-                        .font: NSFont.boldSystemFont(ofSize: textField?.font?.pointSize ?? 12),
-.foregroundColor: NSColor.labelColor
-                    ],
-                    range: range
-                )
-            } else {
-                // If no match, apply primary label color for parent folder,
-                // or secondary label color for a non-matching file
-                attributedString.addAttribute(
-                    .foregroundColor,
-                    value: item.isFolder ? NSColor.labelColor : NSColor.secondaryLabelColor,
-                    range: NSRange(location: 0, length: attributedString.length)
-                )
-            }
-
-            textField?.attributedStringValue = attributedString
-        } else {
-            // If no filter is applied, reset to normal font and primary label color
-            textField?.attributedStringValue = NSAttributedString(
-                string: fileName,
-                attributes: [
-                    .font: NSFont.systemFont(ofSize: textField?.font?.pointSize ?? 12),
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineBreakMode = .byTruncatingMiddle
+
+        /// Initialize default attributes
+        let attributedString = NSMutableAttributedString(string: fileName, attributes: [
+            .paragraphStyle: paragraphStyle,
+            .font: NSFont.systemFont(ofSize: fontSize),
+            .foregroundColor: NSColor.secondaryLabelColor
+        ])
+
+        /// Check if the filename contains the filter text
+        let range = (fileName as NSString).range(of: filter, options: .caseInsensitive)
+        if range.location != NSNotFound {
+            /// If the filter text matches, bold the matching text and set primary label color
+            attributedString.addAttributes(
+                [
+                    .font: NSFont.boldSystemFont(ofSize: fontSize),
                     .foregroundColor: NSColor.labelColor
-                ]
+                ],
+                range: range
+            )
+        } else {
+            /// If no match, apply primary label color for parent folder,
+            /// or secondary label color for a non-matching file
+            attributedString.addAttribute(
+                .foregroundColor,
+                value: item.isFolder ? NSColor.labelColor : NSColor.secondaryLabelColor,
+                range: NSRange(location: 0, length: attributedString.length)
             )
         }
+
+        textField?.attributedStringValue = attributedString
     }
 
     func addModel() {

README.md

@@ -191,6 +191,7 @@ For issues we want to focus on that are most relevant at any given time, please
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/scaredcr6w"><img src="https://avatars.githubusercontent.com/u/85457088?v=4?s=100" width="100px;" alt="Levente Anda"/><br /><sub><b>Levente Anda</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/commits?author=scaredcr6w" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://nobelliu.github.com"><img src="https://avatars.githubusercontent.com/u/10796646?v=4?s=100" width="100px;" alt="Nobel"/><br /><sub><b>Nobel</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/commits?author=NobelLiu" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SavelyUkuren"><img src="https://avatars.githubusercontent.com/u/125015568?v=4?s=100" width="100px;" alt="Savely"/><br /><sub><b>Savely</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/commits?author=SavelyUkuren" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Kihron"><img src="https://avatars.githubusercontent.com/u/30128800?v=4?s=100" width="100px;" alt="Kihron"/><br /><sub><b>Kihron</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/issues?q=author%3AKihron" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>