From 658953681f6712c1baab47abdc741c437c15fcfa Mon Sep 17 00:00:00 2001
From: Kamil Shakirov <kamils80@gmail.com>
Date: Fri, 12 Jun 2020 16:12:33 +0600
Subject: [PATCH] Remove hardcoded default 'host' and 'port' parts from
 command-line help options

---
 src/Idris/CommandLine.idr | 39 ++++++++++++++++++++-------------------
 src/Idris/Main.idr        |  4 ++--
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/Idris/CommandLine.idr b/src/Idris/CommandLine.idr
index 9c60cc1bd..72372a3f9 100644
--- a/src/Idris/CommandLine.idr
+++ b/src/Idris/CommandLine.idr
@@ -93,6 +93,24 @@ data CLOpt
   DebugElabCheck |
   BlodwenPaths
 
+||| Extract the host and port to bind the IDE socket to
+export
+ideSocketModeAddress : List CLOpt -> (String, Int)
+ideSocketModeAddress []  = ("localhost", 38398)
+ideSocketModeAddress (IdeModeSocket hp :: _) =
+  let (h, p) = Strings.break (== ':') hp
+      port = fromMaybe 38398 (portPart p >>= parsePositive)
+      host = if h == "" then "localhost" else h
+  in (host, port)
+  where
+    portPart : String -> Maybe String
+    portPart p = if p == ""
+                    then Nothing
+                    else Just $ assert_total $ prim__strTail p
+ideSocketModeAddress (_ :: rest) = ideSocketModeAddress rest
+
+formatSocketAddress : (String, Int) -> String
+formatSocketAddress (host, port) = host ++ ":" ++ show port
 
 ActType : List String -> Type
 ActType [] = List CLOpt
@@ -122,9 +140,8 @@ options = [MkOpt ["--check", "-c"] [] [CheckOnly]
            MkOpt ["--ide-mode"] [] [IdeMode]
               (Just "Run the REPL with machine-readable syntax"),
 
-           MkOpt ["--ide-mode-socket"] [] [IdeModeSocket "localhost:38398"]
-              (Just "Run the ide socket mode on default host and port (localhost:38398)"),
-
+           MkOpt ["--ide-mode-socket"] [] [IdeModeSocket $ formatSocketAddress (ideSocketModeAddress [])]
+              (Just $ "Run the ide socket mode on default host and port (" ++ formatSocketAddress (ideSocketModeAddress []) ++ ")"),
            MkOpt ["--ide-mode-socket-with"] ["host:port"] (\hp => [IdeModeSocket hp])
               (Just "Run the ide socket mode on given host and port"),
 
@@ -247,19 +264,3 @@ getCmdOpts : IO (Either String (List CLOpt))
 getCmdOpts = do (_ :: opts) <- getArgs
                     | _ => pure (Left "Invalid command line")
                 pure $ getOpts opts
-
-portPart : String -> Maybe String
-portPart p = if p == ""
-                then Nothing
-                else Just $ assert_total $ prim__strTail p
-
-||| Extract the host and port to bind the IDE socket to
-public export
-ideSocketModeHostPort : List CLOpt -> (String, Int)
-ideSocketModeHostPort []  = ("localhost", 38398)
-ideSocketModeHostPort (IdeModeSocket hp :: _) =
-  let (h, p) = Strings.break (== ':') hp
-      port = fromMaybe 38398 (portPart p >>= parsePositive)
-      host = if h == "" then "localhost" else h
-  in (host, port)
-ideSocketModeHostPort (_ :: rest) = ideSocketModeHostPort rest
diff --git a/src/Idris/Main.idr b/src/Idris/Main.idr
index 934348488..a6c93dfc1 100644
--- a/src/Idris/Main.idr
+++ b/src/Idris/Main.idr
@@ -144,7 +144,7 @@ stMain opts
 
          finish <- showInfo opts
          if finish
-            then pure () 
+            then pure ()
             else do
 
            -- If there's a --build or --install, just do that then quit
@@ -180,7 +180,7 @@ stMain opts
                        setOutput (IDEMode 0 stdin stdout)
                        replIDE {c} {u} {m}
                      else do
-                       let (host, port) = ideSocketModeHostPort opts
+                       let (host, port) = ideSocketModeAddress opts
                        f <- coreLift $ initIDESocketFile host port
                        case f of
                          Left err => do