From ecd03c8593ec0281bf734d07496a486e8f9cb744 Mon Sep 17 00:00:00 2001 From: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:12:50 -0500 Subject: [PATCH 1/2] Remove Extra Service --- .../Documents/WorkspaceDocument/WorkspaceDocument.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceDocument.swift b/CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceDocument.swift index 40f1276f9..6af153fae 100644 --- a/CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceDocument.swift +++ b/CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceDocument.swift @@ -13,8 +13,6 @@ import LanguageServerProtocol @objc(WorkspaceDocument) final class WorkspaceDocument: NSDocument, ObservableObject, NSToolbarDelegate { - @Service var lspService: LSPService - @Published var sortFoldersOnTop: Bool = true private var workspaceState: [String: Any] { From b22aa6d91e60305ea9790df383290aa61fc0bd48 Mon Sep 17 00:00:00 2001 From: Khan Winter <35942988+thecoolwinter@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:13:38 -0500 Subject: [PATCH 2/2] Remove Extra `internal` --- CodeEdit/Features/LSP/Service/LSPService.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CodeEdit/Features/LSP/Service/LSPService.swift b/CodeEdit/Features/LSP/Service/LSPService.swift index 03f2965df..095696bbd 100644 --- a/CodeEdit/Features/LSP/Service/LSPService.swift +++ b/CodeEdit/Features/LSP/Service/LSPService.swift @@ -99,7 +99,7 @@ import CodeEditLanguages /// ``` @MainActor final class LSPService: ObservableObject { - internal let logger: Logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "LSPService") + let logger: Logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "LSPService") struct ClientKey: Hashable, Equatable { let languageId: LanguageIdentifier @@ -112,14 +112,14 @@ final class LSPService: ObservableObject { } /// Holds the active language clients - internal var languageClients: [ClientKey: LanguageServer] = [:] + var languageClients: [ClientKey: LanguageServer] = [:] /// Holds the language server configurations for all the installed language servers - internal var languageConfigs: [LanguageIdentifier: LanguageServerBinary] = [:] + var languageConfigs: [LanguageIdentifier: LanguageServerBinary] = [:] /// Holds all the event listeners for each active language client - internal var eventListeningTasks: [ClientKey: Task] = [:] + var eventListeningTasks: [ClientKey: Task] = [:] @AppSettings(\.developerSettings.lspBinaries) - internal var lspBinaries + var lspBinaries init() { // Load the LSP binaries from the developer menu