lix-project/lix
18
48
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

nix repl: Don't write to std::cout directly

Browse source 
Writing to std::cout doesn't play nice with ProgressBar.
This commit is contained in:
Eelco Dolstra 2021-10-12 15:36:45 +02:00
parent 9ebe02a81e
commit f6cdae5181
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/nix/repl.cc
View file

@ -200,13 +200,13 @@ namespace {
void NixRepl::mainLoop(const std::vector<std::string> & files) void NixRepl::mainLoop(const std::vector<std::string> & files)
{ {
string error = ANSI_RED "error:" ANSI_NORMAL " "; string error = ANSI_RED "error:" ANSI_NORMAL " ";
std::cout << "Welcome to Nix version " << nixVersion << ". Type :? for help." << std::endl << std::endl; notice("Welcome to Nix " + nixVersion + ". Type :? for help.\n");
for (auto & i : files) for (auto & i : files)
loadedFiles.push_back(i); loadedFiles.push_back(i);
reloadFiles(); reloadFiles();
if (!loadedFiles.empty()) std::cout << std::endl; if (!loadedFiles.empty()) notice("");
// Allow nix-repl specific settings in .inputrc // Allow nix-repl specific settings in .inputrc
rl_readline_name = "nix-repl"; rl_readline_name = "nix-repl";
@ -479,9 +479,10 @@ bool NixRepl::processLine(string line)
else if (command == ":t") { else if (command == ":t") {
Value v; Value v;
evalString(arg, v); evalString(arg, v);
std::cout << showType(v) << std::endl; logger->cout(showType(v));
}
} else if (command == ":u") { else if (command == ":u") {
Value v, f, result; Value v, f, result;
evalString(arg, v); evalString(arg, v);
evalString("drv: (import <nixpkgs> {}).runCommand \"shell\" { buildInputs = [ drv ]; } \"\"", f); evalString("drv: (import <nixpkgs> {}).runCommand \"shell\" { buildInputs = [ drv ]; } \"\"", f);
@ -535,9 +536,9 @@ bool NixRepl::processLine(string line)
+ concatStringsSep(" ", args) + "\n\n"; + concatStringsSep(" ", args) + "\n\n";
} }
markdown += trim(stripIndentation(doc->doc)); markdown += stripIndentation(doc->doc);
std::cout << renderMarkdownToTerminal(markdown); logger->cout(trim(renderMarkdownToTerminal(markdown)));
} else } else
throw Error("value does not have documentation"); throw Error("value does not have documentation");
} }
@ -620,9 +621,9 @@ void NixRepl::reloadFiles()
bool first = true; bool first = true;
for (auto & i : old) { for (auto & i : old) {
if (!first) std::cout << std::endl; if (!first) notice("");
first = false; first = false;
std::cout << format("Loading '%1%'...") % i << std::endl; notice("Loading '%1%'...", i);
loadFile(i); loadFile(i);
} }
} }
@ -633,7 +634,7 @@ void NixRepl::addAttrsToScope(Value & attrs)
state->forceAttrs(attrs); state->forceAttrs(attrs);
for (auto & i : *attrs.attrs) for (auto & i : *attrs.attrs)
addVarToScope(i.name, *i.value); addVarToScope(i.name, *i.value);
std::cout << format("Added %1% variables.") % attrs.attrs->size() << std::endl; notice("Added %1% variables.", attrs.attrs->size());
} }