fix final crashes

Exafunction · Mar 20, 2024 · 7cc0848 · 7cc0848
1 parent ea13d07
commit 7cc0848
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/CodeiumVS/LanguageServer/LanguageServer.cs b/CodeiumVS/LanguageServer/LanguageServer.cs
@@ -26,7 +26,7 @@ namespace CodeiumVS;
 public class LanguageServer
 {
     private string _languageServerURL;
-    private string _languageServerVersion = "1.8.6";
+    private string _languageServerVersion = "1.8.14";
 
     private int _port = 0;
     private System.Diagnostics.Process _process;

diff --git a/CodeiumVS/SuggestionUI/InlineGreyTextTagger.cs b/CodeiumVS/SuggestionUI/InlineGreyTextTagger.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -61,17 +62,23 @@ public void FormatText(TextRunProperties props)
 
     public void MarkDirty()
     {
-        var changeStart = view.TextViewLines.FirstVisibleLine.Start;
-        var changeEnd = view.TextViewLines.LastVisibleLine.Start;
+        try
+        {
+            var changeStart = view.TextViewLines.FirstVisibleLine.Start;
+            var changeEnd = view.TextViewLines.LastVisibleLine.Start;
 
-        var startLine = view.TextSnapshot.GetLineFromPosition(changeStart);
-        var endLine = view.TextSnapshot.GetLineFromPosition(changeEnd);
+            var startLine = view.TextSnapshot.GetLineFromPosition(changeStart);
+            var endLine = view.TextSnapshot.GetLineFromPosition(changeEnd);
 
-        var span = new SnapshotSpan(startLine.Start, endLine.EndIncludingLineBreak)
-                       .TranslateTo(targetSnapshot: view.TextBuffer.CurrentSnapshot,
-                                    SpanTrackingMode.EdgePositive);
+            var span = new SnapshotSpan(startLine.Start, endLine.EndIncludingLineBreak)
+                            .TranslateTo(targetSnapshot: view.TextBuffer.CurrentSnapshot,
+                                        SpanTrackingMode.EdgePositive);
 
-        TagsChanged(this, new SnapshotSpanEventArgs(new SnapshotSpan(span.Start, span.End)));
+            TagsChanged(this, new SnapshotSpanEventArgs(new SnapshotSpan(span.Start, span.End)));
+        } catch (Exception e)
+        {
+            Debug.Write(e);
+        }
     }
 
     // Produces tags on the snapshot that the tag consumer asked for.

diff --git a/CodeiumVS/SuggestionUI/TextViewListener.cs b/CodeiumVS/SuggestionUI/TextViewListener.cs
@@ -150,6 +150,7 @@ List<Tuple<String, String>> ParseCompletion(IList<Packets.CompletionItem> comple
                 endOffset = Utf8OffsetToUtf16Offset(text, endOffset);
                 insertionStart = Utf8OffsetToUtf16Offset(text, insertionStart);
             }
+            if (endOffset > text.Length) { endOffset = text.Length; }
             string end = text.Substring(endOffset);
             String completionText = completionItems[i].completion.text;
             if (!String.IsNullOrEmpty(end))
@@ -161,7 +162,7 @@ List<Tuple<String, String>> ParseCompletion(IList<Packets.CompletionItem> comple
                 completionText = completionText + end.Substring(0, endNewline);
             }
             int offset = StringCompare.CheckSuggestion(completionText, prefix);
-            if (offset < 0) { continue; }
+            if (offset < 0 || offset > completionText.Length) { continue; }
 
             completionText = completionText.Substring(offset);
             string completionID = completionItem.completion.completionId;
@@ -176,6 +177,7 @@ List<Tuple<String, String>> ParseCompletion(IList<Packets.CompletionItem> comple
                 string intellisenseSuggestion = completion.InsertionText;
                 ITrackingSpan intellisenseSpan = session.SelectedCompletionSet.ApplicableTo;
                 SnapshotSpan span = intellisenseSpan.GetSpan(intellisenseSpan.TextBuffer.CurrentSnapshot);
+                if (span.Length > intellisenseSuggestion.Length) { continue; }
                 string intellisenseInsertion = intellisenseSuggestion.Substring(span.Length);
                 if (!completionText.StartsWith(intellisenseInsertion))
                 {

diff --git a/CodeiumVS/source.extension.cs b/CodeiumVS/source.extension.cs
@@ -11,7 +11,7 @@ internal sealed partial class Vsix
         public const string Name = "Codeium";
         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.8.6";
+        public const string Version = "1.8.14";
         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.8.6" Language="en-US" Publisher="Codeium" />
+        <Identity Id="Codeium.VisualStudio" Version="1.8.14" 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>