git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1931 from kRITZCREEK/psc-ide-help-cli
9aee6c5Phil Freeman
psc-ide-client/Main.hs+6−7
compare with golang
unifiedsplit
@@ -5,7 +5,6 @@ import Prelude ()
5import Prelude.Compat
5import Prelude.Compat
6
6
7import Control.Exception
7import Control.Exception
8−import Data.Maybe (fromMaybe)
9import Data.Text (Text)
8import Data.Text (Text)
10import qualified Data.Text as T
9import qualified Data.Text as T
11import qualified Data.Text.IO as T
10import qualified Data.Text.IO as T
@@ -18,19 +17,19 @@ import System.IO
18import qualified Paths_purescript as Paths
17import qualified Paths_purescript as Paths
19
18
20data Options = Options
19data Options = Options
21− { optionsPort :: Maybe Int
20+ { optionsPort :: PortID
22− }
21+ }
23
22
24main :: IO ()
23main :: IO ()
25main = do
24main = do
26 Options port <- execParser opts
25 Options port <- execParser opts
27− let port' = PortNumber . fromIntegral $ fromMaybe 4242 port
28− client port'
26+ client port
29 where
27 where
30 parser =
28 parser =
31 Options <$>
29 Options <$>
30+ (PortNumber . fromIntegral <$>
32− optional (option auto (long "port" <> short 'p'))
31+ option auto (long "port" <> short 'p' <> value (4242 :: Integer)))
33− opts = info (version <*> parser) mempty
32+ opts = info (version <*> helper <*> parser) mempty
34 version = abortOption (InfoMsg (showVersion Paths.version)) $ long "version" <> help "Show the version number" <> hidden
33 version = abortOption (InfoMsg (showVersion Paths.version)) $ long "version" <> help "Show the version number" <> hidden
35
34
36client :: PortID -> IO ()
35client :: PortID -> IO ()
psc-ide-server/Main.hs+1−1
@@ -87,7 +87,7 @@ main = do
87 (PortNumber . fromIntegral <$>
87 (PortNumber . fromIntegral <$>
88 option auto (long "port" <> short 'p' <> value (4242 :: Integer))) <*>
88 option auto (long "port" <> short 'p' <> value (4242 :: Integer))) <*>
89 switch (long "debug")
89 switch (long "debug")
90− opts = info (version <*> parser) mempty
90+ opts = info (version <*> helper <*> parser) mempty
91 version = abortOption
91 version = abortOption
92 (InfoMsg (showVersion Paths.version))
92 (InfoMsg (showVersion Paths.version))
93 (long "version" <> help "Show the version number")
93 (long "version" <> help "Show the version number")