Fix of loading solution on VS start.

Author: VladD2

.vs/Nitra.sqlite

@@ -102,7 +102,6 @@ bool StartSession()
       var snapshot = caretPos.Snapshot;
 
 
-      var client = fileModel.Server.Client;
       if (session == null)
         _session = session = _provider.CompletionBroker.CreateCompletionSession(_wpfTextView, snapshot.CreateTrackingPoint(caretPos, PointTrackingMode.Positive), true);
       var triggerPoint = session.GetTriggerPoint(textBuffer);

Ide/NitraCommonVSIX/CodeCompletion/NitraCompletionCommandHandler.cs

@@ -26,6 +26,10 @@
 using System.Windows.Shapes;
 using System.Diagnostics;
 
+using Path = System.IO.Path;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+
 namespace Nitra.VisualStudio.BraceMatching
 {
   public class InteractiveHighlightingTagger : ITagger<TextMarkerTag>
@@ -38,7 +42,9 @@ public class InteractiveHighlightingTagger : ITagger<TextMarkerTag>
     public event EventHandler<SnapshotSpanEventArgs>  TagsChanged;
 
     public InteractiveHighlightingTagger(IWpfTextView wpfTextView, ITextBuffer textBuffer)
-    {
+    {
+      ThreadHelper.ThrowIfNotOnUIThread();
+
       _wpfTextView = wpfTextView;
       _textBuffer  = textBuffer;
       _caretPosOpt = null;
@@ -47,7 +53,13 @@ public InteractiveHighlightingTagger(IWpfTextView wpfTextView, ITextBuffer textB
       _wpfTextView.LayoutChanged                 += ViewLayoutChanged;
       _wpfTextView.Closed                        += _textView_Closed;
       ((UIElement)_wpfTextView).IsVisibleChanged += Elem_IsVisibleChanged;
-
+
+      if (NitraCommonVsPackage.Instance == null)
+      {
+        NitraCommonVsPackage.DeferUntilPackageInitialization(() => UpdateAtCaretPosition(_wpfTextView.Caret.Position));
+        return;
+      }
+
       UpdateAtCaretPosition(_wpfTextView.Caret.Position);
     }
 
@@ -96,6 +108,20 @@ TextViewModel GetTextViewModelOpt()
       if (_textBuffer.Properties.TryGetProperty<FileModel>(Constants.FileModelKey, out var fileModel))
         return VsUtils.GetOrCreateTextViewModel(_wpfTextView, fileModel);
 
+      var package = NitraCommonVsPackage.Instance;
+
+      if (package == null)
+        return null;
+
+      var servers = package.Servers;
+
+      foreach (var server in servers)
+      {
+        textViewModel = package.TryCreateTextViewModel(_wpfTextView, server);
+        if (textViewModel != null)
+          return textViewModel;
+      }
+
       return null;
     }
 

Ide/NitraCommonVSIX/InteractiveHighlighting/InteractiveHighlightingTagger.cs

@@ -23,6 +23,7 @@
 using System.IO;
 using Microsoft.VisualStudio.Shell;
 using Nitra.VisualStudio.Utils;
+using Microsoft.VisualStudio.TextManager.Interop;
 
 namespace Nitra.VisualStudio
 {
@@ -48,9 +49,9 @@ internal class ServerModel : IDisposable
 
     public ServerModel(StringManager stringManager, Ide.Config config, IServiceProvider serviceProvider)
     {
-      Contract.Requires(stringManager != null);
-      Contract.Requires(config != null);
-      Contract.Requires(serviceProvider != null);
+      Debug.Assert(stringManager != null);
+      Debug.Assert(config != null);
+      Debug.Assert(serviceProvider != null);
 
       ServiceProvider = serviceProvider;
 
@@ -92,12 +93,7 @@ private static M.Config ConvertConfig(Ide.Config config)
       return msgConfig;
     }
 
-    FileModel GetFileModelOpt(FileId fileId)
-    {
-      if (_filIdToFileModelMap.TryGetValue(fileId, out var fileModel))
-        return fileModel;
-      return null;
-    }
+    FileModel GetFileModelOpt(FileId fileId) => _filIdToFileModelMap.TryGetValue(fileId, out var fileModel) ? fileModel : null;
 
     internal void Add(FileModel fileModel)
     {
@@ -254,7 +250,7 @@ internal void ViewActivated(IWpfTextView wpfTextView, FileId id, IVsHierarchy hi
       fileModel.ViewActivated(textViewModel);
     }
 
-    void TryAddServerProperty(ITextBuffer textBuffer)
+    internal void TryAddServerProperty(ITextBuffer textBuffer)
     {
       if (!textBuffer.Properties.ContainsProperty(Constants.ServerKey))
         textBuffer.Properties.AddProperty(Constants.ServerKey, this);