Add Confirmation UI, Clean up ListRows

Author: thecoolwinter

CodeEdit/Features/LSP/Registry/PackageManagers/Install/PackageManagerInstallOperation.swift

@@ -20,13 +20,21 @@ final class PackageManagerInstallOperation: ObservableObject, Identifiable {
     let package: RegistryItem
     let steps: [PackageManagerInstallStep]
 
+    var currentStep: PackageManagerInstallStep? {
+        steps[safe: currentStepIdx]
+    }
+
     @Published var accumulatedOutput: [OutputItem] = []
-    @Published var currentStep: Int = 0
+    @Published var currentStepIdx: Int = 0
     @Published var error: Error?
     @Published var progress: Progress
 
+    /// If non-nil, indicates that this operation has halted and requires confirmation.
+    @Published public private(set) var waitingForConfirmation: String?
+
     private let shellClient: ShellClient = .live()
     private var operationTask: Task<Void, Error>?
+    private var confirmationContinuation: CheckedContinuation<Void, Never>?
 
     init(package: RegistryItem, steps: [PackageManagerInstallStep]) {
         self.package = package
@@ -44,14 +52,37 @@ final class PackageManagerInstallOperation: ObservableObject, Identifiable {
 
     func cancel() {
         operationTask?.cancel()
+        operationTask = nil
+    }
+
+    /// Called by UI to confirm continuing to the next step
+    func confirmCurrentStep() {
+        waitingForConfirmation = nil
+        confirmationContinuation?.resume()
+        confirmationContinuation = nil
+    }
+
+    private func waitForConfirmation(message: String) async {
+        waitingForConfirmation = message
+        await withCheckedContinuation { [weak self] (continuation: CheckedContinuation<Void, Never>) in
+            self?.confirmationContinuation = continuation
+        }
     }
 
     private func runNext() async throws {
-        guard currentStep < steps.count, error == nil else {
+        guard currentStepIdx < steps.count, error == nil else {
             return
         }
 
-        let task = steps[currentStep]
+        let task = steps[currentStepIdx]
+
+        switch task.confirmation {
+        case .required(let message):
+            await waitForConfirmation(message: message)
+        case .none:
+            break
+        }
+
         let model = PackageManagerProgressModel(shellClient: shellClient)
         progress.addChild(model.progress, withPendingUnitCount: 1)
 
@@ -78,7 +109,7 @@ final class PackageManagerInstallOperation: ObservableObject, Identifiable {
             }
         }
 
-        self.currentStep += 1
+        self.currentStepIdx += 1
 
         try Task.checkCancellation()
         if let error {

CodeEdit/Features/LSP/Registry/PackageManagers/Sources/GithubPackageManager.swift

@@ -100,7 +100,7 @@ final class GithubPackageManager: PackageManagerProtocol {
     ) -> PackageManagerInstallStep {
         PackageManagerInstallStep(
             name: "Download Binary Executable",
-            confirmation: .required(message: "Downloading binary from:\n\(url)")
+            confirmation: .none
         ) { model in
             do {
                 await model.status("Downloading \(url)")

CodeEdit/Features/LSP/Registry/RegistryItem.swift

@@ -18,6 +18,36 @@ struct RegistryItem: Codable {
     let source: Source
     let bin: [String: String]?
 
+    var sanitizedName: String {
+        name.replacingOccurrences(of: "-", with: " ")
+            .replacingOccurrences(of: "_", with: " ")
+            .split(separator: " ")
+            .map { word -> String in
+                let str = String(word).lowercased()
+                // Check for special cases
+                if str == "ls" || str == "lsp" || str == "ci" || str == "cli" {
+                    return str.uppercased()
+                }
+                return str.capitalized
+            }
+            .joined(separator: " ")
+    }
+
+    var sanitizedDescription: String {
+        description.replacingOccurrences(of: "\n", with: " ")
+    }
+
+    var homepageURL: URL? {
+        URL(string: homepage)
+    }
+
+    /// A pretty version of the homepage URL.
+    /// Removes the schema (eg https) and leaves the path and domain.
+    var homepagePretty: String {
+        guard let homepageURL else { return homepage }
+        return (homepageURL.host(percentEncoded: false) ?? "") + homepageURL.path(percentEncoded: false)
+    }
+
     /// The method for installation, parsed from this item's ``source-swift.property`` parameter.
     var installMethod: InstallationMethod? {
         let sourceId = source.id

CodeEdit/Features/LSP/Registry/RegistryManager.swift

@@ -138,23 +138,17 @@ final class RegistryManager: ObservableObject {
             do {
                 try await operation.run()
             } catch {
-
-                await MainActor.run { [weak self] in
-                    self?.updateActivityViewer(operation.package.name, activityTitle, fail: true)
-                }
+                self?.updateActivityViewer(operation.package.name, activityTitle, fail: true)
                 return
             }
 
             guard !Task.isCancelled else { return }
-            // Update settings on the main thread
-            await MainActor.run { [weak self] in
-                self?.installedLanguageServers[operation.package.name] = .init(
-                    packageName: operation.package.name,
-                    isEnabled: true,
-                    version: method.version ?? ""
-                )
-                self?.updateActivityViewer(operation.package.name, activityTitle, fail: false)
-            }
+            self?.installedLanguageServers[operation.package.name] = .init(
+                packageName: operation.package.name,
+                isEnabled: true,
+                version: method.version ?? ""
+            )
+            self?.updateActivityViewer(operation.package.name, activityTitle, fail: false)
         }
     }
 

CodeEdit/Features/Settings/Pages/Extensions/LanguageServerInstallView.swift

@@ -8,47 +8,136 @@
 import SwiftUI
 
 struct LanguageServerInstallView: View {
+    @Environment(\.dismiss)
+    var dismiss
+    @EnvironmentObject private var registryManager: RegistryManager
+
     @ObservedObject var operation: PackageManagerInstallOperation
 
     var body: some View {
-        VStack(alignment: .leading) {
-            Text("Installing: " + operation.package.name)
-                .font(.title)
-            ProgressView(operation.progress)
-                .progressViewStyle(.linear)
+        VStack(spacing: 0) {
+            formContent
+            Divider()
+            footer
+        }
+        .constrainHeightToWindow()
+        .alert(
+            "Confirm Step",
+            isPresented: Binding(get: { operation.waitingForConfirmation != nil }, set: { _ in }),
+            presenting: operation.waitingForConfirmation
+        ) { _ in
+            Button("Cancel") {
+                registryManager.cancelInstallation()
+            }
+            Button("Continue") {
+                operation.confirmCurrentStep()
+            }
+        } message: { confirmationMessage in
+            Text(confirmationMessage)
+        }
+    }
 
+    @ViewBuilder private var formContent: some View {
+        Form {
+            packageInfoSection
             if let error = operation.error {
-                VStack(alignment: .leading) {
+                Section {
                     HStack(spacing: 0) {
                         Image(systemName: "exclamationmark.octagon.fill").foregroundColor(.red)
                         Text("Error Occurred")
                     }
                     .font(.title3)
                     ErrorDescriptionLabel(error: error)
                 }
-                .overlay { RoundedRectangle(cornerRadius: 8).stroke(.separator) }
             }
+            progressSection
+            outputSection
+        }
+        .formStyle(.grouped)
+    }
 
-            VStack {
-                ScrollViewReader { proxy in
-                    List(operation.accumulatedOutput) { line in
-                        HStack(spacing: 0) {
-                            Text(line.contents)
-                                .font(.caption.monospaced())
-                            Spacer(minLength: 0)
-                        }
-                    }
-                    .listStyle(.plain)
-                    .listRowSeparator(.hidden)
-                    .onReceive(operation.$accumulatedOutput) { output in
-                        proxy.scrollTo(output.last?.id)
-                    }
+    @ViewBuilder private var footer: some View {
+        HStack {
+            Spacer()
+            if operation.currentStep != nil {
+                Button {
+                    registryManager.cancelInstallation()
+                    dismiss()
+                } label: {
+                    Text("Cancel")
+                        .frame(minWidth: 56)
                 }
+                .buttonStyle(.bordered)
+            } else {
+                Button {
+                    dismiss()
+                } label: {
+                    Text("Continue")
+                        .frame(minWidth: 56)
+                }
+                .buttonStyle(.borderedProminent)
             }
-            .frame(height: 250)
-            .overlay { RoundedRectangle(cornerRadius: 8).stroke(.separator) }
         }
-        .frame(maxWidth: .infinity)
         .padding()
     }
+
+    @ViewBuilder private var packageInfoSection: some View {
+        Section {
+            LabeledContent("Installing Package", value: operation.package.sanitizedName)
+            LabeledContent("Source") {
+                sourceButton
+            }
+            Text(operation.package.sanitizedDescription)
+                .multilineTextAlignment(.leading)
+                .foregroundColor(.secondary)
+                .labelsHidden()
+        }
+    }
+
+    @ViewBuilder private var sourceButton: some View {
+        if #available(macOS 14.0, *) {
+            Button(operation.package.homepagePretty) {
+                guard let homepage = operation.package.homepageURL else { return }
+                NSWorkspace.shared.open(homepage)
+            }
+            .buttonStyle(.plain)
+            .foregroundColor(Color(NSColor.linkColor))
+            .focusEffectDisabled()
+        } else {
+            Button(operation.package.homepagePretty) {
+                guard let homepage = operation.package.homepageURL else { return }
+                NSWorkspace.shared.open(homepage)
+            }
+            .buttonStyle(.plain)
+            .foregroundColor(Color(NSColor.linkColor))
+        }
+    }
+
+    @ViewBuilder private var progressSection: some View {
+        Section {
+            LabeledContent("Step", value: operation.currentStep?.name ?? "Finished")
+            ProgressView(operation.progress)
+                .progressViewStyle(.linear)
+        }
+    }
+
+    @ViewBuilder private var outputSection: some View {
+        Section {
+            ScrollViewReader { proxy in
+                List(operation.accumulatedOutput) { line in
+                    HStack(spacing: 0) {
+                        Text(line.contents)
+                            .font(.caption.monospaced())
+                        Spacer(minLength: 0)
+                    }
+                }
+                .listStyle(.plain)
+                .listRowSeparator(.hidden)
+                .onReceive(operation.$accumulatedOutput) { output in
+                    proxy.scrollTo(output.last?.id)
+                }
+            }
+            .frame(height: 350)
+        }
+    }
 }