hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve optparse hls stuff

Browse Source
This commit is contained in:
Julian Ospald 2021-09-20 14:43:43 +02:00
parent 167f6d0683
commit 3d1d8f1af7
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/ghcup/Main.hs
View File

@ -941,6 +941,8 @@ Examples:
compileHLSFooter = [s|Discussion: compileHLSFooter = [s|Discussion:
Compiles and installs the specified HLS version. Compiles and installs the specified HLS version.
The last argument is a list of GHC versions to compile for.
These need to be available in PATH prior to compilation.
Examples: Examples:
ghcup compile hls -v 1.4.0 -j 12 8.10.5 8.10.7 9.0.1|] ghcup compile hls -v 1.4.0 -j 12 8.10.5 8.10.7 9.0.1|]
@ -1270,7 +1272,7 @@ hlsCompileOpts =
"Absolute path to a cabal.project.local to be used for the build" "Absolute path to a cabal.project.local to be used for the build"
) )
) )
<*> many (toolVersionArgument Nothing (Just GHC)) <*> some (toolVersionArgument Nothing (Just GHC))
toolVersionParser :: Parser ToolVersion toolVersionParser :: Parser ToolVersion
@ -1287,9 +1289,13 @@ toolVersionParser = verP' <|> toolP
toolVersionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser ToolVersion toolVersionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser ToolVersion
toolVersionArgument criteria tool = toolVersionArgument criteria tool =
argument (eitherReader toolVersionEither) argument (eitherReader toolVersionEither)
(metavar "VERSION|TAG" (metavar (mv tool)
<> completer (tagCompleter (fromMaybe GHC tool) []) <> completer (tagCompleter (fromMaybe GHC tool) [])
<> foldMap (completer . versionCompleter criteria) tool) <> foldMap (completer . versionCompleter criteria) tool)
where
mv (Just GHC) = "GHC_VERSION|TAG"
mv (Just HLS) = "HLS_VERSION|TAG"
mv _ = "VERSION|TAG"
setVersionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser SetToolVersion setVersionArgument :: Maybe ListCriteria -> Maybe Tool -> Parser SetToolVersion