Refactors, added settings loading

FastestMolasses · FastestMolasses · commit ee93abb5d680 · 2025-03-13T05:34:33.000-07:00
diff --git a/CodeEdit/Features/LSP/Registry/PackageManagerProtocol.swift b/CodeEdit/Features/LSP/Registry/PackageManagerProtocol.swift
@@ -19,7 +19,8 @@ protocol PackageManagerProtocol {
 extension PackageManagerProtocol {
     /// Creates the directory for the language server to be installed in
     internal func createDirectoryStructure(for packagePath: URL) throws {
-        if !FileManager.default.fileExists(atPath: packagePath.path) {
+        let decodedPath = packagePath.path.removingPercentEncoding ?? packagePath.path
+        if !FileManager.default.fileExists(atPath: decodedPath) {
             try FileManager.default.createDirectory(
                 at: packagePath,
                 withIntermediateDirectories: true,
@@ -145,6 +146,17 @@ enum InstallationMethod: Equatable {
         }
     }
 
+    var version: String? {
+        switch self {
+        case .standardPackage(let source),
+             .sourceBuild(let source, _),
+             .binaryDownload(let source, _):
+            return source.version
+        case .unknown:
+            return nil
+        }
+    }
+
     var packageManagerType: PackageManagerType? {
         switch self {
         case .standardPackage(let source),
diff --git a/CodeEdit/Features/LSP/Registry/PackageManagers/GolangPackageManager.swift b/CodeEdit/Features/LSP/Registry/PackageManagers/GolangPackageManager.swift
@@ -56,7 +56,7 @@ class GolangPackageManager: PackageManagerProtocol {
 
             // If there's a subpath, build the binary
             if let subpath = source.options["subpath"] {
-                let binPath = packagePath.appendingPathComponent("bin")
+                let binPath = packagePath.appending(path: "bin")
                 if !FileManager.default.fileExists(atPath: binPath.path) {
                     try FileManager.default.createDirectory(at: binPath, withIntermediateDirectories: true)
                 }
@@ -91,7 +91,7 @@ class GolangPackageManager: PackageManagerProtocol {
     func getBinaryPath(for package: String) -> String {
         let binPath = installationDirectory.appending(path: package).appending(path: "bin")
         let binaryName = package.components(separatedBy: "/").last ?? package
-        let specificBinPath = binPath.appendingPathComponent(binaryName).path
+        let specificBinPath = binPath.appending(path: binaryName).path
         if FileManager.default.fileExists(atPath: specificBinPath) {
             return specificBinPath
         }
@@ -117,7 +117,7 @@ class GolangPackageManager: PackageManagerProtocol {
 
     /// Clean up after a failed installation
     private func cleanupFailedInstallation(packagePath: URL) throws {
-        let goSumPath = packagePath.appendingPathComponent("go.sum")
+        let goSumPath = packagePath.appending(path: "go.sum")
         if FileManager.default.fileExists(atPath: goSumPath.path) {
             try FileManager.default.removeItem(at: goSumPath)
         }
diff --git a/CodeEdit/Features/LSP/Registry/PackageManagers/NPMPackageManager.swift b/CodeEdit/Features/LSP/Registry/PackageManagers/NPMPackageManager.swift
@@ -40,7 +40,7 @@ class NPMPackageManager: PackageManagerProtocol {
                 in: packagePath.path, ["npm init --yes --scope=codeedit"]
             )
 
-            let npmrcPath = packagePath.appendingPathComponent(".npmrc")
+            let npmrcPath = packagePath.appending(path: ".npmrc")
             if !FileManager.default.fileExists(atPath: npmrcPath.path) {
                 try "install-strategy=shallow".write(to: npmrcPath, atomically: true, encoding: .utf8)
             }
@@ -77,7 +77,7 @@ class NPMPackageManager: PackageManagerProtocol {
             print("Successfully installed \(source.name)@\(source.version)")
         } catch {
             print("Installation failed: \(error)")
-            let nodeModulesPath = packagePath.appendingPathComponent("node_modules").path
+            let nodeModulesPath = packagePath.appending(path: "node_modules").path
             try? FileManager.default.removeItem(atPath: nodeModulesPath)
             throw error
         }
@@ -89,7 +89,7 @@ class NPMPackageManager: PackageManagerProtocol {
             .appending(path: package)
             .appending(path: "node_modules")
             .appending(path: ".bin")
-        return binDirectory.appendingPathComponent(package).path
+        return binDirectory.appending(path: package).path
     }
 
     /// Checks if npm is installed
@@ -109,7 +109,7 @@ class NPMPackageManager: PackageManagerProtocol {
     /// Verify the installation was successful
     private func verifyInstallation(package: String, version: String) throws {
         let packagePath = installationDirectory.appending(path: package)
-        let packageJsonPath = packagePath.appendingPathComponent("package.json").path
+        let packageJsonPath = packagePath.appending(path: "package.json").path
 
         // Verify package.json contains the installed package
         guard let packageJsonData = FileManager.default.contents(atPath: packageJsonPath),
@@ -132,8 +132,8 @@ class NPMPackageManager: PackageManagerProtocol {
 
         // Verify the package exists in node_modules
         let packageDirectory = packagePath
-            .appendingPathComponent("node_modules")
-            .appendingPathComponent(package)
+            .appending(path: "node_modules")
+            .appending(path: package)
         guard FileManager.default.fileExists(atPath: packageDirectory.path) else {
             throw PackageManagerError.installationFailed("Package not found in node_modules")
         }
diff --git a/CodeEdit/Features/LSP/Registry/PackageManagers/PipPackageManager.swift b/CodeEdit/Features/LSP/Registry/PackageManagers/PipPackageManager.swift
@@ -28,7 +28,7 @@ class PipPackageManager: PackageManagerProtocol {
                 in: packagePath.path, ["python -m venv venv"]
             )
 
-            let requirementsPath = packagePath.appendingPathComponent("requirements.txt")
+            let requirementsPath = packagePath.appending(path: "requirements.txt")
             if !FileManager.default.fileExists(atPath: requirementsPath.path) {
                 try "# Package requirements\n".write(to: requirementsPath, atomically: true, encoding: .utf8)
             }
@@ -108,15 +108,15 @@ class PipPackageManager: PackageManagerProtocol {
 
     private func getPipCommand(in packagePath: URL) -> String {
         let venvPip = "venv/bin/pip"
-        return FileManager.default.fileExists(atPath: packagePath.appendingPathComponent(venvPip).path)
+        return FileManager.default.fileExists(atPath: packagePath.appending(path: venvPip).path)
             ? venvPip
             : "python -m pip"
     }
 
     /// Update the requirements.txt file with the installed package and extras
     private func updateRequirements(packagePath: URL) async throws {
         let pipCommand = getPipCommand(in: packagePath)
-        let requirementsPath = packagePath.appendingPathComponent("requirements.txt")
+        let requirementsPath = packagePath.appending(path: "requirements.txt")
 
         let freezeOutput = try await executeInDirectory(
             in: packagePath.path,
diff --git a/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+Cargo.swift b/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+Cargo.swift
@@ -9,7 +9,7 @@ extension PackageSourceParser {
     static func parseCargoPackage(_ entry: RegistryItem) -> InstallationMethod {
         // Format: pkg:cargo/PACKAGE@VERSION?PARAMS
         let pkgPrefix = "pkg:cargo/"
-        let sourceId = entry.source.id
+        let sourceId = entry.source.id.removingPercentEncoding ?? entry.source.id
         guard sourceId.hasPrefix(pkgPrefix) else { return .unknown }
 
         let pkgString = sourceId.dropFirst(pkgPrefix.count)
diff --git a/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+Gem.swift b/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+Gem.swift
@@ -9,7 +9,7 @@ extension PackageSourceParser {
     static func parseRubyGem(_ entry: RegistryItem) -> InstallationMethod {
         // Format: pkg:gem/PACKAGE@VERSION?PARAMS
         let pkgPrefix = "pkg:gem/"
-        let sourceId = entry.source.id
+        let sourceId = entry.source.id.removingPercentEncoding ?? entry.source.id
         guard sourceId.hasPrefix(pkgPrefix) else { return .unknown }
 
         let pkgString = sourceId.dropFirst(pkgPrefix.count)
diff --git a/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+Golang.swift b/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+Golang.swift
@@ -9,7 +9,7 @@ extension PackageSourceParser {
     static func parseGolangPackage(_ entry: RegistryItem) -> InstallationMethod {
         // Format: pkg:golang/PACKAGE@VERSION#SUBPATH?PARAMS
         let pkgPrefix = "pkg:golang/"
-        let sourceId = entry.source.id
+        let sourceId = entry.source.id.removingPercentEncoding ?? entry.source.id
         guard sourceId.hasPrefix(pkgPrefix) else { return .unknown }
 
         let pkgString = sourceId.dropFirst(pkgPrefix.count)
diff --git a/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+NPM.swift b/CodeEdit/Features/LSP/Registry/PackageSourceParser/PackageSourceParser+NPM.swift
@@ -9,7 +9,7 @@ extension PackageSourceParser {
     static func parseNpmPackage(_ entry: RegistryItem) -> InstallationMethod {
         // Format: pkg:npm/PACKAGE@VERSION?PARAMS
         let pkgPrefix = "pkg:npm/"
-        let sourceId = entry.source.id
+        let sourceId = entry.source.id.removingPercentEncoding ?? entry.source.id
         guard sourceId.hasPrefix(pkgPrefix) else { return .unknown }
 
         let pkgString = sourceId.dropFirst(pkgPrefix.count)
diff --git a/CodeEdit/Features/LSP/Registry/RegistryManager.swift b/CodeEdit/Features/LSP/Registry/RegistryManager.swift
@@ -11,10 +11,10 @@ import ZIPFoundation
 
 let homeDirectory = FileManager.default.homeDirectoryForCurrentUser
 let installPath = homeDirectory
-    .appendingPathComponent("Library")
-    .appendingPathComponent("Application Support")
-    .appendingPathComponent("CodeEdit")
-    .appendingPathComponent("extensions")
+    .appending(path: "Library")
+    .appending(path: "Application Support")
+    .appending(path: "CodeEdit")
+    .appending(path: "extensions")
 
 final class RegistryManager {
     static let shared: RegistryManager = .init()
@@ -56,6 +56,9 @@ final class RegistryManager {
         return []
     }
 
+    @AppSettings(\.extensions.installedLanguageServers)
+    var installedLanguageServers: [String: SettingsData.InstalledLanguageServer]
+
     deinit {
         cleanupTimer?.invalidate()
     }
@@ -114,12 +117,18 @@ final class RegistryManager {
         }
     }
 
-    static func installPackage(package entry: RegistryItem) async throws {
+    func installPackage(package entry: RegistryItem) async throws {
         let method = Self.parseRegistryEntry(entry)
         guard let manager = Self.createPackageManager(for: method) else {
             throw PackageManagerError.invalidConfiguration
         }
         try await manager.install(method: method)
+
+        installedLanguageServers[entry.name] = .init(
+            packageName: entry.name,
+            isEnabled: true,
+            version: method.version ?? ""
+        )
     }
 
     /// Attempts downloading from `url`, with error handling and a retry policy
diff --git a/CodeEdit/Features/Settings/Pages/Extensions/LanguageServerRowView.swift b/CodeEdit/Features/Settings/Pages/Extensions/LanguageServerRowView.swift
@@ -1,14 +1,14 @@
 //
-//  ExtensionsSettingsRowView.swift
+//  LanguageServerRowView.swift
 //  CodeEdit
 //
 //  Created by Abe Malla on 2/2/25.
 //
 
 import SwiftUI
 
-struct ExtensionsSettingsRowView: View, Equatable {
-    let title: String
+struct LanguageServerRowView: View, Equatable {
+    let packageName: String
     let subtitle: String
     let icon: String
     let onCancel: (() -> Void)
@@ -24,19 +24,23 @@ struct ExtensionsSettingsRowView: View, Equatable {
     @State private var installProgress: Double = 0.0
 
     init(
-        title: String,
+        packageName: String,
         subtitle: String,
         icon: String,
+        isInstalled: Bool = false,
+        isEnabled: Bool = false,
         onCancel: @escaping (() -> Void),
         onInstall: @escaping () async -> Void
     ) {
-        self.title = title
+        self.packageName = packageName
         self.subtitle = subtitle
         self.icon = icon
+        self.isInstalled = isInstalled
+        self.isEnabled = isEnabled
         self.onCancel = onCancel
         self.onInstall = onInstall
 
-        self.cleanedTitle = title
+        self.cleanedTitle = packageName
             .replacingOccurrences(of: "-", with: " ")
             .replacingOccurrences(of: "_", with: " ")
             .split(separator: " ")
@@ -46,8 +50,7 @@ struct ExtensionsSettingsRowView: View, Equatable {
                 if str == "ls" || str == "lsp" || str == "ci" || str == "cli" {
                     return str.uppercased()
                 }
-                // Normal capitalization for other words
-                return str.prefix(1).uppercased() + str.dropFirst()
+                return str.capitalized
             }
             .joined(separator: " ")
         self.cleanedSubtitle = subtitle.replacingOccurrences(of: "\n", with: " ")
@@ -88,57 +91,75 @@ struct ExtensionsSettingsRowView: View, Equatable {
     @ViewBuilder
     private func installationButton() -> some View {
         if isInstalled {
-            HStack {
-                if isHovering {
-                    Button {
-                        isInstalling = false
-                        isInstalled = false
-                    } label: {
-                        Text("Remove")
-                    }
-                }
-                Toggle("", isOn: $isEnabled)
-                    .toggleStyle(.switch)
-                    .controlSize(.small)
-                    .labelsHidden()
-            }
+            installedRow()
         } else if isInstalling {
-            ZStack {
-                CECircularProgressView(progress: installProgress)
-                    .frame(width: 20, height: 20)
+            isInstallingRow()
+        } else if isHovering {
+            isHoveringRow()
+        }
+    }
+
+    @ViewBuilder
+    private func installedRow() -> some View {
+        HStack {
+            if isHovering {
                 Button {
                     isInstalling = false
-                    onCancel()
+                    isInstalled = false
                 } label: {
-                    Image(systemName: "stop.fill")
-                        .font(.system(size: 8))
-                        .foregroundColor(.blue)
+                    Text("Remove")
                 }
-                .buttonStyle(.plain)
-                .contentShape(Rectangle())
             }
-        } else if isHovering {
-            Button {
-                isInstalling = true
-                withAnimation(.linear(duration: 3)) {
-                    installProgress = 0.75
-                }
-                Task {
-                    await onInstall()
-                    withAnimation(.linear(duration: 1)) {
-                        installProgress = 1.0
-                    }
-                    isInstalling = false
-                    isInstalled = true
-                    isEnabled = true
+            Toggle("", isOn: $isEnabled)
+                .onChange(of: isEnabled) { newValue in
+                    RegistryManager.shared.installedLanguageServers[packageName]?.isEnabled = newValue
                 }
+                .toggleStyle(.switch)
+                .controlSize(.small)
+                .labelsHidden()
+        }
+    }
+
+    @ViewBuilder
+    private func isInstallingRow() -> some View {
+        ZStack {
+            CECircularProgressView(progress: installProgress)
+                .frame(width: 20, height: 20)
+            Button {
+                isInstalling = false
+                onCancel()
             } label: {
-                Text("Install")
+                Image(systemName: "stop.fill")
+                    .font(.system(size: 8))
+                    .foregroundColor(.blue)
+            }
+            .buttonStyle(.plain)
+            .contentShape(Rectangle())
+        }
+    }
+
+    @ViewBuilder
+    private func isHoveringRow() -> some View {
+        Button {
+            isInstalling = true
+            withAnimation(.linear(duration: 3)) {
+                installProgress = 0.75
+            }
+            Task {
+                await onInstall()
+                withAnimation(.linear(duration: 1)) {
+                    installProgress = 1.0
+                }
+                isInstalling = false
+                isInstalled = true
+                isEnabled = true
             }
+        } label: {
+            Text("Install")
         }
     }
 
-    static func == (lhs: ExtensionsSettingsRowView, rhs: ExtensionsSettingsRowView) -> Bool {
-        lhs.title == rhs.title && lhs.subtitle == rhs.subtitle
+    static func == (lhs: LanguageServerRowView, rhs: LanguageServerRowView) -> Bool {
+        lhs.packageName == rhs.packageName && lhs.subtitle == rhs.subtitle
     }
 }
diff --git a/CodeEdit/Features/Settings/Pages/Extensions/LanguageServersView.swift b/CodeEdit/Features/Settings/Pages/Extensions/LanguageServersView.swift
diff --git a/CodeEdit/Features/Settings/Pages/Extensions/Models/ExtensionSettings.swift b/CodeEdit/Features/Settings/Pages/Extensions/Models/ExtensionSettings.swift
diff --git a/CodeEdit/Features/Settings/SettingsView.swift b/CodeEdit/Features/Settings/SettingsView.swift
