Skip to content

fix(mason_logger): redraw chooseOne/chooseAny with relative cursor moves #1680

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

Open
spydon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(mason_logger): redraw chooseOne/chooseAny with relative cursor moves #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 22 additions & 16 deletions packages/mason_logger/lib/src/mason_logger.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@ class Logger {
defaultValue != null && resolvedDisplay(defaultValue).isNotEmpty;
var index = hasDefault ? choices.indexOf(defaultValue) : 0;

final linesToClear = '$message'.split('\n').length + choices.length - 1;

void writeChoices() {
_stdout
// save cursor
..write('\x1b7')
// hide cursor
..write('\x1b[?25l')
..writeln('$message');
Expand Down Expand Up @@ -364,11 +364,8 @@ class Logger {
..lineMode = true
..echoMode = true;

_clearChoices(linesToClear);
_stdout
// restore cursor
..write('\x1b8')
// clear to end of screen
..write('\x1b[J')
// show cursor
..write('\x1b[?25h')
..write('$message ')
Expand All @@ -380,8 +377,7 @@ class Logger {
break;
}

// restore cursor
_stdout.write('\x1b8');
_clearChoices(linesToClear);
writeChoices();
}

Expand Down Expand Up @@ -409,10 +405,10 @@ class Logger {
: <int>{};
var index = 0;

final linesToClear = '$message'.split('\n').length + choices.length - 1;

void writeChoices() {
_stdout
// save cursor
..write('\x1b7')
// hide cursor
..write('\x1b[?25l')
..writeln('$message');
Expand Down Expand Up @@ -469,11 +465,8 @@ class Logger {

results = selections.map((index) => choices[index]).toList();

_clearChoices(linesToClear);
_stdout
// restore cursor
..write('\x1b8')
// clear to end of screen
..write('\x1b[J')
// show cursor
..write('\x1b[?25h')
..write('$message ')
Expand All @@ -486,14 +479,27 @@ class Logger {
break;
}

// restore cursor
_stdout.write('\x1b8');
_clearChoices(linesToClear);
writeChoices();
}

return results;
}

/// Moves the cursor up [lines] and clears everything from there to the end
/// of the screen so a selection prompt can be redrawn in place.
void _clearChoices(int lines) {
if (lines > 0) {
// move cursor up to the first line of the choices
_stdout.write('\x1b[${lines}A');
}
_stdout
// move cursor to the start of the line
..write('\r')
// clear to end of screen
..write('\x1b[J');
}

String? _readLineSync() {
_ensureTerminalAttached();
return _stdin.readLineSync()?.trim();
Expand Down
Loading