better completion sorting, and consistent across Windows and Nix

OmniSharp · May 2, 2017 · 96b3033 · 96b3033
1 parent b179067
commit 96b3033
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Composition;
 using System.Linq;
@@ -60,14 +61,14 @@ public async Task<IEnumerable<AutoCompleteResponse>> Handle(AutoCompleteRequest
                                     {
                                         if (request.WantSnippet)
                                         {
-                                            foreach (var completion in MakeSnippetedResponses(request, symbol, item.DisplayText))
+                                            foreach (var completion in MakeSnippetedResponses(request, symbol, item))
                                             {
                                                 completions.Add(completion);
                                             }
                                         }
                                         else
                                         {
-                                            completions.Add(MakeAutoCompleteResponse(request, symbol, item.DisplayText));
+                                            completions.Add(MakeAutoCompleteResponse(request, symbol, item));
                                         }
                                     }
                                 }
@@ -99,7 +100,8 @@ public async Task<IEnumerable<AutoCompleteResponse>> Handle(AutoCompleteRequest
                 .ThenByDescending(c => c.CompletionText.IsValidCompletionStartsWithIgnoreCase(wordToComplete))
                 .ThenByDescending(c => c.CompletionText.IsCamelCaseMatch(wordToComplete))
                 .ThenByDescending(c => c.CompletionText.IsSubsequenceMatch(wordToComplete))
-                .ThenBy(c => c.CompletionText);
+                .ThenBy(c => c.DisplayText, StringComparer.OrdinalIgnoreCase)
+                .ThenBy(c => c.CompletionText, StringComparer.OrdinalIgnoreCase);
         }
 
         private IEnumerable<AutoCompleteResponse> MakeSnippetedResponses(AutoCompleteRequest request, ISymbol symbol, string displayName)