Skip to content

[pull] main from intitni:main #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 10 commits into from
Oct 7, 2024
Merged

[pull] main from intitni:main #84

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
50df34c
fixed
RoshanNagaram-eng Oct 4, 2024
779c0da
Removed comments
RoshanNagaram-eng Oct 4, 2024
2291a19
Another fix
RoshanNagaram-eng Oct 4, 2024
edda705
Merge pull request #589 from RoshanNagaram-eng/roshan/fixxocde
intitni Oct 5, 2024
d373a8c
Update to throw instead of returning empty list
intitni Oct 6, 2024
a3dfb3f
Fix a potential crash
intitni Oct 6, 2024
0f70ffc
Fixx trigger menu fallback
intitni Sep 30, 2024
1089530
Bump supported Codeium version
intitni Oct 6, 2024
4235e68
Bump version to 0.34.2
intitni Oct 6, 2024
1fe0874
Merge branch 'hotfix/0.34.2'
intitni Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixed
  • Loading branch information
@RoshanNagaram-eng
RoshanNagaram-eng committed Oct 4, 2024
commit 50df34cfed1e6fac9d8399c98366c2dab72ce85e
4 changes: 1 addition & 3 deletions Tool/Sources/CodeiumService/LanguageServer/CodeiumModels.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ struct CompletionPart: Codable {
}

struct CodeiumDocument: Codable {
var absolute_path: String
// Path relative to the root of the workspace.
var relative_path: String
var absolute_path_migrate_me_to_uri: String
var text: String
// Language ID provided by the editor.
var editor_language: String
Expand Down
16 changes: 8 additions & 8 deletions Tool/Sources/CodeiumService/Services/CodeiumService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,14 +257,14 @@ extension CodeiumService: CodeiumSuggestionServiceType {

requestCounter += 1
let languageId = languageIdentifierFromFileURL(fileURL)
let relativePath = getRelativePath(of: fileURL)
// let relativePath = getRelativePath(of: fileURL)

let task = Task {
let request = try await CodeiumRequest.GetCompletion(requestBody: .init(
metadata: getMetadata(),
document: .init(
absolute_path: fileURL.path,
relative_path: relativePath,
absolute_path_migrate_me_to_uri: fileURL.path,
// relative_path: relativePath,
text: content,
editor_language: languageId.rawValue,
language: .init(codeLanguage: languageId),
Expand All @@ -278,8 +278,8 @@ extension CodeiumService: CodeiumSuggestionServiceType {
.map { openedDocument in
let languageId = languageIdentifierFromFileURL(openedDocument.url)
return .init(
absolute_path: openedDocument.url.path,
relative_path: openedDocument.relativePath,
absolute_path_migrate_me_to_uri: openedDocument.url.path,
// relative_path: openedDocument.relativePath,
text: openedDocument.content,
editor_language: languageId.rawValue,
language: .init(codeLanguage: languageId)
Expand Down Expand Up @@ -417,11 +417,11 @@ extension CodeiumService: CodeiumSuggestionServiceType {
workspaceURL: URL
) async throws {
let languageId = languageIdentifierFromFileURL(fileURL)
let relativePath = getRelativePath(of: fileURL)
// let relativePath = getRelativePath(of: fileURL)
let request = await CodeiumRequest.RefreshContextForIdeAction(requestBody: .init(
active_document: .init(
absolute_path: fileURL.path,
relative_path: relativePath,
absolute_path_migrate_me_to_uri: fileURL.path,
// relative_path: relativePath,
text: content,
editor_language: languageId.rawValue,
language: .init(codeLanguage: languageId),
Expand Down