Skip to content

Commit db5327c

Browse files
committed
Revert languageServerURI Name Change
1 parent 4164d53 commit db5327c

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

CodeEdit/Features/Documents/CodeFileDocument/CodeFileDocument.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ final class CodeFileDocument: NSDocument, ObservableObject {
8383
return type
8484
}
8585

86-
/// Use when identifying documents globally on the user's computer, eg with a language server.
87-
var absolutePath: String? { fileURL?.absolutePath }
86+
/// A stable string to use when identifying documents with language servers.
87+
var languageServerURI: String? { fileURL?.absolutePath }
8888

8989
/// Specify options for opening the file such as the initial cursor positions.
9090
/// Nulled by ``CodeFileView`` on first load.

CodeEdit/Features/LSP/LanguageServer/Capabilities/LanguageServer+DocumentSync.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ extension LanguageServer {
111111
/// Helper function for grabbing a document's content from the main actor.
112112
@MainActor
113113
private func getIsolatedDocumentContent(_ document: CodeFileDocument) -> DocumentContent? {
114-
guard let uri = document.absolutePath,
114+
guard let uri = document.languageServerURI,
115115
let language = document.getLanguage().lspLanguage,
116116
let content = document.content?.string else {
117117
return nil

CodeEdit/Features/LSP/LanguageServer/LanguageServerFileMap.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class LanguageServerFileMap {
2727
// MARK: - Track & Remove Documents
2828

2929
func addDocument(_ document: CodeFileDocument, for server: LanguageServer) {
30-
guard let uri = document.absolutePath else { return }
30+
guard let uri = document.languageServerURI else { return }
3131
trackedDocuments.setObject(document, forKey: uri as NSString)
3232
trackedDocumentData[uri] = DocumentObject(
3333
uri: uri,
@@ -42,7 +42,7 @@ class LanguageServerFileMap {
4242
}
4343

4444
func removeDocument(for document: CodeFileDocument) {
45-
guard let uri = document.absolutePath else { return }
45+
guard let uri = document.languageServerURI else { return }
4646
removeDocument(for: uri)
4747
}
4848

@@ -54,7 +54,7 @@ class LanguageServerFileMap {
5454
// MARK: - Version Number Tracking
5555

5656
func incrementVersion(for document: CodeFileDocument) -> Int {
57-
guard let uri = document.absolutePath else { return 0 }
57+
guard let uri = document.languageServerURI else { return 0 }
5858
return incrementVersion(for: uri)
5959
}
6060

@@ -64,7 +64,7 @@ class LanguageServerFileMap {
6464
}
6565

6666
func documentVersion(for document: CodeFileDocument) -> Int? {
67-
guard let uri = document.absolutePath else { return nil }
67+
guard let uri = document.languageServerURI else { return nil }
6868
return documentVersion(for: uri)
6969
}
7070

@@ -75,7 +75,7 @@ class LanguageServerFileMap {
7575
// MARK: - Content Coordinator
7676

7777
func contentCoordinator(for document: CodeFileDocument) -> LSPContentCoordinator? {
78-
guard let uri = document.absolutePath else { return nil }
78+
guard let uri = document.languageServerURI else { return nil }
7979
return contentCoordinator(for: uri)
8080
}
8181

CodeEdit/Features/LSP/Service/LSPService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ final class LSPService: ObservableObject {
218218
do {
219219
try await languageServer.openDocument(document)
220220
} catch {
221-
let uri = await document.absolutePath
221+
let uri = await document.languageServerURI
222222
// swiftlint:disable:next line_length
223223
self.logger.error("Failed to close document: \(uri ?? "<NO URI>", privacy: .private), language: \(lspLanguage.rawValue). Error \(error)")
224224
}

0 commit comments

Comments
 (0)