From 40b1fa6a1c1a9a503645c05edffedfb2f03c315b Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 12:22:57 -0700 Subject: [PATCH 01/11] inital move --- CodeiumVS/LanguageServer/LanguageServer.cs | 12 +- .../LanguageServerController.cs | 18 +-- CodeiumVS/LanguageServer/Packets.cs | 113 ++++++++++++------ CodeiumVS/Windows/ChatToolWindow.cs | 2 +- 4 files changed, 90 insertions(+), 55 deletions(-) diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs index c0a75d7..e7c4a94 100644 --- a/CodeiumVS/LanguageServer/LanguageServer.cs +++ b/CodeiumVS/LanguageServer/LanguageServer.cs @@ -780,8 +780,8 @@ public async Task?> language = language.Type, cursor_offset = (ulong)cursorPosition, line_ending = lineEnding, - absolute_path = absolutePath, - relative_path = Path.GetFileName(absolutePath) }, + absolute_uri = absolutePath, + workspace_uri = Path.GetFileName(absolutePath) }, editor_options = new() { tab_size = (ulong)tabSize, insert_spaces = insertSpaces, @@ -845,8 +845,8 @@ public async Task?> language = language.Type, cursor_offset = (ulong)cursorPosition, line_ending = "\n", - absolute_path = absolutePath, - relative_path = Path.GetFileName(absolutePath) + absolute_uri = absolutePath, + workspace_uri = Path.GetFileName(absolutePath) }, }; @@ -873,8 +873,8 @@ public async Task?> language = language.Type, cursor_offset = (ulong)cursorPosition, line_ending = "\n", - absolute_path = absolutePath, - relative_path = Path.GetFileName(absolutePath) + absolute_uri = absolutePath, + workspace_uri = Path.GetFileName(absolutePath) }, }; diff --git a/CodeiumVS/LanguageServer/LanguageServerController.cs b/CodeiumVS/LanguageServer/LanguageServerController.cs index 673be61..d26d7f4 100644 --- a/CodeiumVS/LanguageServer/LanguageServerController.cs +++ b/CodeiumVS/LanguageServer/LanguageServerController.cs @@ -42,7 +42,7 @@ void OnMessage(object sender, MessageEventArgs msg) { var data = request.open_file_pointer; OpenSelection( - data.file_path, data.start_line, data.start_col, data.end_line, data.end_col); + data.file_uri, data.start_line, data.start_col, data.end_line, data.end_col); } else if (request.ShouldSerializeinsert_at_cursor()) { @@ -64,7 +64,7 @@ void OnMessage(object sender, MessageEventArgs msg) } } - ApplyDiff(data.file_path, data.diff.start_line, data.diff.end_line, replacement); + ApplyDiff(data.uri, data.diff.start_line, data.diff.end_line, replacement); } } @@ -184,7 +184,7 @@ public async Task ExplainCodeBlockAsync(string filePath, Language language, request.get_chat_message_request.chat_messages[0].intent = new() { explain_code_block = new() { code_block_info = codeBlockInfo, - file_path = filePath, + uri = filePath, language = language, } }; @@ -199,7 +199,7 @@ public async Task ExplainFunctionAsync(string filePath, FunctionInfo functionInf request.get_chat_message_request.chat_messages[0].intent = new() { explain_function = new() { function_info = functionInfo, - file_path = filePath, + uri = filePath, language = functionInfo.Language, } }; @@ -215,7 +215,7 @@ public async Task GenerateFunctionUnitTestAsync(string instructions, string file request.get_chat_message_request.chat_messages[0].intent = new() { function_unit_tests = new() { function_info = functionInfo, - file_path = filePath, + uri = filePath, language = functionInfo.Language, instructions = instructions, } }; @@ -231,7 +231,7 @@ public async Task GenerateFunctionDocstringAsync(string filePath, FunctionInfo f request.get_chat_message_request.chat_messages[0].intent = new() { function_docstring = new() { function_info = functionInfo, - file_path = filePath, + uri = filePath, language = functionInfo.Language, } }; @@ -246,7 +246,7 @@ public async Task RefactorCodeBlockAsync(string prompt, string filePath, Languag var request = WebChatServer.NewRequest(); request.get_chat_message_request.chat_messages[0].intent = new() { code_block_refactor = new() { code_block_info = codeBlockInfo, - file_path = filePath, + uri = filePath, language = language, refactor_description = prompt } }; @@ -261,7 +261,7 @@ public async Task RefactorFunctionAsync(string prompt, string filePath, var request = WebChatServer.NewRequest(); request.get_chat_message_request.chat_messages[0].intent = new() { function_refactor = new() { function_info = functionInfo, - file_path = filePath, + uri = filePath, language = functionInfo.Language, refactor_description = prompt } }; @@ -298,7 +298,7 @@ public async Task ExplainProblemAsync(string problemMessage, SnapshotSpan span) surrounding_code_snippet = span.Snapshot.GetText( surroundingLineStart.Start, surroundingLineEnd.End - surroundingLineStart.Start), language = Languages.Mapper.GetLanguage(span.Snapshot.TextBuffer.ContentType).Type, - file_path = span.Snapshot.TextBuffer.GetFileName(), + uri = span.Snapshot.TextBuffer.GetFileName(), line_number = problemLineStart.LineNumber + 1, } }; diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index b181616..f4c6151 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -179,13 +179,13 @@ public partial class Document : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1)] + [global::ProtoBuf.ProtoMember(12)] [global::System.ComponentModel.DefaultValue("")] - public string absolute_path { get; set; } = ""; + public string absolute_uri { get; set; } = ""; - [global::ProtoBuf.ProtoMember(2)] + [global::ProtoBuf.ProtoMember(13)] [global::System.ComponentModel.DefaultValue("")] - public string relative_path { + public string workspace_uri { get; set; } = ""; @@ -400,9 +400,9 @@ public partial class CodeContextItem : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1)] + [global::ProtoBuf.ProtoMember(16)] [global::System.ComponentModel.DefaultValue("")] - public string absolute_path { get; set; } = ""; + public string absolute_uri { get; set; } = ""; [global::ProtoBuf.ProtoMember(2)] public global::System.Collections.Generic.List workspace_paths { @@ -476,9 +476,9 @@ public partial class WorkspacePath : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1)] + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] - public string workspace { get; set; } = ""; + public string workspace_uri { get; set; } = ""; [global::ProtoBuf.ProtoMember(2)] [global::System.ComponentModel.DefaultValue("")] @@ -750,6 +750,13 @@ public string prompt { get; set; } = ""; + [global::ProtoBuf.ProtoMember(21)] + [global::System.ComponentModel.DefaultValue("")] + public string context_prompt + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(8)] public global::System.Collections.Generic.List prompt_element_ranges { get; @@ -771,6 +778,12 @@ public ulong prompt_latency_ms { get; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(20)] + public ulong num_tokenized_bytes + { + get; set; + } + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string editor_language { @@ -784,19 +797,19 @@ public Language language { [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] - public string absolute_path { + public string absolute_path_uri_for_telemetry { get; set; } = ""; [global::ProtoBuf.ProtoMember(6)] [global::System.ComponentModel.DefaultValue("")] - public string relative_path { + public string relative_path_for_telemetry { get; set; } = ""; [global::ProtoBuf.ProtoMember(13)] [global::System.ComponentModel.DefaultValue("")] - public string workspace { + public string workspace_uri_for_telemetry { get; set; } = ""; @@ -806,6 +819,20 @@ public string experiment_features_json { get; set; } = ""; + [global::ProtoBuf.ProtoMember(19)] + [global::System.ComponentModel.DefaultValue("")] + public string experiment_variant_json + { + get; set; + } = ""; + + [global::ProtoBuf.ProtoMember(10)] + [global::System.ComponentModel.DefaultValue("")] + public string model + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(14)] public bool has_line_suffix { get; set; @@ -831,6 +858,14 @@ public string model_tag { public global::System.Collections.Generic.List experiment_tags { get; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(22)] + [global::System.ComponentModel.DefaultValue("")] + public string eval_suffix + { + get; set; + } = ""; + } [global::ProtoBuf.ProtoContract()] @@ -1251,13 +1286,13 @@ public Document active_document { get; set; } - [global::ProtoBuf.ProtoMember(6)] - public global::System.Collections.Generic.List open_document_paths { + [global::ProtoBuf.ProtoMember(12)] + public global::System.Collections.Generic.List open_document_uris { get; } = new global::System.Collections.Generic.List(); - [global::ProtoBuf.ProtoMember(7)] - public global::System.Collections.Generic.List workspace_paths { + [global::ProtoBuf.ProtoMember(13)] + public global::System.Collections.Generic.List workspace_uris { get; } = new global::System.Collections.Generic.List(); @@ -1484,9 +1519,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; } @@ -1559,9 +1594,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; } @@ -1582,9 +1617,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; @@ -1611,9 +1646,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; } @@ -1667,9 +1702,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; @@ -1696,9 +1731,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; @@ -1737,9 +1772,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(5)] + [global::ProtoBuf.ProtoMember(7)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; @@ -1766,9 +1801,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; @@ -1794,9 +1829,9 @@ public Language language { get; set; } - [global::ProtoBuf.ProtoMember(3)] + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; } @@ -1916,9 +1951,9 @@ public partial class ChatMessageActionEdit : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1)] + [global::ProtoBuf.ProtoMember(6)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { get; set; } = ""; + public string uri { get; set; } = ""; [global::ProtoBuf.ProtoMember(2)] public DiffBlock diff { @@ -2111,9 +2146,9 @@ public partial class OpenFilePointer : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1)] + [global::ProtoBuf.ProtoMember(6)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { get; set; } = ""; + public string file_uri { get; set; } = ""; [global::ProtoBuf.ProtoMember(2)] public int start_line { @@ -2179,9 +2214,9 @@ public partial class ApplyDiff : global::ProtoBuf.IExtensible [global::System.ComponentModel.DefaultValue("")] public string message_id { get; set; } = ""; - [global::ProtoBuf.ProtoMember(2)] + [global::ProtoBuf.ProtoMember(8)] [global::System.ComponentModel.DefaultValue("")] - public string file_path { + public string uri { get; set; } = ""; diff --git a/CodeiumVS/Windows/ChatToolWindow.cs b/CodeiumVS/Windows/ChatToolWindow.cs index 800e872..957f232 100644 --- a/CodeiumVS/Windows/ChatToolWindow.cs +++ b/CodeiumVS/Windows/ChatToolWindow.cs @@ -21,7 +21,7 @@ public class ChatToolWindow : ToolWindowPane public ChatToolWindow() : base(null) { Instance = this; - Caption = "Codeium Chat"; + Caption = "Codeiummm Chat"; Content = new ChatToolWindowControl(); } From 67be1848b35889ef2a18dfa5bdab2ad077be95de Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 12:56:48 -0700 Subject: [PATCH 02/11] clean --- CodeiumVS/Windows/ChatToolWindow.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeiumVS/Windows/ChatToolWindow.cs b/CodeiumVS/Windows/ChatToolWindow.cs index 957f232..800e872 100644 --- a/CodeiumVS/Windows/ChatToolWindow.cs +++ b/CodeiumVS/Windows/ChatToolWindow.cs @@ -21,7 +21,7 @@ public class ChatToolWindow : ToolWindowPane public ChatToolWindow() : base(null) { Instance = this; - Caption = "Codeiummm Chat"; + Caption = "Codeium Chat"; Content = new ChatToolWindowControl(); } From 4994816fae02290a7b07a521757354afdcbe2d36 Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 14:18:44 -0700 Subject: [PATCH 03/11] rename ide --- CodeiumVS/LanguageServer/LanguageServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs index e7c4a94..706047d 100644 --- a/CodeiumVS/LanguageServer/LanguageServer.cs +++ b/CodeiumVS/LanguageServer/LanguageServer.cs @@ -66,7 +66,7 @@ public async Task InitializeAsync() await PrepareAsync(); _metadata.request_id = 0; - _metadata.ide_name = "visual_studio"; + _metadata.ide_name = "vscode"; _metadata.ide_version = ideVersion; _metadata.extension_name = Vsix.Name; _metadata.extension_version = _languageServerVersion; From e14fa5b44209c828cb2428268a7321cf36e553d2 Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 14:58:08 -0700 Subject: [PATCH 04/11] revert absolute_uri document name --- CodeiumVS/LanguageServer/LanguageServer.cs | 6 +++--- CodeiumVS/LanguageServer/Packets.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs index 706047d..ff77d00 100644 --- a/CodeiumVS/LanguageServer/LanguageServer.cs +++ b/CodeiumVS/LanguageServer/LanguageServer.cs @@ -780,7 +780,7 @@ public async Task?> language = language.Type, cursor_offset = (ulong)cursorPosition, line_ending = lineEnding, - absolute_uri = absolutePath, + absolute_path = absolutePath, workspace_uri = Path.GetFileName(absolutePath) }, editor_options = new() { tab_size = (ulong)tabSize, @@ -845,7 +845,7 @@ public async Task?> language = language.Type, cursor_offset = (ulong)cursorPosition, line_ending = "\n", - absolute_uri = absolutePath, + absolute_path = absolutePath, workspace_uri = Path.GetFileName(absolutePath) }, }; @@ -873,7 +873,7 @@ public async Task?> language = language.Type, cursor_offset = (ulong)cursorPosition, line_ending = "\n", - absolute_uri = absolutePath, + absolute_path = absolutePath, workspace_uri = Path.GetFileName(absolutePath) }, }; diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index f4c6151..b0016d0 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -181,7 +181,7 @@ public partial class Document : global::ProtoBuf.IExtensible [global::ProtoBuf.ProtoMember(12)] [global::System.ComponentModel.DefaultValue("")] - public string absolute_uri { get; set; } = ""; + public string absolute_path { get; set; } = ""; [global::ProtoBuf.ProtoMember(13)] [global::System.ComponentModel.DefaultValue("")] From 785ec44e93f7f8cebbd02fa81eaaf2b9e953a745 Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 15:00:29 -0700 Subject: [PATCH 05/11] note --- CodeiumVS/LanguageServer/Packets.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index b0016d0..763cd45 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -181,6 +181,7 @@ public partial class Document : global::ProtoBuf.IExtensible [global::ProtoBuf.ProtoMember(12)] [global::System.ComponentModel.DefaultValue("")] + // changing this to the updated proto name breaks it, keeping it absolute_path for now public string absolute_path { get; set; } = ""; [global::ProtoBuf.ProtoMember(13)] From aa088dcb31143f73baa164d2c68d6c95aa2db29f Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 16:14:38 -0700 Subject: [PATCH 06/11] workign --- CodeiumVS/LanguageServer/Packets.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index 763cd45..3956bae 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -179,11 +179,16 @@ public partial class Document : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(12)] + [global::ProtoBuf.ProtoMember(1)] [global::System.ComponentModel.DefaultValue("")] // changing this to the updated proto name breaks it, keeping it absolute_path for now public string absolute_path { get; set; } = ""; + [global::ProtoBuf.ProtoMember(12)] + [global::System.ComponentModel.DefaultValue("")] + // changing this to the updated proto name breaks it, keeping it absolute_path for now + public string absolute_uri { get; set; } = ""; + [global::ProtoBuf.ProtoMember(13)] [global::System.ComponentModel.DefaultValue("")] public string workspace_uri { From 40270d6b907c0f332439bc4d95315b1c5939df5c Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 16:35:19 -0700 Subject: [PATCH 07/11] backwards comp --- CodeiumVS/LanguageServer/Packets.cs | 103 ++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index 3956bae..87e1e4b 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -189,6 +189,13 @@ public partial class Document : global::ProtoBuf.IExtensible // changing this to the updated proto name breaks it, keeping it absolute_path for now public string absolute_uri { get; set; } = ""; + [global::ProtoBuf.ProtoMember(2)] + [global::System.ComponentModel.DefaultValue("")] + public string relative_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(13)] [global::System.ComponentModel.DefaultValue("")] public string workspace_uri { @@ -406,6 +413,10 @@ public partial class CodeContextItem : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string absolute_path { get; set; } = ""; + [global::ProtoBuf.ProtoMember(16)] [global::System.ComponentModel.DefaultValue("")] public string absolute_uri { get; set; } = ""; @@ -482,6 +493,10 @@ public partial class WorkspacePath : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string workspace { get; set; } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string workspace_uri { get; set; } = ""; @@ -1292,11 +1307,23 @@ public Document active_document { get; set; } + [global::ProtoBuf.ProtoMember(6)] + public global::System.Collections.Generic.List open_document_paths + { + get; + } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(12)] public global::System.Collections.Generic.List open_document_uris { get; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(7)] + public global::System.Collections.Generic.List workspace_paths + { + get; + } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(13)] public global::System.Collections.Generic.List workspace_uris { get; @@ -1525,6 +1552,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1600,6 +1634,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1623,6 +1664,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1652,6 +1700,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1708,6 +1763,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1737,6 +1799,12 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1778,6 +1846,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(5)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(7)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1807,6 +1882,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1835,6 +1917,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1957,6 +2046,13 @@ public partial class ChatMessageActionEdit : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(6)] [global::System.ComponentModel.DefaultValue("")] public string uri { get; set; } = ""; @@ -2220,6 +2316,13 @@ public partial class ApplyDiff : global::ProtoBuf.IExtensible [global::System.ComponentModel.DefaultValue("")] public string message_id { get; set; } = ""; + [global::ProtoBuf.ProtoMember(2)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(8)] [global::System.ComponentModel.DefaultValue("")] public string uri { From 64c7da66e826c12dc0b89a8ba044957603a87483 Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 16:50:08 -0700 Subject: [PATCH 08/11] clean --- CodeiumVS/LanguageServer/Packets.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index 87e1e4b..8a50d69 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -181,12 +181,10 @@ public partial class Document : global::ProtoBuf.IExtensible [global::ProtoBuf.ProtoMember(1)] [global::System.ComponentModel.DefaultValue("")] - // changing this to the updated proto name breaks it, keeping it absolute_path for now public string absolute_path { get; set; } = ""; [global::ProtoBuf.ProtoMember(12)] [global::System.ComponentModel.DefaultValue("")] - // changing this to the updated proto name breaks it, keeping it absolute_path for now public string absolute_uri { get; set; } = ""; [global::ProtoBuf.ProtoMember(2)] From b1e8ff2feb5c766d26a007a40f9732b24ba97a0e Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 17:06:24 -0700 Subject: [PATCH 09/11] compatible --- CodeiumVS/LanguageServer/LanguageServer.cs | 6 +++--- .../LanguageServer/LanguageServerController.cs | 18 +++++++++--------- CodeiumVS/LanguageServer/Packets.cs | 4 ++++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs index ff77d00..460eebb 100644 --- a/CodeiumVS/LanguageServer/LanguageServer.cs +++ b/CodeiumVS/LanguageServer/LanguageServer.cs @@ -781,7 +781,7 @@ public async Task?> cursor_offset = (ulong)cursorPosition, line_ending = lineEnding, absolute_path = absolutePath, - workspace_uri = Path.GetFileName(absolutePath) }, + relative_path = Path.GetFileName(absolutePath) }, editor_options = new() { tab_size = (ulong)tabSize, insert_spaces = insertSpaces, @@ -846,7 +846,7 @@ public async Task?> cursor_offset = (ulong)cursorPosition, line_ending = "\n", absolute_path = absolutePath, - workspace_uri = Path.GetFileName(absolutePath) + relative_path = Path.GetFileName(absolutePath) }, }; @@ -874,7 +874,7 @@ public async Task?> cursor_offset = (ulong)cursorPosition, line_ending = "\n", absolute_path = absolutePath, - workspace_uri = Path.GetFileName(absolutePath) + relative_path = Path.GetFileName(absolutePath) }, }; diff --git a/CodeiumVS/LanguageServer/LanguageServerController.cs b/CodeiumVS/LanguageServer/LanguageServerController.cs index d26d7f4..673be61 100644 --- a/CodeiumVS/LanguageServer/LanguageServerController.cs +++ b/CodeiumVS/LanguageServer/LanguageServerController.cs @@ -42,7 +42,7 @@ void OnMessage(object sender, MessageEventArgs msg) { var data = request.open_file_pointer; OpenSelection( - data.file_uri, data.start_line, data.start_col, data.end_line, data.end_col); + data.file_path, data.start_line, data.start_col, data.end_line, data.end_col); } else if (request.ShouldSerializeinsert_at_cursor()) { @@ -64,7 +64,7 @@ void OnMessage(object sender, MessageEventArgs msg) } } - ApplyDiff(data.uri, data.diff.start_line, data.diff.end_line, replacement); + ApplyDiff(data.file_path, data.diff.start_line, data.diff.end_line, replacement); } } @@ -184,7 +184,7 @@ public async Task ExplainCodeBlockAsync(string filePath, Language language, request.get_chat_message_request.chat_messages[0].intent = new() { explain_code_block = new() { code_block_info = codeBlockInfo, - uri = filePath, + file_path = filePath, language = language, } }; @@ -199,7 +199,7 @@ public async Task ExplainFunctionAsync(string filePath, FunctionInfo functionInf request.get_chat_message_request.chat_messages[0].intent = new() { explain_function = new() { function_info = functionInfo, - uri = filePath, + file_path = filePath, language = functionInfo.Language, } }; @@ -215,7 +215,7 @@ public async Task GenerateFunctionUnitTestAsync(string instructions, string file request.get_chat_message_request.chat_messages[0].intent = new() { function_unit_tests = new() { function_info = functionInfo, - uri = filePath, + file_path = filePath, language = functionInfo.Language, instructions = instructions, } }; @@ -231,7 +231,7 @@ public async Task GenerateFunctionDocstringAsync(string filePath, FunctionInfo f request.get_chat_message_request.chat_messages[0].intent = new() { function_docstring = new() { function_info = functionInfo, - uri = filePath, + file_path = filePath, language = functionInfo.Language, } }; @@ -246,7 +246,7 @@ public async Task RefactorCodeBlockAsync(string prompt, string filePath, Languag var request = WebChatServer.NewRequest(); request.get_chat_message_request.chat_messages[0].intent = new() { code_block_refactor = new() { code_block_info = codeBlockInfo, - uri = filePath, + file_path = filePath, language = language, refactor_description = prompt } }; @@ -261,7 +261,7 @@ public async Task RefactorFunctionAsync(string prompt, string filePath, var request = WebChatServer.NewRequest(); request.get_chat_message_request.chat_messages[0].intent = new() { function_refactor = new() { function_info = functionInfo, - uri = filePath, + file_path = filePath, language = functionInfo.Language, refactor_description = prompt } }; @@ -298,7 +298,7 @@ public async Task ExplainProblemAsync(string problemMessage, SnapshotSpan span) surrounding_code_snippet = span.Snapshot.GetText( surroundingLineStart.Start, surroundingLineEnd.End - surroundingLineStart.Start), language = Languages.Mapper.GetLanguage(span.Snapshot.TextBuffer.ContentType).Type, - uri = span.Snapshot.TextBuffer.GetFileName(), + file_path = span.Snapshot.TextBuffer.GetFileName(), line_number = problemLineStart.LineNumber + 1, } }; diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index 8a50d69..489c0c5 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -2246,6 +2246,10 @@ public partial class OpenFilePointer : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path { get; set; } = ""; + [global::ProtoBuf.ProtoMember(6)] [global::System.ComponentModel.DefaultValue("")] public string file_uri { get; set; } = ""; From 22d56debde2dc8a314480893ffc458fbc4482e2d Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 19:01:04 -0700 Subject: [PATCH 10/11] breh --- CodeiumVS.sln | 4 +- CodeiumVS/LanguageServer/LanguageServer.cs | 1 + .../LanguageServerController.cs | 12 +- CodeiumVS/LanguageServer/Packets.cs | 136 ++++++++++++++++++ 4 files changed, 149 insertions(+), 4 deletions(-) diff --git a/CodeiumVS.sln b/CodeiumVS.sln index 8d5c8ea..cf092f6 100644 --- a/CodeiumVS.sln +++ b/CodeiumVS.sln @@ -15,8 +15,8 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B37F2AE5-CDEC-45B3-944D-8EF912810A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B37F2AE5-CDEC-45B3-944D-8EF912810A12}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B37F2AE5-CDEC-45B3-944D-8EF912810A12}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {B37F2AE5-CDEC-45B3-944D-8EF912810A12}.Debug|Any CPU.Build.0 = Release|Any CPU {B37F2AE5-CDEC-45B3-944D-8EF912810A12}.Debug|arm64.ActiveCfg = Debug|arm64 {B37F2AE5-CDEC-45B3-944D-8EF912810A12}.Debug|arm64.Build.0 = Debug|arm64 {B37F2AE5-CDEC-45B3-944D-8EF912810A12}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs index 460eebb..75d57ea 100644 --- a/CodeiumVS/LanguageServer/LanguageServer.cs +++ b/CodeiumVS/LanguageServer/LanguageServer.cs @@ -781,6 +781,7 @@ public async Task?> cursor_offset = (ulong)cursorPosition, line_ending = lineEnding, absolute_path = absolutePath, + absolute_path_migrate_me_to_uri = absolutePath, relative_path = Path.GetFileName(absolutePath) }, editor_options = new() { tab_size = (ulong)tabSize, diff --git a/CodeiumVS/LanguageServer/LanguageServerController.cs b/CodeiumVS/LanguageServer/LanguageServerController.cs index 673be61..119a2c4 100644 --- a/CodeiumVS/LanguageServer/LanguageServerController.cs +++ b/CodeiumVS/LanguageServer/LanguageServerController.cs @@ -40,9 +40,10 @@ void OnMessage(object sender, MessageEventArgs msg) if (request.ShouldSerializeopen_file_pointer()) { + var data = request.open_file_pointer; OpenSelection( - data.file_path, data.start_line, data.start_col, data.end_line, data.end_col); + data.file_path_migrate_me_to_uri.IsNullOrEmpty() ? data.file_path : data.file_path_migrate_me_to_uri, data.start_line, data.start_col, data.end_line, data.end_col); } else if (request.ShouldSerializeinsert_at_cursor()) { @@ -64,7 +65,7 @@ void OnMessage(object sender, MessageEventArgs msg) } } - ApplyDiff(data.file_path, data.diff.start_line, data.diff.end_line, replacement); + ApplyDiff(data.file_path_migrate_me_to_uri.IsNullOrEmpty() ? data.file_path : data.file_path_migrate_me_to_uri, data.diff.start_line, data.diff.end_line, replacement); } } @@ -185,6 +186,7 @@ public async Task ExplainCodeBlockAsync(string filePath, Language language, new() { explain_code_block = new() { code_block_info = codeBlockInfo, file_path = filePath, + file_path_migrate_me_to_uri = filePath, language = language, } }; @@ -200,6 +202,7 @@ public async Task ExplainFunctionAsync(string filePath, FunctionInfo functionInf new() { explain_function = new() { function_info = functionInfo, file_path = filePath, + file_path_migrate_me_to_uri = filePath, language = functionInfo.Language, } }; @@ -216,6 +219,7 @@ public async Task GenerateFunctionUnitTestAsync(string instructions, string file new() { function_unit_tests = new() { function_info = functionInfo, file_path = filePath, + file_path_migrate_me_to_uri = filePath, language = functionInfo.Language, instructions = instructions, } }; @@ -232,6 +236,7 @@ public async Task GenerateFunctionDocstringAsync(string filePath, FunctionInfo f new() { function_docstring = new() { function_info = functionInfo, file_path = filePath, + file_path_migrate_me_to_uri = filePath, language = functionInfo.Language, } }; @@ -247,6 +252,7 @@ public async Task RefactorCodeBlockAsync(string prompt, string filePath, Languag request.get_chat_message_request.chat_messages[0].intent = new() { code_block_refactor = new() { code_block_info = codeBlockInfo, file_path = filePath, + file_path_migrate_me_to_uri = filePath, language = language, refactor_description = prompt } }; @@ -262,6 +268,7 @@ public async Task RefactorFunctionAsync(string prompt, string filePath, request.get_chat_message_request.chat_messages[0].intent = new() { function_refactor = new() { function_info = functionInfo, file_path = filePath, + file_path_migrate_me_to_uri = filePath, language = functionInfo.Language, refactor_description = prompt } }; @@ -299,6 +306,7 @@ public async Task ExplainProblemAsync(string problemMessage, SnapshotSpan span) surroundingLineStart.Start, surroundingLineEnd.End - surroundingLineStart.Start), language = Languages.Mapper.GetLanguage(span.Snapshot.TextBuffer.ContentType).Type, file_path = span.Snapshot.TextBuffer.GetFileName(), + file_path_migrate_me_to_uri = span.Snapshot.TextBuffer.GetFileName(), line_number = problemLineStart.LineNumber + 1, } }; diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs index 489c0c5..bf8a244 100644 --- a/CodeiumVS/LanguageServer/Packets.cs +++ b/CodeiumVS/LanguageServer/Packets.cs @@ -183,10 +183,21 @@ public partial class Document : global::ProtoBuf.IExtensible [global::System.ComponentModel.DefaultValue("")] public string absolute_path { get; set; } = ""; + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string absolute_path_migrate_me_to_uri { get; set; } = ""; + [global::ProtoBuf.ProtoMember(12)] [global::System.ComponentModel.DefaultValue("")] public string absolute_uri { get; set; } = ""; + [global::ProtoBuf.ProtoMember(2)] + [global::System.ComponentModel.DefaultValue("")] + public string relative_path_migrate_me_to_workspace_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(2)] [global::System.ComponentModel.DefaultValue("")] public string relative_path @@ -415,6 +426,10 @@ public partial class CodeContextItem : global::ProtoBuf.IExtensible [global::System.ComponentModel.DefaultValue("")] public string absolute_path { get; set; } = ""; + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string absolute_path_migrate_me_to_uri { get; set; } = ""; + [global::ProtoBuf.ProtoMember(16)] [global::System.ComponentModel.DefaultValue("")] public string absolute_uri { get; set; } = ""; @@ -495,6 +510,10 @@ public partial class WorkspacePath : global::ProtoBuf.IExtensible [global::System.ComponentModel.DefaultValue("")] public string workspace { get; set; } = ""; + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string workspace_migrate_me_to_uri { get; set; } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string workspace_uri { get; set; } = ""; @@ -814,18 +833,39 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(5)] + [global::System.ComponentModel.DefaultValue("")] + public string absolute_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] public string absolute_path_uri_for_telemetry { get; set; } = ""; + [global::ProtoBuf.ProtoMember(6)] + [global::System.ComponentModel.DefaultValue("")] + public string relative_path + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(6)] [global::System.ComponentModel.DefaultValue("")] public string relative_path_for_telemetry { get; set; } = ""; + [global::ProtoBuf.ProtoMember(13)] + [global::System.ComponentModel.DefaultValue("")] + public string workspace + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(13)] [global::System.ComponentModel.DefaultValue("")] public string workspace_uri_for_telemetry { @@ -1311,6 +1351,12 @@ public Document active_document { get; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(6)] + public global::System.Collections.Generic.List open_document_paths_migrate_me_to_uris + { + get; + } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(12)] public global::System.Collections.Generic.List open_document_uris { get; @@ -1322,6 +1368,12 @@ public Document active_document { get; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(7)] + public global::System.Collections.Generic.List workspace_paths_migrate_me_to_uris + { + get; + } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(13)] public global::System.Collections.Generic.List workspace_uris { get; @@ -1550,6 +1602,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -1639,6 +1698,13 @@ public string file_path get; set; } = ""; + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(4)] [global::System.ComponentModel.DefaultValue("")] public string uri { @@ -1662,6 +1728,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -1698,6 +1771,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -1761,6 +1841,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -1797,6 +1884,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string file_path { @@ -1844,6 +1938,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(5)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(5)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -1880,6 +1981,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -1915,6 +2023,13 @@ public Language language { get; set; } + [global::ProtoBuf.ProtoMember(3)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(3)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -2044,6 +2159,13 @@ public partial class ChatMessageActionEdit : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(1)] [global::System.ComponentModel.DefaultValue("")] public string file_path @@ -2246,6 +2368,13 @@ public partial class OpenFilePointer : global::ProtoBuf.IExtensible global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + [global::ProtoBuf.ProtoMember(1)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(1)] [global::System.ComponentModel.DefaultValue("")] public string file_path { get; set; } = ""; @@ -2318,6 +2447,13 @@ public partial class ApplyDiff : global::ProtoBuf.IExtensible [global::System.ComponentModel.DefaultValue("")] public string message_id { get; set; } = ""; + [global::ProtoBuf.ProtoMember(2)] + [global::System.ComponentModel.DefaultValue("")] + public string file_path_migrate_me_to_uri + { + get; set; + } = ""; + [global::ProtoBuf.ProtoMember(2)] [global::System.ComponentModel.DefaultValue("")] public string file_path From ee84773dac77ab1e93ac4fe9465ca4407177bb9f Mon Sep 17 00:00:00 2001 From: Saransh Saini Date: Thu, 12 Sep 2024 19:13:28 -0700 Subject: [PATCH 11/11] version --- CodeiumVS/LanguageServer/LanguageServer.cs | 1 + CodeiumVS/source.extension.vsixmanifest | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs index 75d57ea..8136a0e 100644 --- a/CodeiumVS/LanguageServer/LanguageServer.cs +++ b/CodeiumVS/LanguageServer/LanguageServer.cs @@ -66,6 +66,7 @@ public async Task InitializeAsync() await PrepareAsync(); _metadata.request_id = 0; + // TODO: Change name _metadata.ide_name = "vscode"; _metadata.ide_version = ideVersion; _metadata.extension_name = Vsix.Name; diff --git a/CodeiumVS/source.extension.vsixmanifest b/CodeiumVS/source.extension.vsixmanifest index 4fcbf5b..97b5d01 100644 --- a/CodeiumVS/source.extension.vsixmanifest +++ b/CodeiumVS/source.extension.vsixmanifest @@ -1,7 +1,7 @@ - + Codeium The modern coding superpower: free AI code acceleration plugin for your favorite languages. Type less. Code more. Ship faster. https://www.codeium.com