Merge branch 'master' into unhandled-exceptions

Author: jneira

ghcide/src/Development/IDE/GHC/Compat/Util.hs

@@ -68,7 +68,9 @@ module Development.IDE.GHC.Compat.Util (
     hGetStringBuffer,
     stringToStringBuffer,
     nextChar,
-    atEnd
+    atEnd,
+    -- * Char
+    is_ident
     ) where
 
 #if MIN_VERSION_ghc(9,0,0)
@@ -81,6 +83,7 @@ import           GHC.Data.FastString
 import           GHC.Data.Maybe
 import           GHC.Data.Pair
 import           GHC.Data.StringBuffer
+import           GHC.Parser.CharClass    (is_ident)
 import           GHC.Types.Unique
 import           GHC.Types.Unique.DFM
 import           GHC.Utils.Fingerprint
@@ -90,6 +93,7 @@ import           GHC.Utils.Panic         hiding (try)
 #else
 import           Bag
 import           BooleanFormula
+import           Ctype                   (is_ident)
 import           EnumSet
 import qualified Exception
 import           FastString

ghcide/src/Development/IDE/LSP/LanguageServer.hs

@@ -95,6 +95,7 @@ runLanguageServer options inH outH getHieDbLoc defaultConfig onConfigurationChan
           [ ideHandlers
           , cancelHandler cancelRequest
           , exitHandler exit
+          , shutdownHandler
           ]
           -- Cancel requests are special since they need to be handled
           -- out of order to be useful. Existing handlers are run afterwards.
@@ -193,13 +194,16 @@ cancelHandler :: (SomeLspId -> IO ()) -> LSP.Handlers (ServerM c)
 cancelHandler cancelRequest = LSP.notificationHandler SCancelRequest $ \NotificationMessage{_params=CancelParams{_id}} ->
   liftIO $ cancelRequest (SomeLspId _id)
 
-exitHandler :: IO () -> LSP.Handlers (ServerM c)
-exitHandler exit = LSP.notificationHandler SExit $ const $ do
+shutdownHandler :: LSP.Handlers (ServerM c)
+shutdownHandler = LSP.requestHandler SShutdown $ \_ resp -> do
     (_, ide) <- ask
     liftIO $ logDebug (ideLogger ide) "Received exit message"
     -- flush out the Shake session to record a Shake profile if applicable
     liftIO $ shakeShut ide
-    liftIO exit
+    resp $ Right Empty
+
+exitHandler :: IO () -> LSP.Handlers (ServerM c)
+exitHandler exit = LSP.notificationHandler SExit $ const $ liftIO exit
 
 modifyOptions :: LSP.Options -> LSP.Options
 modifyOptions x = x{ LSP.textDocumentSync   = Just $ tweakTDS origTDS

ghcide/src/Development/IDE/Plugin/CodeAction.hs

@@ -1525,7 +1525,7 @@ rangesForBindingImport _ _ = []
 wrapOperatorInParens :: String -> String
 wrapOperatorInParens x =
   case uncons x of
-    Just (h, _t) -> if isAlpha h then x else "(" <> x <> ")"
+    Just (h, _t) -> if is_ident h then x else "(" <> x <> ")"
     Nothing      -> mempty
 
 smallerRangesForBindingExport :: [LIE GhcPs] -> String -> [Range]

ghcide/test/exe/Main.hs

@@ -1276,19 +1276,20 @@ removeImportTests = testGroup "remove import actions"
             , "stuffB :: Integer"
             , "stuffB = 123"
             , "stuffC = ()"
+            , "_stuffD = '_'"
             ]
       _docA <- createDoc "ModuleA.hs" "haskell" contentA
       let contentB = T.unlines
             [ "{-# OPTIONS_GHC -Wunused-imports #-}"
             , "module ModuleB where"
-            , "import ModuleA (stuffA, stuffB, stuffC, stuffA)"
+            , "import ModuleA (stuffA, stuffB, _stuffD, stuffC, stuffA)"
             , "main = print stuffB"
             ]
       docB <- createDoc "ModuleB.hs" "haskell" contentB
       _ <- waitForDiagnostics
       [InR action@CodeAction { _title = actionTitle }, _]
           <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
-      liftIO $ "Remove stuffA, stuffC from import" @=? actionTitle
+      liftIO $ "Remove _stuffD, stuffA, stuffC from import" @=? actionTitle
       executeCodeAction action
       contentAfterAction <- documentContents docB
       let expectedContentAfterAction = T.unlines

hls-graph/hls-graph.cabal

@@ -10,7 +10,7 @@ bug-reports:   https://github.com/haskell/haskell-language-server/issues
 license:       Apache-2.0
 license-file:  LICENSE
 author:        The Haskell IDE Team
-maintainer:    alan.zimm@gmail.com
+maintainer:    The Haskell IDE Team
 copyright:     The Haskell IDE Team
 category:      Development
 build-type:    Simple

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

@@ -20,8 +20,14 @@ import           Data.FileEmbed
 
 htmlDataFiles :: [(FilePath, BS.ByteString)]
 htmlDataFiles =
-  [ ("profile.html",  $(embedFile "html/profile.html"))
+  [
+#ifdef __GHCIDE__
+    ("profile.html",  $(embedFile "hls-graph/html/profile.html"))
+  , ("shake.js",      $(embedFile "hls-graph/html/shake.js"))
+#else
+    ("profile.html",  $(embedFile "html/profile.html"))
   , ("shake.js",      $(embedFile "html/shake.js"))
+#endif
   ]
 
 readDataFileHTML :: FilePath -> IO LBS.ByteString