Revert To Option-Alternate Items

Author: thecoolwinter

CodeEdit/Features/Welcome/Model/RecentProjectsStore.swift

@@ -39,7 +39,7 @@ enum RecentProjectsStore {
         }
 
         // Limit list to to 100 items after de-duplication
-        UserDefaults.standard.setValue(paths.prefix(100), forKey: defaultsKey)
+        UserDefaults.standard.setValue(Array(paths.prefix(100)), forKey: defaultsKey)
         donateSearchableItems()
         NotificationCenter.default.post(name: Self.didUpdateNotification, object: nil)
     }

CodeEdit/Features/WindowCommands/Utils/RecentProjectsMenu.swift

@@ -24,28 +24,29 @@ class RecentProjectsMenu: NSObject {
             primaryItem.image = icon
             primaryItem.representedObject = projectPath
 
-//            let alternateTitle = NSMutableAttributedString(
-//                string: projectPath.lastPathComponent + " ", attributes: [.foregroundColor: NSColor.labelColor]
-//            )
-//            alternateTitle.append(NSAttributedString(
-//                string: path,
-//                attributes: [.foregroundColor: NSColor.secondaryLabelColor]
-//            ))
-//
-//            let alternateItem = NSMenuItem(
-//                title: "",
-//                action: #selector(recentProjectItemClicked(_:)),
-//                keyEquivalent: ""
-//            )
-//            alternateItem.attributedTitle = alternateTitle
-//            alternateItem.target = self
-//            alternateItem.image = icon
-//            alternateItem.representedObject = projectPath
-//            alternateItem.isAlternate = true
-//            alternateItem.keyEquivalentModifierMask = [.option]
+            let parentPath = projectPath.deletingLastPathComponent().path(percentEncoded: false).abbreviatingWithTildeInPath()
+            let alternateTitle = NSMutableAttributedString(
+                string: projectPath.lastPathComponent + " ", attributes: [.foregroundColor: NSColor.labelColor]
+            )
+            alternateTitle.append(NSAttributedString(
+                string: parentPath,
+                attributes: [.foregroundColor: NSColor.secondaryLabelColor]
+            ))
+
+            let alternateItem = NSMenuItem(
+                title: "",
+                action: #selector(recentProjectItemClicked(_:)),
+                keyEquivalent: ""
+            )
+            alternateItem.attributedTitle = alternateTitle
+            alternateItem.target = self
+            alternateItem.image = icon
+            alternateItem.representedObject = projectPath
+            alternateItem.isAlternate = true
+            alternateItem.keyEquivalentModifierMask = [.option]
 
             menu.addItem(primaryItem)
-//            menu.addItem(alternateItem)
+            menu.addItem(alternateItem)
         }
 
         menu.addItem(NSMenuItem.separator())
@@ -77,80 +78,4 @@ class RecentProjectsMenu: NSObject {
     func clearMenuItemClicked(_ sender: NSMenuItem) {
         RecentProjectsStore.clearList()
     }
-
-    private func duplicateProjectMenuItem(_ projectPath: URL) -> NSMenuItem {
-        let item = NSMenuItem()
-        let stack = NSStackView()
-        stack.orientation = .horizontal
-        stack.spacing = 8
-
-        let icon = NSImageView(image: NSWorkspace.shared.icon(forFile: projectPath.path()))
-        icon.frame.size = NSSize(width: 16, height: 16)
-        let title = NSTextField(labelWithString: projectPath.lastPathComponent)
-
-        let separator = NSTextField(labelWithString: "⎯")
-
-        let projectParent = projectPath.deletingLastPathComponent()
-
-        let secondaryIcon = NSImageView(image: NSWorkspace.shared.icon(forFile: projectParent.path()))
-        secondaryIcon.frame.size = NSSize(width: 16, height: 16)
-        let secondaryTitle = NSTextField(
-            labelWithString: projectParent.path(percentEncoded: false).abbreviatingWithTildeInPath()
-        )
-
-        stack.addArrangedSubview(icon)
-        stack.addArrangedSubview(title)
-        stack.addArrangedSubview(secondaryIcon)
-        stack.addArrangedSubview(secondaryTitle)
-
-        item.view = stack
-
-        return item
-    }
 }
-
-//struct RecentProjectsMenu: View {
-//    @State private var recentProjects: [URL] = []
-//    @State private var controlKeyPressed: Bool = false
-//
-//    var body: some View {
-//        Group {
-//            ForEach(recentProjects, id: \.self) { url in
-//                Button {
-//                    NSDocumentController.shared.openDocument(
-//                        withContentsOf: url,
-//                        display: true,
-//                        completionHandler: { _, _, _ in }
-//                    )
-//                } label: {
-//                    RecentProjectMenuItem(
-//                        projectPath: url,
-//                        controlKeyPressed: controlKeyPressed
-////                        hasDuplicate: recentProjects.contains(where: {
-////                            $0 != url && $0.lastPathComponent == url.lastPathComponent
-////                        })
-//                    )
-//                }
-//            }
-//            Divider()
-//            Button {
-//                RecentProjectsStore.clearList()
-//            } label: {
-//                Text("Clear Recent Menu")
-//            }
-//        }
-//        .onAppear {
-//            updateProjects()
-//        }
-//        .onReceive(NotificationCenter.default.publisher(for: RecentProjectsStore.didUpdateNotification)) { _ in
-//            updateProjects()
-//        }
-//        .onReceive(NSEvent.publisher(scope: .local, matching: .flagsChanged)) { output in
-//            controlKeyPressed = output.modifierFlags.contains(.control)
-//        }
-//    }
-//
-//    private func updateProjects() {
-//        recentProjects = Array(RecentProjectsStore.recentProjectURLs().prefix(10))
-//    }
-//}

CodeEdit/Features/WindowCommands/Utils/WindowControllerPropertyWrapper.swift

@@ -42,7 +42,9 @@ struct UpdatingWindowController: DynamicProperty {
         private var activeEditorCancellable: AnyCancellable?
 
         init() {
-            windowCancellable = NSApp.publisher(for: \.keyWindow).sink { [weak self] window in
+            windowCancellable = NSApp.publisher(for: \.keyWindow).receive(on: RunLoop.main).sink { [weak self] window in
+                // Fix an issue where NSMenuItems with custom views would trigger this callback.
+                guard window?.className != "NSPopupMenuWindow" else { return }
                 self?.setNewController(window?.windowController as? CodeEditWindowController)
             }
         }