Skip to content

Add more queries to stack query #3761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgsloan merged 2 commits into from
Jan 20, 2018
Merged

Add more queries to stack query #3761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
546f0f3
Add query for compiler version
kirelagin Jan 12, 2018
790f907
Add query for global hints
kirelagin Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Stack/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import Stack.Package
import Stack.PackageLocation (parseSingleCabalFileIndex)
import Stack.Types.Build
import Stack.Types.BuildPlan
import Stack.Types.Compiler (compilerVersionText)
import Stack.Types.Config
import Stack.Types.FlagName
import Stack.Types.NamedComponent
Expand All @@ -55,7 +56,7 @@ import Stack.Types.PackageName
import Stack.Types.Version

#ifdef WINDOWS
import Stack.Types.Compiler
import Stack.Types.Compiler (getGhcVersion)
#endif
import System.FileLock (FileLock, unlockFile)

Expand Down Expand Up @@ -370,8 +371,16 @@ queryBuildInfo selectors0 =
rawBuildInfo :: HasEnvConfig env => RIO env Value
rawBuildInfo = do
(locals, _sourceMap) <- loadSourceMap NeedTargets defaultBuildOptsCLI
wantedCompiler <- view $ wantedCompilerVersionL.to compilerVersionText
actualCompiler <- view $ actualCompilerVersionL.to compilerVersionText
globalHints <- view globalHintsL
return $ object
[ "locals" .= Object (HM.fromList $ map localToPair locals)
, "compiler" .= object
[ "wanted" .= wantedCompiler
, "actual" .= actualCompiler
]
, "global-hints" .= globalHints
]
where
localToPair lp =
Expand Down
4 changes: 4 additions & 0 deletions src/Stack/Types/Config.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ module Stack.Types.Config
,whichCompilerL
,envOverrideSettingsL
,loadedSnapshotL
,globalHintsL
,shouldForceGhcColorFlag
,appropriateGhcColorFlag
-- * Lens reexport
Expand Down Expand Up @@ -2006,6 +2007,9 @@ envOverrideSettingsL = configL.lens
configEnvOverrideSettings
(\x y -> x { configEnvOverrideSettings = y })

globalHintsL :: HasBuildConfig s => Getting r s (Map PackageName (Maybe Version))
globalHintsL = snapshotDefL.to sdGlobalHints

shouldForceGhcColorFlag :: (HasRunner env, HasEnvConfig env)
=> RIO env Bool
shouldForceGhcColorFlag = do
Expand Down