Merge pull request #315 from tomasr/develop

v4.4 Release

README.md

@@ -1,6 +1,6 @@
 # Viasfora
 
-A Visual Studio 2012 - 2017 extension that enhances the
+A Visual Studio 2020 extension that enhances the
 text editing experience!
 
 __Official Site__: http://viasfora.com/

appveyor.yml

@@ -2,7 +2,7 @@ configuration: Release
 
 platform: Any CPU
 
-image: Visual Studio 2017
+image: Visual Studio 2022
 
 environment:
   EnableNuGetPackageRestore: true

src/Viasfora.Core/Commands/TextViewCommandListener.cs

@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Editor;
 using Microsoft.VisualStudio.OLE.Interop;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Utilities;
@@ -54,6 +55,7 @@ public TextViewCommandHandler(TextViewCommandListener provider, IVsTextView view
     }
 
     public int QueryStatus(ref Guid pguidCmdGroup, uint cCmds, OLECMD[] prgCmds, IntPtr pCmdText) {
+      ThreadHelper.ThrowIfNotOnUIThread();
       var cmdId = (int)prgCmds[0].cmdID;
       var handler = this.provider.FindHandler(pguidCmdGroup, cmdId);
       if ( handler != null ) {
@@ -87,6 +89,7 @@ public void SetOleCmdText(IntPtr pCmdText, string text) {
     }
 
     public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut) {
+      ThreadHelper.ThrowIfNotOnUIThread();
       int hr = VSConstants.S_OK;
       var cmdId = (int)nCmdID;
       var handler = this.provider.FindHandler(pguidCmdGroup, cmdId);

src/Viasfora.Core/Compatibility/SComponentModel.cs

@@ -1,9 +1,6 @@
 using Microsoft.VisualStudio.Shell;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 
 namespace Winterdom.Viasfora.Compatibility {
 
@@ -15,8 +12,12 @@ public class SComponentModel {
     private object sComponentModel;
 
     public SComponentModel() {
+      ThreadHelper.ThrowIfNotOnUIThread();
       this.sComponentModel = 
         ServiceProvider.GlobalProvider.GetService(new Guid(SComponentModelHost));
+      if ( this.sComponentModel == null ) {
+        throw new InvalidOperationException("SComponentModelHost not available");
+      }
     }
 
     public T GetService<T>() {

src/Viasfora.Core/Margins/DevViewMargin.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Windows;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
 using Microsoft.VisualStudio.Utilities;
@@ -104,6 +105,7 @@ private void OnGraphBuffersChanged(object sender, GraphBuffersChangedEventArgs e
     }
 
     private void OnViewBuffer(object sender, EventArgs e) {
+      ThreadHelper.ThrowIfNotOnUIThread();
       var buffer = GetSelectedBuffer();
       if ( buffer != null ) {
         OpenBufferInEditor(buffer);

src/Viasfora.Core/Outlining/UserOutliningManager.cs

@@ -1,4 +1,5 @@
 using System;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;
 using Winterdom.Viasfora.Settings;
 
@@ -20,6 +21,7 @@ public static IOutliningManager GetManager(ITextBuffer buffer) {
     }
 
     protected override void OnSpanAdded(SnapshotSpan span) {
+      ThreadHelper.ThrowIfNotOnUIThread();
       UpdateUserSettings(span.Snapshot.TextBuffer, span.Snapshot);
     }
     protected override void OnRegionRemoved(SnapshotPoint point) {