Merge branch 'lsp-use-workspace-files' into lsp/document-content-sync

CodeEditApp · Sep 18, 2024 · d1a0ec9 · d1a0ec9
2 parents ee18f87 + b22aa6d
commit d1a0ec9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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] {

diff --git 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<Void, Never>] = [:]
+ var eventListeningTasks: [ClientKey: Task<Void, Never>] = [:]
 
  @AppSettings(\.developerSettings.lspBinaries)
- internal var lspBinaries
+ var lspBinaries
 
  init() {
  // Load the LSP binaries from the developer menu