Fix Bugs

thecoolwinter · thecoolwinter · commit 5edf93ffa41a · 2025-02-14T09:56:50.000-06:00
diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -376,6 +376,7 @@
 		6C1A7E942D5D557D001B951C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C5246732D1E612700F57F11 /* CodeEditSourceEditor */; };
 		6C1A7E962D5D5762001B951C /* LanguageServerDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1A7E952D5D5762001B951C /* LanguageServerDocument.swift */; };
 		6C1A7E9B2D5D5E0E001B951C /* LanguageServer+DocumentObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1A7E9A2D5D5E0E001B951C /* LanguageServer+DocumentObjects.swift */; };
+		6C1A7EA02D5F9BFB001B951C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C1A7E9F2D5F9BFB001B951C /* CodeEditSourceEditor */; };
 		6C1CC9982B1E770B0002349B /* AsyncFileIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1CC9972B1E770B0002349B /* AsyncFileIterator.swift */; };
 		6C1CC99B2B1E7CBC0002349B /* FindNavigatorIndexBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1CC99A2B1E7CBC0002349B /* FindNavigatorIndexBar.swift */; };
 		6C1F3DA22C18C55800F6DEF6 /* ShellIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1F3DA12C18C55800F6DEF6 /* ShellIntegrationTests.swift */; };
@@ -1372,6 +1373,7 @@
 				6C85BB402C2105ED00EB5DEF /* CodeEditKit in Frameworks */,
 				6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */,
 				58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */,
+				6C1A7EA02D5F9BFB001B951C /* CodeEditSourceEditor in Frameworks */,
 				6C147C4529A329350089B630 /* OrderedCollections in Frameworks */,
 				6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */,
 				6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */,
@@ -3892,6 +3894,7 @@
 				6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
 				6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
 				6C5246732D1E612700F57F11 /* CodeEditSourceEditor */,
+				6C1A7E9F2D5F9BFB001B951C /* CodeEditSourceEditor */,
 			);
 			productName = CodeEdit;
 			productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -3989,7 +3992,7 @@
 				303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
 				6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
 				6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
-				6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
+				6C1A7E9E2D5F9BFB001B951C /* XCLocalSwiftPackageReference "../CodeEditSourceEditor" */,
 			);
 			productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
 			projectDirPath = "";
@@ -5795,6 +5798,13 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		6C1A7E9E2D5F9BFB001B951C /* XCLocalSwiftPackageReference "../CodeEditSourceEditor" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ../CodeEditSourceEditor;
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCRemoteSwiftPackageReference section */
 		2816F592280CF50500DD548B /* XCRemoteSwiftPackageReference "CodeEditSymbols" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -5974,6 +5984,10 @@
 			package = 6C147C4329A329350089B630 /* XCRemoteSwiftPackageReference "swift-collections" */;
 			productName = OrderedCollections;
 		};
+		6C1A7E9F2D5F9BFB001B951C /* CodeEditSourceEditor */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = CodeEditSourceEditor;
+		};
 		6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */;
diff --git a/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/CodeEdit/Features/Documents/CodeFileDocument/CodeFileDocument.swift b/CodeEdit/Features/Documents/CodeFileDocument/CodeFileDocument.swift
@@ -212,5 +212,12 @@ final class CodeFileDocument: NSDocument, ObservableObject {
 
 extension CodeFileDocument: LanguageServerDocument {
     /// A stable string to use when identifying documents with language servers.
-    var languageServerURI: String? { fileURL?.absolutePath }
+    /// Needs to be a valid URI, so always returns with the `file://` prefix to indicate it's a file URI.
+    var languageServerURI: String? {
+        if let path = fileURL?.absolutePath {
+            return "file://" + path
+        } else {
+            return nil
+        }
+    }
 }
diff --git a/CodeEdit/Features/LSP/Features/DocumentSync/LSPContentCoordinator.swift b/CodeEdit/Features/LSP/Features/DocumentSync/LSPContentCoordinator.swift
@@ -28,7 +28,6 @@ class LSPContentCoordinator<DocumentType: LanguageServerDocument>: TextViewCoord
     }
 
     private var editedRange: LSPRange?
-    private var stream: AsyncStream<SequenceElement>?
     private var sequenceContinuation: AsyncStream<SequenceElement>.Continuation?
     private var task: Task<Void, Never>?
 
