Extract ranges from Codeium response

Author: intitni

Core/Sources/CodeiumService/CodeiumLanguageServer.swift

@@ -2,6 +2,7 @@ import Foundation
 import JSONRPC
 import LanguageClient
 import LanguageServerProtocol
+import Logger
 
 protocol CodeiumLSP {
     func sendRequest<E: CodeiumRequestType>(_ endpoint: E) async throws -> E.Response
@@ -88,14 +89,18 @@ class CodeiumLanguageServer: CodeiumLSP {
                     try await Task.sleep(nanoseconds: 1_000_000_000)
                     waited += 1
                     port = findPort()
-                    if port != nil { break }
+                    if port != nil {
+                        Logger.codeium.info("Language server started.")
+                        launchHandler?()
+                        return
+                    }
                     if waited >= 60 {
                         process.terminate()
                     }
                 }
             }
         } catch {
-            print("start: ", error)
+            Logger.codeium.error(error.localizedDescription)
             processTerminated(process)
         }
     }
@@ -111,25 +116,6 @@ class CodeiumLanguageServer: CodeiumLSP {
         terminationHandler?()
     }
 
-    func handleFileEvent(_ event: FileEvent) {
-        switch event.type {
-        case .created:
-            let fileURL = URL(fileURLWithPath: event.uri)
-            var isDirectory: ObjCBool = false
-            if FileManager.default.fileExists(atPath: fileURL.path, isDirectory: &isDirectory),
-               !isDirectory.boolValue
-            {
-                let portName = fileURL.lastPathComponent
-                print("set port", portName)
-                if port == nil {
-                    port = portName
-                }
-            }
-        default:
-            break
-        }
-    }
-
     func sendRequest<E>(_ request: E) async throws -> E.Response where E: CodeiumRequestType {
         guard let port else { throw CancellationError() }
 
@@ -140,15 +126,15 @@ class CodeiumLanguageServer: CodeiumLSP {
                 let response = try JSONDecoder().decode(E.Response.self, from: data)
                 return response
             } catch {
-                dump(error)
+                Logger.codeium.error(error.localizedDescription)
                 throw error
             }
         } else {
             do {
                 let error = try JSONDecoder().decode(CodeiumResponseError.self, from: data)
                 throw error
             } catch {
-                print(String(data: data, encoding: .utf8))
+                Logger.codeium.error(error.localizedDescription)
                 throw error
             }
         }

Core/Sources/CodeiumService/CodeiumService.swift

@@ -49,7 +49,6 @@ public class CodeiumSuggestionService: CodeiumSuggestionServiceType {
         let managerDirectoryURL = tempFolderURL
             .appendingPathComponent("com.intii.CopilotForXcode")
             .appendingPathComponent(UUID().uuidString)
-        print(languageServerURL, managerDirectoryURL) //
         if !FileManager.default.fileExists(atPath: managerDirectoryURL.path) {
             try FileManager.default.createDirectory(
                 at: managerDirectoryURL,
@@ -122,8 +121,6 @@ public class CodeiumSuggestionService: CodeiumSuggestionServiceType {
 
         let result = try await server.sendRequest(request)
 
-        print(result.state)
-
         return result.completionItems?.filter { item in
             if ignoreSpaceOnlySuggestions {
                 return !item.completion.text.allSatisfy { $0.isWhitespace || $0.isNewline }
@@ -132,9 +129,18 @@ public class CodeiumSuggestionService: CodeiumSuggestionServiceType {
         }.map { item in
             CodeSuggestion(
                 text: item.completion.text,
-                position: .outOfScope,
+                position: cursorPosition,
                 uuid: item.completion.completionId,
-                range: .outOfScope,
+                range: CursorRange(
+                    start: .init(
+                        line: item.range.startPosition?.row.flatMap(Int.init) ?? 0,
+                        character: item.range.startPosition?.col.flatMap(Int.init) ?? 0
+                    ),
+                    end: .init(
+                        line: item.range.endPosition?.row.flatMap(Int.init) ?? 0,
+                        character: item.range.endPosition?.col.flatMap(Int.init) ?? 0
+                    )
+                ),
                 displayText: item.completion.text
             )
         } ?? []
@@ -178,4 +184,3 @@ public class CodeiumSuggestionService: CodeiumSuggestionServiceType {
     }
 }
 
-