Merge pull request #674 from DustinCampbell/fix-autocomplete-exception

Don't throw null-ref when Roslyn CompletionService doesn't return anything
OmniSharp · Nov 22, 2016 · 58767a2 · 58767a2
2 parents 5a3223d + 4ae6711
commit 58767a2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 18 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs
@@ -44,24 +44,27 @@ public async Task<IEnumerable<AutoCompleteResponse>> Handle(AutoCompleteRequest
                 // Add keywords from the completion list. We'll use the recommender service to get symbols
                 // to create snippets from.
 
-                foreach (var item in completionList.Items)
+                if (completionList != null)
                 {
-                    if (item.Tags.Contains(CompletionTags.Keyword))
+                    foreach (var item in completionList.Items)
                     {
-                        // Note: For keywords, we'll just assume that the completion text is the same
-                        // as the display text.
-                        var keyword = item.DisplayText;
-                        if (keyword.IsValidCompletionFor(wordToComplete))
+                        if (item.Tags.Contains(CompletionTags.Keyword))
                         {
-                            var response = new AutoCompleteResponse()
+                            // Note: For keywords, we'll just assume that the completion text is the same
+                            // as the display text.
+                            var keyword = item.DisplayText;
+                            if (keyword.IsValidCompletionFor(wordToComplete))
                             {
-                                CompletionText = item.DisplayText,
-                                DisplayText = item.DisplayText,
-                                Snippet = item.DisplayText,
-                                Kind = request.WantKind ? "Keyword" : null
-                            };
-
-                            completions.Add(response);
+                                var response = new AutoCompleteResponse()
+                                {
+                                    CompletionText = item.DisplayText,
+                                    DisplayText = item.DisplayText,
+                                    Snippet = item.DisplayText,
+                                    Kind = request.WantKind ? "Keyword" : null
+                                };
+
+                                completions.Add(response);
+                            }
                         }
                     }
                 }

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/IntellisenseFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/IntellisenseFacts.cs
@@ -182,6 +182,22 @@ public MyClass1()
             ContainsCompletions(completions.Select(c => c.CompletionText), "MyClass1", "myvar");
         }
 
+        [Fact]
+        public async Task Returns_empty_sequence_in_invalid_context()
+        {
+            var source =
+                @"public class MyClass1 {
+
+                    public MyClass1()
+                        {
+                            var x$
+                        }
+                    }";
+
+            var completions = await FindCompletionsAsync(source);
+            ContainsCompletions(completions.Select(c => c.CompletionText), Array.Empty<string>());
+        }
+
         private void ContainsCompletions(IEnumerable<string> completions, params string[] expected)
         {
             if (!completions.SequenceEqual(expected))
@@ -217,10 +233,7 @@ private async Task<IEnumerable<AutoCompleteResponse>> FindCompletionsAsync(strin
                 request = CreateRequest(source);
             }
 
-            var response = await controller.Handle(request);
-            var completions = response as IEnumerable<AutoCompleteResponse>;
-
-            return completions;
+            return await controller.Handle(request);
         }
 
         private AutoCompleteRequest CreateRequest(string source, string fileName = "dummy.cs", bool wantSnippet = false)