@@ -39,16 +38,17 @@ class LSPContentCoordinator<DocumentType: LanguageServerDocument>: TextViewCoord
     init(documentURI: String, languageServer: LanguageServer<DocumentType>) {
         self.documentURI = documentURI
         self.languageServer = languageServer
-        self.stream = AsyncStream { continuation in
-            self.sequenceContinuation = continuation
-        }
 
         setUpUpdatesTask()
     }
 
     func setUpUpdatesTask() {
         task?.cancel()
-        guard let stream else { return }
+        // Create this stream here so it's always set up when the text view is set up, rather than only once on init.
+        let stream = AsyncStream { continuation in
+            self.sequenceContinuation = continuation
+        }
+
         task = Task.detached { [weak self] in
             // Send edit events every 250ms
             for await events in stream.chunked(by: .repeating(every: .milliseconds(250), clock: .continuous)) {
diff --git a/CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenHighlightProvider.swift b/CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenHighlightProvider.swift
@@ -164,7 +164,9 @@ final class SemanticTokenHighlightProvider<
             return
         }
         let rawTokens = storage.getTokensFor(range: lspRange)
-        let highlights = tokenMap.decode(tokens: rawTokens, using: textView)
+        let highlights = tokenMap
+            .decode(tokens: rawTokens, using: textView)
+            .filter({ $0.capture != nil || !$0.modifiers.isEmpty })
         completion(.success(highlights))
     }
 }
