From 06d7b494aa1606db95cdbe0165064430e8cbfb60 Mon Sep 17 00:00:00 2001
From: Matt Kiazyk <mattkiazyk@gmail.com>
Date: Fri, 8 Oct 2021 16:22:12 -0500
Subject: [PATCH] PR review cleanup

---
 Xcodes/Backend/AppState.swift | 20 ++++++++++----------
 Xcodes/Backend/Xcode.swift    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Xcodes/Backend/AppState.swift b/Xcodes/Backend/AppState.swift
index 41c1464..b1d0dc3 100644
--- a/Xcodes/Backend/AppState.swift
+++ b/Xcodes/Backend/AppState.swift
@@ -368,11 +368,11 @@ class AppState: ObservableObject {
     // MARK: - Uninstall
     func uninstall(xcode: Xcode) {
         guard
-            let installedXcode = xcode.installPath,
+            let installedXcodePath = xcode.installedPath,
             uninstallPublisher == nil
         else { return }
         
-        uninstallPublisher = uninstallXcode(path: installedXcode)
+        uninstallPublisher = uninstallXcode(path: installedXcodePath)
             .flatMap { [unowned self] _ in
                 self.updateSelectedXcodePath()
             }
@@ -390,8 +390,8 @@ class AppState: ObservableObject {
     
     func reveal(xcode: Xcode) {
         // TODO: show error if not
-        guard let installedXcode = xcode.installPath else { return }
-        NSWorkspace.shared.activateFileViewerSelecting([installedXcode.url])
+        guard let installedXcodePath = xcode.installedPath else { return }
+        NSWorkspace.shared.activateFileViewerSelecting([installedXcodePath.url])
     }
 
     /// Make an Xcode active, a.k.a select it, in the `xcode-select` sense.
@@ -417,13 +417,13 @@ class AppState: ObservableObject {
         }
 
         guard
-            let installedXcode = xcode.installPath,
-            uninstallPublisher == nil
+            let installedXcodePath = xcode.installedPath,
+            selectPublisher == nil
         else { return }
        
         selectPublisher = installHelperIfNecessary()
             .flatMap {
-                Current.helper.switchXcodePath(installedXcode.string)
+                Current.helper.switchXcodePath(installedXcodePath.string)
             }
             .flatMap { [unowned self] _ in
                 self.updateSelectedXcodePath()
@@ -451,11 +451,11 @@ class AppState: ObservableObject {
     }
     
     func copyPath(xcode: Xcode) {
-        guard let installedXcode = xcode.installPath else { return }
+        guard let installedXcodePath = xcode.installedPath else { return }
         
         NSPasteboard.general.declareTypes([.URL, .string], owner: nil)
-        NSPasteboard.general.writeObjects([installedXcode.url as NSURL])
-        NSPasteboard.general.setString(installedXcode.string, forType: .string)
+        NSPasteboard.general.writeObjects([installedXcodePath.url as NSURL])
+        NSPasteboard.general.setString(installedXcodePath.string, forType: .string)
     }
 
     func updateAllXcodes(availableXcodes: [AvailableXcode], installedXcodes: [InstalledXcode], selectedXcodePath: String?) {
diff --git a/Xcodes/Backend/Xcode.swift b/Xcodes/Backend/Xcode.swift
index 0e724cc..603e35d 100644
--- a/Xcodes/Backend/Xcode.swift
+++ b/Xcodes/Backend/Xcode.swift
@@ -59,7 +59,7 @@ struct Xcode: Identifiable, CustomStringConvertible {
         }
     }
     
-    var installPath: Path? {
+    var installedPath: Path? {
         switch installState {
             case .installed(let path):
                 return path