mru -> mostRecent

nikitabobko · Sep 17, 2023 · d06b949 · d06b949
1 parent 162830b
commit d06b949
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/command/FocusCommand.swift b/src/command/FocusCommand.swift
@@ -12,7 +12,7 @@ struct FocusCommand: Command {
 
     func run() async {
         precondition(Thread.current.isMainThread)
-        guard let window = NSWorkspace.focusedApp?.macApp?.focusedWindow ?? Workspace.focused.mruWindows.mru else { return }
+        guard let window = NSWorkspace.focusedApp?.macApp?.focusedWindow ?? Workspace.focused.mruWindows.mostRecent else { return }
         if let direction = direction.direction {
             let orientation = direction.orientation
             guard let topMostChild = window.parentsWithSelf.lazy.first(where: {

diff --git a/src/command/WorkspaceCommand.swift b/src/command/WorkspaceCommand.swift
@@ -9,7 +9,7 @@ struct WorkspaceCommand : Command {
     static func switchToWorkspace(_ workspace: Workspace) {
         debug("Switch to workspace: \(workspace.name)")
         refresh(endSession: false)
-        if let window = workspace.mruWindows.mru ?? workspace.anyLeafWindowRecursive { // switch to not empty workspace
+        if let window = workspace.mruWindows.mostRecent ?? workspace.anyLeafWindowRecursive { // switch to not empty workspace
             window.focus()
             // The switching itself will be done by refreshWorkspaces and layoutWorkspaces later in refresh
         } else { // switch to empty workspace

diff --git a/src/tree/MacWindow.swift b/src/tree/MacWindow.swift
@@ -49,7 +49,7 @@ class MacWindow: TreeNode, Hashable {
                 parent = workspace
                 weight = FLOATING_ADAPTIVE_WEIGHT
             } else {
-                let tilingParent = workspace.mruWindows.mru?.parent as? TilingContainer ?? workspace.rootTilingContainer
+                let tilingParent = workspace.mruWindows.mostRecent?.parent as? TilingContainer ?? workspace.rootTilingContainer
                 parent = tilingParent
                 weight = parent.children.sumOf { $0.getWeight(tilingParent.orientation) }
                         .div(parent.children.count) ?? 1

diff --git a/src/util/MruStack.swift b/src/util/MruStack.swift
@@ -9,7 +9,7 @@ struct MruStack<T: Equatable>: Sequence {
         MruStackIterator(mruNode)
     }
 
-    var mru: T? { mruNode?.value }
+    var mostRecent: T? { mruNode?.value }
 
     mutating func pushOrRaise(_ value: T) {
         remove(value)