More hie to hls renaming

Author: jneira

exe/Wrapper.hs

@@ -57,7 +57,7 @@ main = do
 
   progName <- getProgName
   logm $  "run entered for haskell-language-server-wrapper(" ++ progName ++ ") "
-            ++ hieVersion
+            ++ hlsVersion
   d <- getCurrentDirectory
   logm $ "Current directory:" ++ d
   logm $ "Operating system:" ++ os
@@ -74,12 +74,12 @@ main = do
   logm $ "Project GHC version:" ++ ghcVersion
 
   let
-    hieBin = "haskell-language-server-" ++ ghcVersion
-    backupHieBin =
+    hlsBin = "haskell-language-server-" ++ ghcVersion
+    backupHlsBin =
       case dropWhileEnd (/='.') ghcVersion of
         [] -> "haskell-language-server"
         xs -> "haskell-language-server-" ++ init xs
-    candidates' = [hieBin, backupHieBin, "haskell-language-server"]
+    candidates' = [hlsBin, backupHlsBin, "haskell-language-server"]
     candidates = map (++ exeExtension) candidates'
 
   logm $ "haskell-language-server exe candidates :" ++ show candidates

src/Ide/Logger.hs

@@ -29,15 +29,15 @@ hlsLogger = L.Logger $ \pri txt ->
 -- ---------------------------------------------------------------------
 
 logm :: MonadIO m => String -> m ()
-logm s = liftIO $ infoM "hie" s
+logm s = liftIO $ infoM "hls" s
 
 debugm :: MonadIO m => String -> m ()
-debugm s = liftIO $ debugM "hie" s
+debugm s = liftIO $ debugM "hls" s
 
 warningm :: MonadIO m => String -> m ()
-warningm s = liftIO $ warningM "hie" s
+warningm s = liftIO $ warningM "hls" s
 
 errorm :: MonadIO m => String -> m ()
-errorm s = liftIO $ errorM "hie" s
+errorm s = liftIO $ errorM "hls" s
 
 -- ---------------------------------------------------------------------

src/Ide/Plugin.hs

@@ -137,7 +137,7 @@ makeCodeAction cas lf ideState (CodeActionParams docId range context _) = do
       case literalSupport of
         Nothing -> do
             let cmdParams = [J.toJSON (FallbackCodeActionParams (action ^. edit) (action ^. command))]
-            cmd <- mkLspCommand "hie" "fallbackCodeAction" (action ^. title) (Just cmdParams)
+            cmd <- mkLspCommand "hls" "fallbackCodeAction" (action ^. title) (Just cmdParams)
             return $ Just (CACommand cmd)
         Just _ -> return $ Just (CACodeAction action)
 
@@ -224,7 +224,7 @@ makeExecuteCommands ecs lf ide = do
 
         case parseCmdId cmdId of
           -- Shortcut for immediately applying a applyWorkspaceEdit as a fallback for v3.8 code actions
-          Just ("hie", "fallbackCodeAction") ->
+          Just ("hls", "fallbackCodeAction") ->
             case J.fromJSON cmdParams of
               J.Success (FallbackCodeActionParams mEdit mCmd) -> do
 
@@ -289,7 +289,7 @@ makeExecuteCommands ecs lf ide = do
 
                 case parseCmdId cmdId of
                   -- Shortcut for immediately applying a applyWorkspaceEdit as a fallback for v3.8 code actions
-                  Just ("hie", "fallbackCodeAction") -> do
+                  Just ("hls", "fallbackCodeAction") -> do
                     case A.fromJSON cmdParams of
                       A.Success (FallbackCodeActionParams mEdit mCmd) -> do
 

src/Ide/Version.hs

@@ -17,8 +17,8 @@ import qualified Paths_haskell_language_server as Meta
 import           System.Directory
 import           System.Info
 
-hieVersion :: String
-hieVersion =
+hlsVersion :: String
+hlsVersion =
   let commitCount = $gitCommitCount
   in concat $ concat
     [ [$(simpleVersion Meta.version)]
@@ -27,13 +27,13 @@ hieVersion =
     , [" (" ++ commitCount ++ " commits)" | commitCount /= ("1"::String) &&
                                             commitCount /= ("UNKNOWN" :: String)]
     , [" ", display buildArch]
-    , [" ", hieGhcDisplayVersion]
+    , [" ", hlsGhcDisplayVersion]
     ]
 
 -- ---------------------------------------------------------------------
 
-hieGhcDisplayVersion :: String
-hieGhcDisplayVersion = compilerName ++ "-" ++ VERSION_ghc
+hlsGhcDisplayVersion :: String
+hlsGhcDisplayVersion = compilerName ++ "-" ++ VERSION_ghc
 
 getProjectGhcVersion :: Bios.Cradle Bios.CabalHelper -> IO String
 getProjectGhcVersion crdl =
@@ -42,8 +42,8 @@ getProjectGhcVersion crdl =
     (execProjectGhc crdl ["--numeric-version"])
 
 
-hieGhcVersion :: String
-hieGhcVersion = VERSION_ghc
+hlsGhcVersion :: String
+hlsGhcVersion = VERSION_ghc
 
 -- ---------------------------------------------------------------------