Refactors, added text icon colors

Author: FastestMolasses

CodeEdit/Features/LSP/Registry/RegistryManager.swift

@@ -9,8 +9,8 @@ import Combine
 import Foundation
 import ZIPFoundation
 
-let homeDirectory = FileManager.default.homeDirectoryForCurrentUser
-let installPath = homeDirectory
+private let homeDirectory = FileManager.default.homeDirectoryForCurrentUser
+private let installPath = homeDirectory
     .appending(path: "Library")
     .appending(path: "Application Support")
     .appending(path: "CodeEdit")
@@ -56,7 +56,7 @@ final class RegistryManager {
         return []
     }
 
-    @AppSettings(\.extensions.installedLanguageServers)
+    @AppSettings(\.languageServers.installedLanguageServers)
     var installedLanguageServers: [String: SettingsData.InstalledLanguageServer]
 
     deinit {
@@ -169,7 +169,7 @@ final class RegistryManager {
                 return true
             }
             let hoursSinceLastUpdate = Date().timeIntervalSince(modificationDate) / 3600
-            return hoursSinceLastUpdate > 24
+            return hoursSinceLastUpdate >= 24
         }()
 
         if needsUpdate {

CodeEdit/Features/Settings/Models/SettingsData.swift

@@ -50,8 +50,8 @@ struct SettingsData: Codable, Hashable {
     /// Search Settings
     var search: SearchSettings = .init()
 
-    /// Extension Settings
-    var extensions: ExtensionSettings = .init()
+    /// Language Server Settings
+    var languageServers: LanguageServerSettings = .init()
 
     /// Developer settings for CodeEdit developers
     var developerSettings: DeveloperSettings = .init()
@@ -77,8 +77,8 @@ struct SettingsData: Codable, Hashable {
             KeybindingsSettings.self,
             forKey: .keybindings
         ) ?? .init()
-        self.extensions = try container.decodeIfPresent(
-            ExtensionSettings.self, forKey: .extensions
+        self.languageServers = try container.decodeIfPresent(
+            LanguageServerSettings.self, forKey: .languageServers
         ) ?? .init()
         self.developerSettings = try container.decodeIfPresent(
             DeveloperSettings.self, forKey: .developerSettings
@@ -108,8 +108,8 @@ struct SettingsData: Codable, Hashable {
             sourceControl.searchKeys.forEach { settings.append(.init(name, isSetting: true, settingName: $0)) }
         case .location:
             LocationsSettings().searchKeys.forEach { settings.append(.init(name, isSetting: true, settingName: $0)) }
-        case .extensions:
-            ExtensionSettings().searchKeys.forEach { settings.append(.init(name, isSetting: true, settingName: $0)) }
+        case .languageServers:
+            LanguageServerSettings().searchKeys.forEach { settings.append(.init(name, isSetting: true, settingName: $0)) }
         case .developer:
             developerSettings.searchKeys.forEach { settings.append(.init(name, isSetting: true, settingName: $0)) }
         case .behavior: return [.init(name, settingName: "Error")]

CodeEdit/Features/Settings/Models/SettingsPage.swift

@@ -32,7 +32,7 @@ struct SettingsPage: Hashable, Equatable, Identifiable {
         case components = "Components"
         case location = "Locations"
         case advanced = "Advanced"
-        case extensions = "Language Servers"  // TODO: CHANGE NAME TO "Extensions" WHEN EXTENSIONS ARE IMPLEMENTED
+        case languageServers = "Language Servers"
         case developer = "Developer"
     }
 

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

@@ -7,10 +7,11 @@
 
 import SwiftUI
 
+private let iconSize: CGFloat = 26
+
 struct LanguageServerRowView: View, Equatable {
     let packageName: String
     let subtitle: String
-    let icon: String
     let onCancel: (() -> Void)
     let onInstall: (() async -> Void)
 
@@ -26,15 +27,13 @@ struct LanguageServerRowView: View, Equatable {
     init(
         packageName: String,
         subtitle: String,
-        icon: String,
         isInstalled: Bool = false,
         isEnabled: Bool = false,
         onCancel: @escaping (() -> Void),
         onInstall: @escaping () async -> Void
     ) {
         self.packageName = packageName
         self.subtitle = subtitle
-        self.icon = icon
         self.isInstalled = isInstalled
         self.isEnabled = isEnabled
         self.onCancel = onCancel
@@ -68,14 +67,7 @@ struct LanguageServerRowView: View, Equatable {
                         .truncationMode(.tail)
                 }
             } icon: {
-                Image(icon)
-                    .resizable()
-                    .aspectRatio(contentMode: .fill)
-                    .clipShape(RoundedRectangle(cornerRadius: 6))
-                    .frame(width: 26, height: 26)
-                    .padding(.top, 2)
-                    .padding(.bottom, 2)
-                    .padding(.leading, 2)
+                letterIcon()
             }
             .opacity(isInstalled && !isEnabled ? 0.5 : 1.0)
 
@@ -159,6 +151,32 @@ struct LanguageServerRowView: View, Equatable {
         }
     }
 
+    @ViewBuilder
+    private func letterIcon() -> some View {
+        RoundedRectangle(cornerRadius: iconSize / 4, style: .continuous)
+            .fill(background)
+            .overlay {
+                Text(String(cleanedTitle.first ?? Character("")))
+                    .font(.system(size: iconSize * 0.65))
+                    .foregroundColor(.primary)
+            }
+            .clipShape(RoundedRectangle(cornerRadius: iconSize / 4, style: .continuous))
+            .shadow(
+                color: Color(NSColor.black).opacity(0.25),
+                radius: iconSize / 40,
+                y: iconSize / 40
+            )
+            .frame(width: iconSize, height: iconSize)
+    }
+
+    private var background: AnyShapeStyle {
+        let colors: [Color] = [
+            .blue, .green, .orange, .red, .purple, .pink, .teal, .yellow, .indigo, .cyan
+        ]
+        let hashValue = abs(cleanedTitle.hashValue) % colors.count
+        return AnyShapeStyle(colors[hashValue].gradient)
+    }
+
     static func == (lhs: LanguageServerRowView, rhs: LanguageServerRowView) -> Bool {
         lhs.packageName == rhs.packageName && lhs.subtitle == rhs.subtitle
     }

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

@@ -28,7 +28,6 @@ struct LanguageServersView: View {
                         LanguageServerRowView(
                             packageName: item.name,
                             subtitle: item.description,
-                            icon: "GitHubIcon",
                             isInstalled: RegistryManager.shared.installedLanguageServers[item.name] != nil,
                             isEnabled: RegistryManager.shared.installedLanguageServers[item.name]?.isEnabled ?? false,
                             onCancel: { },

…xtensions/Models/ExtensionSettings.swift …ions/Models/LanguageServerSettings.swiftCodeEdit/Features/Settings/Pages/Extensions/Models/ExtensionSettings.swift renamed to CodeEdit/Features/Settings/Pages/Extensions/Models/LanguageServerSettings.swift CodeEdit/Features/Settings/Pages/Extensions/Models/ExtensionSettings.swift renamed to CodeEdit/Features/Settings/Pages/Extensions/Models/LanguageServerSettings.swift

@@ -1,5 +1,5 @@
 //
-//  ExtensionSettings.swift
+//  LanguageServerSettings.swift
 //  CodeEdit
 //
 //  Created by Abe Malla on 2/2/25.
@@ -8,13 +8,12 @@
 import Foundation
 
 extension SettingsData {
-    struct ExtensionSettings: Codable, Hashable, SearchableSettingsPage {
+    struct LanguageServerSettings: Codable, Hashable, SearchableSettingsPage {
 
         /// The search keys
         var searchKeys: [String] {
             [
-                "Extensions",
-                "Language Server",
+                "Language Servers",
                 "LSP Binaries",
                 "Linters",
                 "Formatters",

CodeEdit/Features/Settings/SettingsView.swift

@@ -87,7 +87,7 @@ struct SettingsView: View {
         ),
         .init(
             SettingsPage(
-                .extensions,
+                .languageServers,
                 baseColor: Color(hex: "#6A69DC"), // Purple
                 icon: .system("cube.box.fill")
             )
@@ -184,7 +184,7 @@ struct SettingsView: View {
                     SourceControlSettingsView()
                 case .location:
                     LocationsSettingsView()
-                case .extensions:
+                case .languageServers:
                     LanguageServersView()
                 case .developer:
                     DeveloperSettingsView()