Merge branch 'all-constructors-import' of https://github.com/July541/haskell-language-server into all-constructors-import

Author: July541

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

@@ -230,7 +230,7 @@ mkNameCompItem doc thingParent origName provenance thingType isInfix docs !imp =
     insertText = case isInfix of
             Nothing -> case getArgText <$> thingType of
                             Nothing      -> label
-                            Just argText -> label <> " " <> argText
+                            Just argText -> if T.null argText then label else label <> " " <> argText
             Just LeftSide -> label <> "`"
 
             Just Surrounded -> label

ghcide/src/Development/IDE/Types/Exports.hs

@@ -22,7 +22,7 @@ import qualified Data.HashMap.Strict         as Map
 import           Data.HashSet                (HashSet)
 import qualified Data.HashSet                as Set
 import           Data.Hashable               (Hashable)
-import           Data.List                   (isSuffixOf)
+import           Data.List                   (isSuffixOf, foldl')
 import           Data.Text                   (Text, pack)
 import           Development.IDE.GHC.Compat
 import           Development.IDE.GHC.Orphans ()
@@ -32,8 +32,8 @@ import           HieDb
 
 
 data ExportsMap = ExportsMap
-    { getExportsMap       :: HashMap IdentifierText (HashSet IdentInfo)
-    , getModuleExportsMap :: HashMap ModuleNameText (HashSet IdentInfo)
+    { getExportsMap       :: !(HashMap IdentifierText (HashSet IdentInfo))
+    , getModuleExportsMap :: !(HashMap ModuleNameText (HashSet IdentInfo))
     }
     deriving (Show)
 
@@ -134,13 +134,11 @@ createExportsMapMg modGuts = do
       concatMap (fmap (second Set.fromList) . unpackAvail getModuleName) (mg_exports mi)
 
 updateExportsMapMg :: [ModGuts] -> ExportsMap -> ExportsMap
-updateExportsMapMg modGuts old =
-    old' <> new
+updateExportsMapMg modGuts old = old' <> new
     where
         new = createExportsMapMg modGuts
         old' = deleteAll old (Map.keys $ getModuleExportsMap new)
-        deleteAll = foldr deleteEntriesForModule
-
+        deleteAll = foldl' (flip deleteEntriesForModule)
 
 createExportsMapTc :: [TcGblEnv] -> ExportsMap
 createExportsMapTc modIface = do

ghcide/test/exe/Main.hs

@@ -4839,13 +4839,13 @@ nonLocalCompletionTests =
       "constructor"
       ["{-# OPTIONS_GHC -Wall #-}", "module A where", "f = True"]
       (Position 2 8)
-      [ ("True", CiConstructor, "True ", True, True, Nothing)
+      [ ("True", CiConstructor, "True", True, True, Nothing)
       ],
     completionTest
       "type"
       ["{-# OPTIONS_GHC -Wall #-}", "module A () where", "f :: Boo", "f = True"]
       (Position 2 8)
-      [ ("Bool", CiStruct, "Bool ", True, True, Nothing)
+      [ ("Bool", CiStruct, "Bool", True, True, Nothing)
       ],
     completionTest
       "qualified"
@@ -5020,7 +5020,7 @@ otherCompletionTests = [
       -- This should be sufficient to detect that we are in a
       -- type context and only show the completion to the type.
       (Position 3 11)
-      [("Integer", CiStruct, "Integer ", True, True, Nothing)],
+      [("Integer", CiStruct, "Integer", True, True, Nothing)],
 
     testSession "duplicate record fields" $ do
       void $

hls-graph/src/Development/IDE/Graph/Internal/Types.hs

@@ -120,12 +120,12 @@ getDatabaseValues = atomically
                   . databaseValues
 
 data Status
-    = Clean Result
+    = Clean !Result
     | Dirty (Maybe Result)
     | Running {
         runningStep   :: !Step,
         runningWait   :: !(IO ()),
-        runningResult :: Result,
+        runningResult :: Result,     -- LAZY
         runningPrev   :: !(Maybe Result)
         }
 
@@ -145,7 +145,7 @@ data Result = Result {
     resultVisited   :: !Step, -- ^ the step when it was last looked up
     resultDeps      :: !ResultDeps,
     resultExecution :: !Seconds, -- ^ How long it took, last time it ran
-    resultData      :: BS.ByteString
+    resultData      :: !BS.ByteString
     }
 
 data ResultDeps = UnknownDeps | AlwaysRerunDeps ![Key] | ResultDeps ![Key]

test/functional/Completion.hs

@@ -163,7 +163,7 @@ snippetTests = testGroup "snippets" [
       item <- getCompletionByLabel "Nothing" compls
       liftIO $ do
           item ^. insertTextFormat @?= Just Snippet
-          item ^. insertText @?= Just "Nothing "
+          item ^. insertText @?= Just "Nothing"
 
     , testCase "work for polymorphic types" $ runSession hlsCommand fullCaps "test/testdata/completion" $ do
         doc <- openDoc "Completion.hs" "haskell"