lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Revert "Merge pull request #9476 from alois31/restore-progress-bar"

Browse source 
Observed to regress nix repl attrset printing with narrow windows.

This reverts commit a2d5e803cf.

Fixes: #168

Change-Id: I8e0031475b4ec26d6a71014357d973578b70815c
This commit is contained in:
jade 2024-03-23 18:04:29 -07:00
parent 652f52f071
commit 946fc12e4e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libcmd/repl.cc
View file

@ -29,6 +29,7 @@
#include "local-fs-store.hh" #include "local-fs-store.hh"
#include "signals.hh" #include "signals.hh"
#include "print.hh" #include "print.hh"
#include "progress-bar.hh"
#if HAVE_BOEHMGC #if HAVE_BOEHMGC
#define GC_INCLUDE_NEW #define GC_INCLUDE_NEW
@ -195,11 +196,13 @@ ReplExitStatus NixRepl::mainLoop()
auto _guard = interacter->init(static_cast<detail::ReplCompleterMixin *>(this)); auto _guard = interacter->init(static_cast<detail::ReplCompleterMixin *>(this));
/* Stop the progress bar because it interferes with the display of
the repl. */
stopProgressBar();
std::string input; std::string input;
while (true) { while (true) {
// Hide the progress bar while waiting for user input, so that it won't interfere.
logger->pause();
// When continuing input from previous lines, don't print a prompt, just align to the same // When continuing input from previous lines, don't print a prompt, just align to the same
// number of chars as the prompt. // number of chars as the prompt.
if (!interacter->getLine(input, input.empty() ? ReplPromptType::ReplPrompt : ReplPromptType::ContinuationPrompt)) { if (!interacter->getLine(input, input.empty() ? ReplPromptType::ReplPrompt : ReplPromptType::ContinuationPrompt)) {
@ -210,7 +213,6 @@ ReplExitStatus NixRepl::mainLoop()
// the entire program? // the entire program?
return ReplExitStatus::QuitAll; return ReplExitStatus::QuitAll;
} }
logger->resume();
try { try {
switch (processLine(input)) { switch (processLine(input)) {
case ProcessLineResult::Quit: case ProcessLineResult::Quit: