Use ghcide wip/multi-rebased rebased on current master

Author: alanz

cabal.project

@@ -18,4 +18,4 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-03-03T21:14:55Z
+index-state: 2020-03-24T21:15:10Z

exe/Main.hs

@@ -211,10 +211,10 @@ main = do
         ide <- initialise def mainRule (pure $ IdInt 0) (showEvent lock) (logger Info) debouncer (defaultIdeOptions $ loadSession dir) vfs
 
         putStrLn "\nStep 4/6: Type checking the files"
-        setFilesOfInterest ide $ HashSet.fromList $ map toNormalizedFilePath files
-        _ <- runActionSync ide $ uses TypeCheck (map toNormalizedFilePath files)
---        results <- runActionSync ide $ use TypeCheck $ toNormalizedFilePath "src/Development/IDE/Core/Rules.hs"
---        results <- runActionSync ide $ use TypeCheck $ toNormalizedFilePath "exe/Main.hs"
+        setFilesOfInterest ide $ HashSet.fromList $ map toNormalizedFilePath' files
+        _ <- runActionSync ide $ uses TypeCheck (map toNormalizedFilePath' files)
+--        results <- runActionSync ide $ use TypeCheck $ toNormalizedFilePath' "src/Development/IDE/Core/Rules.hs"
+--        results <- runActionSync ide $ use TypeCheck $ toNormalizedFilePath' "exe/Main.hs"
         return ()
 
 expandFiles :: [FilePath] -> IO [FilePath]
@@ -238,7 +238,7 @@ kick = do
 -- | Print an LSP event.
 showEvent :: Lock -> FromServerMessage -> IO ()
 showEvent _ (EventFileDiagnostics _ []) = return ()
-showEvent lock (EventFileDiagnostics (toNormalizedFilePath -> file) diags) =
+showEvent lock (EventFileDiagnostics (toNormalizedFilePath' -> file) diags) =
     withLock lock $ T.putStrLn $ showDiagnosticsColored $ map (file,ShowDiag,) diags
 showEvent lock e = withLock lock $ print e
 
@@ -271,10 +271,10 @@ targetToFile :: [FilePath] -> TargetId -> IO [NormalizedFilePath]
 targetToFile is (TargetModule mod) = do
     let fps = [i </> (moduleNameSlashes mod) -<.> ext | ext <- exts, i <- is ]
         exts = ["hs", "hs-boot", "lhs"]
-    mapM (fmap (toNormalizedFilePath) . canonicalizePath) fps
+    mapM (fmap (toNormalizedFilePath') . canonicalizePath) fps
 targetToFile _ (TargetFile f _) = do
   f' <- canonicalizePath f
-  return [(toNormalizedFilePath f')]
+  return [(toNormalizedFilePath' f')]
 
 setNameCache :: IORef NameCache -> HscEnv -> HscEnv
 setNameCache nc hsc = hsc { hsc_NC = nc }
@@ -395,7 +395,7 @@ loadSession dir = liftIO $ do
         let v = fromMaybe HM.empty mv
         cfp <- liftIO $ canonicalizePath file
         -- We sort so exact matches come first.
-        case HM.lookup (toNormalizedFilePath cfp) v of
+        case HM.lookup (toNormalizedFilePath' cfp) v of
             Just opts -> do
                 --putStrLn $ "Cached component of " <> show file
                 pure opts

ghcide

@@ -62,7 +62,7 @@ library
     , ghcide >= 0.1
     , gitrev
     , hashable
-    , haskell-lsp == 0.20.*
+    , haskell-lsp == 0.21.*
     , hie-bios >= 0.4
     , hslogger
     , lens

haskell-language-server.cabal

@@ -99,6 +99,7 @@ mkDiag file diagSource sev loc msg = (file, D.ShowDiag,)
     , _source   = Just diagSource
     , _message  = msg
     , _code     = Nothing
+    , _tags     = Nothing
     , _relatedInformation = Nothing
     }
 
@@ -212,12 +213,13 @@ completion :: CompletionProvider
 completion _ide (CompletionParams _doc _pos _mctxt _mt)
     = pure $ Right $ Completions $ List [r]
     where
-        r = CompletionItem label kind detail documentation deprecated preselect
+        r = CompletionItem label kind tags detail documentation deprecated preselect
                            sortText filterText insertText insertTextFormat
                            textEdit additionalTextEdits commitCharacters
                            command xd
         label = "Example completion"
         kind = Nothing
+        tags = List []
         detail = Nothing
         documentation = Nothing
         deprecated = Nothing

src/Ide/Plugin/Example.hs

@@ -99,6 +99,7 @@ mkDiag file diagSource sev loc msg = (file, D.ShowDiag,)
     , _source   = Just diagSource
     , _message  = msg
     , _code     = Nothing
+    , _tags     = Nothing
     , _relatedInformation = Nothing
     }
 
@@ -209,12 +210,13 @@ completion :: CompletionProvider
 completion _ide (CompletionParams _doc _pos _mctxt _mt)
     = pure $ Right $ Completions $ List [r]
     where
-        r = CompletionItem label kind detail documentation deprecated preselect
+        r = CompletionItem label kind tags detail documentation deprecated preselect
                            sortText filterText insertText insertTextFormat
                            textEdit additionalTextEdits commitCharacters
                            command xd
         label = "Example2 completion"
         kind = Nothing
+        tags = List []
         detail = Nothing
         documentation = Nothing
         deprecated = Nothing