diff --git a/CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenMap.swift b/CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenMap.swift
@@ -72,8 +72,6 @@ struct SemanticTokenMap: Sendable { // swiftlint:enable line_length
             let type = Int(token.type)
             let capture = tokenTypeMap.indices.contains(type) ? tokenTypeMap[type] : nil
 
-//            print(token.line, token.char, token.length, range, capture, modifiers.values)
-
             return HighlightRange(
                 range: range,
                 capture: capture,
diff --git a/CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenStorage/SemanticTokenStorage.swift b/CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenStorage/SemanticTokenStorage.swift
@@ -59,7 +59,6 @@ final class SemanticTokenStorage: GenericSemanticTokenStorage {
     }
 
     func setData(_ data: borrowing SemanticTokens) {
-        print(data.decode())
         state = CurrentState(resultId: data.resultId, tokenData: data.data, tokens: data.decode())
     }
 
diff --git a/CodeEdit/Features/LSP/LanguageServer/Capabilities/LanguageServer+SemanticTokens.swift b/CodeEdit/Features/LSP/LanguageServer/Capabilities/LanguageServer+SemanticTokens.swift
@@ -11,7 +11,7 @@ import LanguageServerProtocol
 extension LanguageServer {
     func requestSemanticTokens(for documentURI: String) async throws -> SemanticTokensResponse {
         do {
-            logger.log("Requesting all tokens")
+            // No logging, called too often
             let params = SemanticTokensParams(textDocument: TextDocumentIdentifier(uri: documentURI))
             return try await lspInstance.semanticTokensFull(params)
         } catch {
@@ -20,25 +20,26 @@ extension LanguageServer {
         }
     }
 
-    func requestSemanticTokens(
-        for documentURI: String,
-        forRange range: LSPRange
-    ) async throws -> SemanticTokensResponse {
-        do {
-            let params = SemanticTokensRangeParams(textDocument: TextDocumentIdentifier(uri: documentURI), range: range)
-            return try await lspInstance.semanticTokensRange(params)
-        } catch {
-            logger.warning("requestSemanticTokens range: Error \(error)")
-            throw error
-        }
-    }
+    // Unused
+//    func requestSemanticTokens(
+//        for documentURI: String,
+//        forRange range: LSPRange
+//    ) async throws -> SemanticTokensResponse {
+//        do {
+//            let params = SemanticTokensRangeParams(textDocument: TextDocumentIdentifier(uri: documentURI), range: range)
+//            return try await lspInstance.semanticTokensRange(params)
+//        } catch {
+//            logger.warning("requestSemanticTokens range: Error \(error)")
+//            throw error
+//        }
+//    }
 
     func requestSemanticTokens(
         for documentURI: String,
         previousResultId: String
     ) async throws -> SemanticTokensDeltaResponse {
         do {
-            logger.log("Requesting delta tokens")
+            // No logging, called too often
             let params = SemanticTokensDeltaParams(
                 textDocument: TextDocumentIdentifier(uri: documentURI),
                 previousResultId: previousResultId
diff --git a/CodeEdit/Features/LSP/LanguageServer/LanguageServer.swift b/CodeEdit/Features/LSP/LanguageServer/LanguageServer.swift
@@ -220,7 +220,7 @@ class LanguageServer<DocumentType: LanguageServerDocument> {
                 processId: nil,
                 locale: nil,
                 rootPath: nil,
-                rootUri: workspacePath,
+                rootUri: "file://" + workspacePath, // Make it a URI
                 initializationOptions: [],
                 capabilities: capabilities,
                 trace: nil,
diff --git a/CodeEdit/Features/LSP/LanguageServer/LanguageServerFileMap.swift b/CodeEdit/Features/LSP/LanguageServer/LanguageServerFileMap.swift
@@ -54,8 +54,7 @@ class LanguageServerFileMap<DocumentType: LanguageServerDocument> {
     }
 
     func document(for uri: DocumentUri) -> DocumentType? {
-        let url = URL(filePath: uri)
-        return trackedDocuments.object(forKey: url.absolutePath as NSString)
+        return trackedDocuments.object(forKey: uri as NSString)
     }
 
     func removeDocument(for document: DocumentType) {
diff --git a/CodeEdit/Features/LSP/Service/LSPService.swift b/CodeEdit/Features/LSP/Service/LSPService.swift
@@ -99,6 +99,8 @@ import CodeEditLanguages
 /// ```
 @MainActor
 final class LSPService: ObservableObject {
+    typealias LanguageServerType = LanguageServer<CodeFileDocument>
+
     let logger: Logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "LSPService")
 
     struct ClientKey: Hashable, Equatable {
@@ -112,7 +114,7 @@ final class LSPService: ObservableObject {
     }
 
     /// Holds the active language clients
-    var languageClients: [ClientKey: LanguageServer<CodeFileDocument>] = [:]
+    var languageClients: [ClientKey: LanguageServerType] = [:]
     /// Holds the language server configurations for all the installed language servers
     var languageConfigs: [LanguageIdentifier: LanguageServerBinary] = [:]
     /// Holds all the event listeners for each active language client
@@ -162,7 +164,7 @@ final class LSPService: ObservableObject {
     }
 
     /// Gets the language client for the specified language
-    func languageClient(for languageId: LanguageIdentifier, workspacePath: String) -> LanguageServer<CodeFileDocument>? {
+    func languageClient(for languageId: LanguageIdentifier, workspacePath: String) -> LanguageServerType? {
         return languageClients[ClientKey(languageId, workspacePath)]
     }
 
@@ -174,14 +176,14 @@ final class LSPService: ObservableObject {
     func startServer(
         for languageId: LanguageIdentifier,
         workspacePath: String
-    ) async throws -> LanguageServer<CodeFileDocument> {
+    ) async throws -> LanguageServerType {
         guard let serverBinary = languageConfigs[languageId] else {
             logger.error("Couldn't find language sever binary for \(languageId.rawValue)")
             throw LSPError.binaryNotFound
         }
 
         logger.info("Starting \(languageId.rawValue) language server")
-        let server = try await LanguageServer<CodeFileDocument>.createServer(
+        let server = try await LanguageServerType.createServer(
             for: languageId,
             with: serverBinary,
             workspacePath: workspacePath
@@ -203,7 +205,7 @@ final class LSPService: ObservableObject {
             return
         }
         Task {
-            let languageServer: LanguageServer<CodeFileDocument>
+            let languageServer: LanguageServerType
             do {
                 if let server = self.languageClients[ClientKey(lspLanguage, workspacePath)] {
                     languageServer = server

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,9 @@ final class SemanticTokenHighlightProvider<`
`164`	`164`	`return`
`165`	`165`	`}`
`166`	`166`	`let rawTokens = storage.getTokensFor(range: lspRange)`
`167`		`- let highlights = tokenMap.decode(tokens: rawTokens, using: textView)`
	`167`	`+ let highlights = tokenMap`
	`168`	`+ .decode(tokens: rawTokens, using: textView)`
	`169`	`+ .filter({ $0.capture != nil \|\| !$0.modifiers.isEmpty })`
`168`	`170`	`completion(.success(highlights))`
`169`	`171`	`}`
`170`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ final class SemanticTokenStorage: GenericSemanticTokenStorage {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func setData(_ data: borrowing SemanticTokens) {`
`62`		`- print(data.decode())`
`63`	`62`	`state = CurrentState(resultId: data.resultId, tokenData: data.data, tokens: data.decode())`
`64`	`63`	`}`
`65`	`64`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ class LanguageServerFileMap<DocumentType: LanguageServerDocument> {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func document(for uri: DocumentUri) -> DocumentType? {`
`57`		`- let url = URL(filePath: uri)`
`58`		`- return trackedDocuments.object(forKey: url.absolutePath as NSString)`
	`57`	`+ return trackedDocuments.object(forKey: uri as NSString)`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`func removeDocument(for document: DocumentType) {`