Merge pull request #45 from Exafunction/exafunction/update

Bring to head of internal repo
Exafunction · Jan 11, 2024 · 878afc6 · 878afc6
2 parents 33b3291 + 52872d3
commit 878afc6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs
@@ -25,7 +25,7 @@ namespace CodeiumVS;
 public class LanguageServer
 {
     private string _languageServerURL;
-    private string _languageServerVersion = "1.6.13";
+    private string _languageServerVersion = "1.6.22";
 
     private int _port = 0;
     private Process _process;
@@ -201,8 +201,10 @@ public async Task SignOutAsync()
     /// <returns></returns>
     private async Task GetLanguageServerInfoAsync()
     {
-        string extensionBaseUrl = (_package.SettingsPage.ExtensionBaseUrl.Equals("") ? "https://github.com/Exafunction/codeium/releases/download"
-                                                                 : _package.SettingsPage.ExtensionBaseUrl.Trim().TrimEnd('/'));
+        string extensionBaseUrl =
+            (_package.SettingsPage.ExtensionBaseUrl.Equals("")
+                 ? "https://github.com/Exafunction/codeium/releases/download"
+                 : _package.SettingsPage.ExtensionBaseUrl.Trim().TrimEnd('/'));
 
         if (_package.SettingsPage.EnterpriseMode)
         {
@@ -395,7 +397,8 @@ public async Task PrepareAsync()
         }
 
         await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
-        await _package.LogAsync($"Downloading language server v{_languageServerVersion} from {_languageServerURL}");
+        await _package.LogAsync(
+            $"Downloading language server v{_languageServerVersion} from {_languageServerURL}");
 
         // show the downloading progress dialog before starting the thread to make it feels more
         // responsive

diff --git a/CodeiumVS/LanguageServer/Packets.cs b/CodeiumVS/LanguageServer/Packets.cs
@@ -2662,6 +2662,7 @@ public enum Language
     LANGUAGE_NIM = 88,
     LANGUAGE_PROLOG = 89,
     LANGUAGE_MARKDOWN_INLINE = 90,
+    LANGUAGE_APEX = 91,
 }
 
 [global::ProtoBuf.ProtoContract()]

diff --git a/CodeiumVS/SettingsPage.cs b/CodeiumVS/SettingsPage.cs
@@ -46,12 +46,10 @@ public string PortalUrl
         "If you're experiencing network issues with GitHub and can't download the language server, please change this to a GitHub Mirror URL instead. For example: https://gh.api.99988866.xyz/https://github.com/Exafunction/codeium/releases/download")]
     public string ExtensionBaseUrl
     {
-        get
-        {
+        get {
             return extensionBaseUrl;
         }
-        set
-        {
+        set {
             extensionBaseUrl = value;
         }
     }

diff --git a/CodeiumVS/Windows/ChatToolWindow.cs b/CodeiumVS/Windows/ChatToolWindow.cs
@@ -235,25 +235,28 @@ static uint GetColor(ThemeResourceKey key)
 
             style.textContent = `
             body {{
-
                 /* window background */
-	            --vscode-editor-background:                #{GetColor(CommonControlsColors.ComboBoxBackgroundBrushKey):x8};
-	            --vscode-editor-foreground:                #{textColor:x8};
-	            --vscode-sideBar-background:               #{GetColor(EnvironmentColors.ToolWindowBackgroundBrushKey):x8};
-	            --vscode-foreground:                       #{textColor:x8};
+	            --codeium-editor-background:               #{GetColor(CommonControlsColors.ComboBoxBackgroundBrushKey):x8};
+	            --codeium-editor-color:                    #{textColor:x8};
+	            --codeium-chat-background:                 #{GetColor(EnvironmentColors.ToolWindowBackgroundBrushKey):x8};
+	            --codeium-text-color:                      #{textColor:x8};
 
                  /* user message block */
-	            --vscode-list-activeSelectionBackground:   #{GetColor(EnvironmentColors.VizSurfaceSteelBlueMediumBrushKey):x8};
-	            --vscode-list-hoverBackground:             #{GetColor(CommonControlsColors.ComboBoxBackgroundHoverBrushKey):x8};
-                --vscode-list-activeSelectionForeground:   #{textColor:x8};
+                --codeium-message-block-user-background:   #{GetColor(EnvironmentColors.VizSurfaceSteelBlueMediumBrushKey):x8};
+                --codeium-message-block-user-color:        #{textColor:x8};
 
                  /* bot message block */
-	            --vscode-list-inactiveSelectionBackground: #{GetColor(CommonControlsColors.ComboBoxBackgroundDisabledBrushKey):x8};
+	            --codeium-message-block-bot-background:    #{GetColor(CommonControlsColors.ComboBoxBackgroundDisabledBrushKey):x8};
+                --codeium-message-block-bot-color:         #{textColor:x8};
 
                  /* textbox input */
-	            --vscode-input-background:                 #{GetColor(CommonControlsColors.TextBoxBackgroundBrushKey):x8};
-	            --vscode-input-foreground:                 #{GetColor(CommonControlsColors.TextBoxTextBrushKey):x8};
-	            --vscode-input-placeholderForeground:      #{GetColor(CommonControlsColors.TextBoxTextDisabledBrushKey):x8};
+	            --codeium-input-background:                #{GetColor(CommonControlsColors.TextBoxBackgroundBrushKey):x8};
+	            --codeium-input-color:                     #{GetColor(CommonControlsColors.TextBoxTextBrushKey):x8};
+	            --codeium-input-placeholder:               #{GetColor(CommonControlsColors.TextBoxTextDisabledBrushKey):x8};
+
+                /* hyperlink */
+	            --codeium-link-color:                      #{GetColor(EnvironmentColors.DiagReportLinkTextBrushKey):x8};
+	            --codeium-link-hover-color:                #{GetColor(EnvironmentColors.DiagReportLinkTextHoverColorKey):x8};
 
                 /* border */
 	            --vscode-contrastBorder:                   #{GetColor(CommonDocumentColors.ListItemBorderFocusedBrushKey):x8};
@@ -285,11 +288,6 @@ static uint GetColor(ThemeResourceKey key)
 	            --vscode-dropdown-background:              #{GetColor(EnvironmentColors.DropDownBackgroundBrushKey):x8};
 	            --vscode-dropdown-border:                  #{GetColor(EnvironmentColors.DropDownBorderBrushKey):x8};
 	            --vscode-dropdown-foreground:              #{GetColor(EnvironmentColors.DropDownTextBrushKey):x8};
-
-                /* hyperlink */
-	            --vscode-textLink-foreground:              #{GetColor(EnvironmentColors.DiagReportLinkTextBrushKey):x8};
-	            --vscode-textLink-activeForeground:        #{GetColor(EnvironmentColors.DiagReportLinkTextHoverColorKey):x8};
-
                 /* progressbar */
 	            --vscode-progressBar-background:           #{GetColor(ProgressBarColors.IndicatorFillBrushKey):x8};
 

diff --git a/CodeiumVS/source.extension.cs b/CodeiumVS/source.extension.cs
@@ -12,7 +12,7 @@ internal sealed partial class Vsix
     public const string Description =
         @"The modern coding superpower: free AI code acceleration plugin for your favorite languages. Type less. Code more. Ship faster.";
     public const string Language = "en-US";
-    public const string Version = "1.6.13";
+    public const string Version = "1.6.22";
     public const string Author = "Codeium";
     public const string Tags = "";
 }

diff --git a/CodeiumVS/source.extension.vsixmanifest b/CodeiumVS/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="Codeium.VisualStudio" Version="1.6.13" Language="en-US" Publisher="Codeium" />
+        <Identity Id="Codeium.VisualStudio" Version="1.6.22" Language="en-US" Publisher="Codeium" />
         <DisplayName>Codeium</DisplayName>
         <Description xml:space="preserve">The modern coding superpower: free AI code acceleration plugin for your favorite languages. Type less. Code more. Ship faster.</Description>
         <MoreInfo>https://www.codeium.com</MoreInfo>