Fix html/cshtml null reference (#168)

Fixes

Author: saranshsaini

CodeiumVS/CodeLensConnection/CodeLensListener.cs

@@ -24,6 +24,9 @@ namespace CodeiumVS
     [ContentType("vbscript")]
     [ContentType("TypeScript")]
     [ContentType("JavaScript")]
+    [ContentType("html")]
+    [ContentType("HTMLX")]
+    [ContentType("Razor")]
     public class CodeLensListener : ICodeLensCallbackListener, ICodeLensListener
     {
 

CodeiumVS/InlineDiff/InlineDiffAdornment.cs

@@ -760,6 +760,9 @@ public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pv
 [Export(typeof(ILineTransformSourceProvider))]
 [Name("CodeiumInlineDiffViewProvider")]
 [ContentType("code")]
+[ContentType("html")]
+[ContentType("HTMLX")]
+[ContentType("Razor")]
 [TextViewRole(PredefinedTextViewRoles.Document)]
 internal class CodeiumInlineDiffViewProvider : ILineTransformSourceProvider
 {

CodeiumVS/SuggestionUI/SuggestionTagger.cs

@@ -267,7 +267,9 @@ void AddInsertionTextBlock(int start, int end, string line)
         {
             string remainder = line.Substring(start, end - start);
             var textBlock = CreateTextBox(remainder, greyBrush);
-            GetTagger().UpdateAdornment(textBlock);
+            var inlineTagger = GetTagger();
+            if (inlineTagger == null) { return; }
+            inlineTagger.UpdateAdornment(textBlock);
         }
         catch (ArgumentOutOfRangeException)
         {
@@ -281,7 +283,9 @@ public void UpdateAdornment(IWpfTextView view, string userText, int suggestionSt
         try
         { 
             stackPanel.Children.Clear();
-            GetTagger().ClearAdornment();
+            var inlineTagger = GetTagger();
+            if (inlineTagger == null) { return; }
+            inlineTagger.ClearAdornment();
             for (int i = suggestionStart; i < suggestion.Item2.Length; i++)
             {
                 string line = suggestion.Item2[i];
@@ -363,6 +367,7 @@ private void OnSizeChanged(object sender, EventArgs e)
             var start = view.TextViewLines.GetCharacterBounds(snapshotLine.Start);
 
             InlineGreyTextTagger inlineTagger = GetTagger();
+            if (inlineTagger == null) { return; }
             inlineTagger.FormatText(GetTextFormat());
 
             if (stackPanel.Children.Count > 0)
@@ -516,6 +521,7 @@ public void ClearSuggestion()
         {
             if (!showSuggestion) return;
             InlineGreyTextTagger inlineTagger = GetTagger();
+            if (inlineTagger == null) { return; }
             inlineTagger.ClearAdornment();
             inlineTagger.MarkDirty();
             suggestion = null;
@@ -536,7 +542,9 @@ void MarkDirty()
     {
         try
         {
-            GetTagger().MarkDirty();
+            InlineGreyTextTagger inlineTagger = GetTagger();
+            if (inlineTagger == null) { return; }
+            inlineTagger.MarkDirty();
             ITextSnapshot newSnapshot = buffer.CurrentSnapshot;
             this.snapshot = newSnapshot;
 

CodeiumVS/SuggestionUI/TextViewListener.cs

@@ -399,6 +399,7 @@ public async void ShowNextSuggestion()
                 currentCompletionID = suggestions[suggestionIndex].Item2;
 
                 SuggestionTagger tagger = GetTagger();
+                if (tagger == null) { return; }
 
                 int lineN, characterN;
                 int res = _textViewAdapter.GetCaretPos(out lineN, out characterN);
@@ -432,10 +433,9 @@ public async void ShowNextSuggestion()
     public bool CompleteSuggestion(bool checkLine = true)
     {
         var tagger = GetTagger();
-        bool onSameLine = tagger.OnSameLine();
         if (tagger != null)
         {
-            if (tagger.IsSuggestionActive() && (onSameLine || !checkLine) && tagger.CompleteText())
+            if (tagger.IsSuggestionActive() && (tagger.OnSameLine() || !checkLine) && tagger.CompleteText())
             {
                 ClearCompletionSessions();
                 OnSuggestionAccepted(currentCompletionID);
@@ -535,6 +535,7 @@ public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pv
                 if (bindings == null || bindings.Length <= 0)
                 {
                     var tagger = GetTagger();
+                    if (tagger == null) { return m_nextCommandHandler.Exec(ref pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); }
 
                     ICompletionSession session = m_provider.CompletionBroker.GetSessions(_view).FirstOrDefault();
                     if (session != null && session.SelectedCompletionSet != null)
@@ -636,6 +637,9 @@ public void Dispose()
 [Export(typeof(IVsTextViewCreationListener))]
 [Name("TextViewListener")]
 [ContentType("code")]
+[ContentType("html")]
+[ContentType("HTMLX")]
+[ContentType("Razor")]
 [TextViewRole(PredefinedTextViewRoles.Document)]
 
 internal class TextViewListener : IVsTextViewCreationListener

CodeiumVS/Utilities/TextHighlighter.cs

@@ -97,6 +97,9 @@ public HighlightWordFormatDefinition()
 
 [Export(typeof(IViewTaggerProvider))]
 [ContentType("code")]
+[ContentType("html")]
+[ContentType("HTMLX")]
+[ContentType("Razor")]
 [TagType(typeof(HighlightWordTag))]
 internal class HighlightWordTaggerProvider : IViewTaggerProvider
 {

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.9.12" Language="en-US" Publisher="Codeium" />
+        <Identity Id="Codeium.VisualStudio" Version="1.9.13" 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>