Sort completions alphabetically

Author: pepeiborra

ghcide/src/Development/IDE/Plugin/Completions/Logic.hs

@@ -652,8 +652,7 @@ getCompletions plId ideOpts CC {allModNamesAsNS, anyQualCompls, unqualCompls, qu
         --  3. label alphabetical ordering next
         --  4. module alphabetical ordering
         lexicographicOrdering Fuzzy.Scored{score_, original=(isQual, CompletionItem{_label,_detail})} =
-            -- TODO uncomment the line below to sort alphabetically and fix tests
-            Down isQual -- , Down score_, _label, _detail)
+            (Down isQual, Down score_, _label, _detail)
 
 uniqueCompl :: CompItem -> CompItem -> Ordering
 uniqueCompl candidate unique =

ghcide/test/exe/Main.hs

@@ -4315,10 +4315,9 @@ nonLocalCompletionTests =
       ],
     completionTest
       "type"
-      ["{-# OPTIONS_GHC -Wall #-}", "module A () where", "f :: Bo", "f = True"]
-      (Position 2 7)
-      [ ("Bounded", CiInterface, "Bounded ${1:(*)}", True, True, Nothing),
-        ("Bool", CiStruct, "Bool ", True, True, Nothing)
+      ["{-# OPTIONS_GHC -Wall #-}", "module A () where", "f :: Boo", "f = True"]
+      (Position 2 8)
+      [ ("Bool", CiStruct, "Bool ", True, True, Nothing)
       ],
     completionTest
       "qualified"
@@ -4505,7 +4504,7 @@ otherCompletionTests = [
       _ <- waitForDiagnostics
       compls <- getCompletions docA $ Position 2 4
       let compls' = [txt | CompletionItem {_insertText = Just txt, ..} <- compls, _label == "member"]
-      liftIO $ take 2 compls' @?= ["member ${1:Foo}", "member ${1:Bar}"],
+      liftIO $ take 2 compls' @?= ["member ${1:Bar}", "member ${1:Foo}"],
 
     testSessionWait "maxCompletions" $ do
         doc <- createDoc "A.hs" "haskell" $ T.unlines