Fix crash trying to edit file when no solution loaded (fixes #37)

Dreamescaper · Nov 8, 2018 · 2c8b60d · 2c8b60d
1 parent 5839f8f
commit 2c8b60d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/IntelliSenseExtender/IntelliSense/Providers/AggregateTypeCompletionProvider.cs b/IntelliSenseExtender/IntelliSense/Providers/AggregateTypeCompletionProvider.cs
@@ -46,6 +46,11 @@ public AggregateTypeCompletionProvider(IOptionsProvider optionsProvider, params
 
         public override async Task ProvideCompletionsAsync(CompletionContext context)
         {
+            if (Options == null)
+            {
+                // Package not loaded yet (e.g. no solution opened)
+                return;
+            }
             if (await IsWatchWindowAsync(context).ConfigureAwait(false))
             {
                 // Completions are not usable in watch window
@@ -80,6 +85,12 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
 
         public override bool ShouldTriggerCompletion(SourceText text, int caretPosition, CompletionTrigger trigger, OptionSet options)
         {
+            if (Options == null)
+            {
+                // Package not loaded yet (e.g. no solution opened)
+                return false;
+            }
+
             bool shouldTrigger = triggerCompletions.Any(c => c.ShouldTriggerCompletion(text, caretPosition, trigger, Options));
 
             return shouldTrigger || base.ShouldTriggerCompletion(text, caretPosition, trigger, options);

diff --git a/IntelliSenseExtender/Options/OptionsProvider.cs b/IntelliSenseExtender/Options/OptionsProvider.cs
@@ -8,16 +8,18 @@ public Options GetOptions()
         {
             var optionsPage = IntelliSenseExtenderPackage.OptionsPage;
 
-            return new Options
-            {
-                SortCompletionsAfterImported = optionsPage.SortCompletionsAfterImported,
-                FilterOutObsoleteSymbols = optionsPage.FilterOutObsoleteSymbols,
-                SuggestNestedTypes = optionsPage.SuggestNestedTypes,
-                SuggestTypesOnObjectCreation = optionsPage.SuggestTypesOnObjectCreation,
-                AddParethesisForNewSuggestions = optionsPage.AddParethesisForNewSuggestions,
-                SuggestFactoryMethodsOnObjectCreation = optionsPage.SuggestFactoryMethodsOnObjectCreation,
-                SuggestLocalVariablesFirst = optionsPage.SuggestLocalVariablesFirst
-            };
+            return optionsPage == null
+                ? null
+                : new Options
+                {
+                    SortCompletionsAfterImported = optionsPage.SortCompletionsAfterImported,
+                    FilterOutObsoleteSymbols = optionsPage.FilterOutObsoleteSymbols,
+                    SuggestNestedTypes = optionsPage.SuggestNestedTypes,
+                    SuggestTypesOnObjectCreation = optionsPage.SuggestTypesOnObjectCreation,
+                    AddParethesisForNewSuggestions = optionsPage.AddParethesisForNewSuggestions,
+                    SuggestFactoryMethodsOnObjectCreation = optionsPage.SuggestFactoryMethodsOnObjectCreation,
+                    SuggestLocalVariablesFirst = optionsPage.SuggestLocalVariablesFirst
+                };
         }
     }
 }
diff --git a/IntelliSenseExtender/source.extension.vsixmanifest b/IntelliSenseExtender/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="IntelliSenseExtender.Dreamescaper.87a2f156-5263-457a-bca9-45f1ca5643ef" Version="0.9.2" Language="en-US" Publisher="Oleksandr Liakhevych (Dreamescaper)" />
+        <Identity Id="IntelliSenseExtender.Dreamescaper.87a2f156-5263-457a-bca9-45f1ca5643ef" Version="0.9.3" Language="en-US" Publisher="Oleksandr Liakhevych (Dreamescaper)" />
         <DisplayName>IntelliSense Extender</DisplayName>
         <Description xml:space="preserve">Provide IntelliSense completions not only for imported types, but for all available in current solution and referenced assemblies.</Description>
         <MoreInfo>https://github.com/Dreamescaper/IntelliSenseExtender</MoreInfo>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+0.9.3
++ Fix crash trying to edit file when no solution loaded
+
 0.9.2
 
 + Fix hang during attributes editing