Merge pull request #61 from madskristensen/master

Load image async

Author: rionmonster

GlyphfriendPackage.cs

@@ -1,15 +1,12 @@
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 namespace Glyphfriend
 {
-    [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
-    public sealed class GlyphfriendPackage : Package
+    public sealed class GlyphfriendPackage
     {
         private static Dictionary<string, Dictionary<string,ImageSource>> _glyphs;
         internal static Dictionary<string, Dictionary<string, ImageSource>> Glyphs

Helpers/HtmlTextViewListener.cs

@@ -1,9 +1,8 @@
-using System;
-using System.ComponentModel.Composition;
+using System.ComponentModel.Composition;
 using Microsoft.VisualStudio.Editor;
+using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Utilities;
-using Microsoft.VisualStudio.Text.Editor;
 
 namespace Glyphfriend.Helpers
 {
@@ -16,9 +15,12 @@ class HtmlTextViewListener : IVsTextViewCreationListener
         public void VsTextViewCreated(IVsTextView textViewAdapter)
         {
             // If the Glyphs haven't been loaded, load them
-            if(GlyphfriendPackage.Glyphs == null)
+            if (GlyphfriendPackage.Glyphs == null)
             {
-                GlyphfriendPackage.LoadGlyphs();
+                System.Threading.Tasks.Task.Run(() =>
+                {
+                    GlyphfriendPackage.LoadGlyphs();
+                });
             }
         }
     }

Helpers/MarkdownTextViewListener.cs

@@ -1,14 +1,14 @@
 using System;
 using System.ComponentModel.Composition;
+using System.Runtime.InteropServices;
+using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Editor;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Utilities;
-using Microsoft.VisualStudio;
-using System.Runtime.InteropServices;
 
 namespace Glyphfriend.Helpers
 {
@@ -28,7 +28,10 @@ public void VsTextViewCreated(IVsTextView textViewAdapter)
             // If the Emojis haven't been loaded, load them
             if (GlyphfriendPackage.Emojis == null)
             {
-                GlyphfriendPackage.LoadEmojis();
+                System.Threading.Tasks.Task.Run(() =>
+                {
+                    GlyphfriendPackage.LoadEmojis();
+                });
             }
 
             // Set up the Completion handler for Markdown documents
@@ -91,7 +94,7 @@ public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pv
                 hresult = Next.Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
             }
 
-            // After the pre-processing has been performed, evaluate the current state 
+            // After the pre-processing has been performed, evaluate the current state
             // and session
             if (ErrorHandler.Succeeded(hresult))
             {
@@ -153,6 +156,13 @@ private bool Start()
             SnapshotPoint caret = _textView.Caret.Position.BufferPosition;
             ITextSnapshot snapshot = caret.Snapshot;
 
+            if (caret > 1)
+            {
+                char prev = snapshot.GetText(caret - 2, 1)[0];
+                if (!char.IsWhiteSpace(prev))
+                    return false;
+            }
+
             // Generate a session based off of the existing broker and textview
             if (!_broker.IsCompletionActive(_textView))
             {
@@ -177,7 +187,7 @@ private bool Complete(bool force)
             {
                 return false;
             }
-                
+
             // Based off of the available selection, determine if it should be dismissed (via Dismiss) or
             // output (via Commit)
             if (!_currentSession.SelectedCompletionSet.SelectionStatus.IsSelected && !force)
@@ -213,7 +223,7 @@ private bool Cancel()
             {
                 return false;
             }
-                
+
             // Explicitly cancel the current session
             _currentSession.Dismiss();
 
@@ -223,7 +233,7 @@ private bool Cancel()
         private bool DoesSessionExist
         {
             // Ensures that the current session exists
-            get { return _currentSession != null;  }
+            get { return _currentSession != null; }
         }
 
         private static char GetTypeChar(IntPtr pvaIn)