Skip to content

Commit edda705

Browse files
authored
Merge pull request intitni#589 from RoshanNagaram-eng/roshan/fixxocde
Fixed issue with Codeium Language Server for version 1.20.0 above
2 parents 6cc4616 + 2291a19 commit edda705

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

Tool/Sources/CodeiumService/LanguageServer/CodeiumModels.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ struct CompletionPart: Codable {
7272
}
7373

7474
struct CodeiumDocument: Codable {
75-
var absolute_path: String
76-
// Path relative to the root of the workspace.
77-
var relative_path: String
75+
var absolute_path_migrate_me_to_uri: String
7876
var text: String
7977
// Language ID provided by the editor.
8078
var editor_language: String

Tool/Sources/CodeiumService/Services/CodeiumService.swift

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,12 @@ extension CodeiumService: CodeiumSuggestionServiceType {
257257

258258
requestCounter += 1
259259
let languageId = languageIdentifierFromFileURL(fileURL)
260-
let relativePath = getRelativePath(of: fileURL)
261260

262261
let task = Task {
263262
let request = try await CodeiumRequest.GetCompletion(requestBody: .init(
264263
metadata: getMetadata(),
265264
document: .init(
266-
absolute_path: fileURL.path,
267-
relative_path: relativePath,
265+
absolute_path_migrate_me_to_uri: fileURL.path,
268266
text: content,
269267
editor_language: languageId.rawValue,
270268
language: .init(codeLanguage: languageId),
@@ -278,8 +276,7 @@ extension CodeiumService: CodeiumSuggestionServiceType {
278276
.map { openedDocument in
279277
let languageId = languageIdentifierFromFileURL(openedDocument.url)
280278
return .init(
281-
absolute_path: openedDocument.url.path,
282-
relative_path: openedDocument.relativePath,
279+
absolute_path_migrate_me_to_uri: openedDocument.url.path,
283280
text: openedDocument.content,
284281
editor_language: languageId.rawValue,
285282
language: .init(codeLanguage: languageId)
@@ -417,11 +414,9 @@ extension CodeiumService: CodeiumSuggestionServiceType {
417414
workspaceURL: URL
418415
) async throws {
419416
let languageId = languageIdentifierFromFileURL(fileURL)
420-
let relativePath = getRelativePath(of: fileURL)
421417
let request = await CodeiumRequest.RefreshContextForIdeAction(requestBody: .init(
422418
active_document: .init(
423-
absolute_path: fileURL.path,
424-
relative_path: relativePath,
419+
absolute_path_migrate_me_to_uri: fileURL.path,
425420
text: content,
426421
editor_language: languageId.rawValue,
427422
language: .init(codeLanguage: languageId),

0 commit comments

Comments
 (0)