Skip to content

Commit 34c7209

Browse files
Russoulgallais
authored andcommitted
Retain the --client mode behaviour
1 parent 304c0e6 commit 34c7209

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

src/Idris/REPL.idr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ mutual
10741074
{auto s : Ref Syn SyntaxInfo} ->
10751075
{auto m : Ref MD Metadata} ->
10761076
{auto o : Ref ROpts REPLOpts} -> REPLResult -> Core ()
1077-
displayResult (REPLError err) = printError err
1077+
displayResult (REPLError err) = printResult err
10781078
displayResult (Evaluated x Nothing) = printResult $ prettyTerm x
10791079
displayResult (Evaluated x (Just y)) = printResult (prettyTerm x <++> colon <++> prettyTerm y)
10801080
displayResult (Printed xs) = printResult xs
@@ -1085,9 +1085,9 @@ mutual
10851085
displayResult (ErrorLoadingModule x err) = printResult (reflow "Error loading module" <++> pretty x <+> colon <++> !(perror err))
10861086
displayResult (ErrorLoadingFile x err) = printResult (reflow "Error loading file" <++> pretty x <+> colon <++> pretty (show err))
10871087
displayResult (ErrorsBuildingFile x errs) = printResult (reflow "Error(s) building file" <++> pretty x) -- messages already displayed while building
1088-
displayResult NoFileLoaded = printError (reflow "No file can be reloaded")
1088+
displayResult NoFileLoaded = printResult (reflow "No file can be reloaded")
10891089
displayResult (CurrentDirectory dir) = printResult (reflow "Current working directory is" <++> dquotes (pretty dir))
1090-
displayResult CompilationFailed = printError (reflow "Compilation failed")
1090+
displayResult CompilationFailed = printResult (reflow "Compilation failed")
10911091
displayResult (Compiled f) = printResult (pretty "File" <++> pretty f <++> pretty "written")
10921092
displayResult (ProofFound x) = printResult (prettyTerm x)
10931093
displayResult (Missed cases) = printResult $ vsep (handleMissing <$> cases)
@@ -1106,7 +1106,7 @@ mutual
11061106
displayResult (RequestedHelp) = printResult (pretty displayHelp)
11071107
displayResult (Edited (DisplayEdit Empty)) = pure ()
11081108
displayResult (Edited (DisplayEdit xs)) = printResult xs
1109-
displayResult (Edited (EditError x)) = printError x
1109+
displayResult (Edited (EditError x)) = printResult x
11101110
displayResult (Edited (MadeLemma lit name pty pappstr))
11111111
= printResult $ pretty (relit lit (show name ++ " : " ++ show pty ++ "\n") ++ pappstr)
11121112
displayResult (Edited (MadeWith lit wapp)) = printResult $ pretty $ showSep "\n" (map (relit lit) wapp)

src/Idris/REPL/Common.idr

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,14 @@ iputStrLn msg
4848
toSExp !(renderWithoutColor msg), toSExp i])
4949

5050

51-
data MsgStatus = MsgStatusError | MsgStatusInfo
51+
||| Sampled against `VerbosityLvl`.
52+
public export
53+
data MsgStatus = MsgStatusNone | MsgStatusError | MsgStatusInfo
5254

5355
doPrint : MsgStatus -> VerbosityLvl -> Bool
56+
doPrint MsgStatusNone InfoLvl = True
57+
doPrint MsgStatusNone ErrorLvl = True
58+
doPrint MsgStatusNone NoneLvl = True
5459
doPrint MsgStatusError InfoLvl = True
5560
doPrint MsgStatusError ErrorLvl = True
5661
doPrint MsgStatusError NoneLvl = False
@@ -70,16 +75,21 @@ printWithStatus render msg status
7075
False => pure ()
7176
IDEMode {} => pure () -- this function should never be called in IDE Mode
7277

78+
||| Print REPL result.
7379
export
7480
printResult : {auto o : Ref ROpts REPLOpts} ->
7581
Doc IdrisAnn -> Core ()
76-
printResult x = printWithStatus render x MsgStatusInfo
82+
printResult x = printWithStatus render x MsgStatusNone
83+
-- ^^^^^^^^^^^^^
84+
-- "results" are printed no matter the verbosity level
7785

86+
||| Print REPL result.
7887
export
7988
printDocResult : {auto o : Ref ROpts REPLOpts} ->
8089
Doc IdrisDocAnn -> Core ()
81-
printDocResult x = printWithStatus (render styleAnn) x MsgStatusInfo
82-
90+
printDocResult x = printWithStatus (render styleAnn) x MsgStatusNone
91+
-- ^^^^^^^^^^^^^
92+
-- "results" are printed no matter the verbosity level
8393

8494
-- Return that a protocol request failed somehow
8595
export

0 commit comments

Comments
 (0)