From 3f8e2fe46fdc4e0112a1bfaa69d445b26fe322e7 Mon Sep 17 00:00:00 2001 From: Andre Lipke Date: Sat, 22 Oct 2022 12:44:08 -0400 Subject: [PATCH] Fix some clear methods --- lib/src/reader.dart | 8 ++++---- lib/src/writer.dart | 8 ++++---- test/writer_test.dart | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/src/reader.dart b/lib/src/reader.dart index ae7da53..7574900 100644 --- a/lib/src/reader.dart +++ b/lib/src/reader.dart @@ -75,9 +75,9 @@ class _AnsiReader implements AnsiReader { case 'J': switch (value) { case '0': - return _listener.clearScreenBefore(); - case '1': return _listener.clearScreenAfter(); + case '1': + return _listener.clearScreenBefore(); case '2': return _listener.clearScreen(); } @@ -85,9 +85,9 @@ class _AnsiReader implements AnsiReader { case 'K': switch (value) { case '0': - return _listener.clearLineBefore(); - case '1': return _listener.clearLineAfter(); + case '1': + return _listener.clearLineBefore(); case '2': return _listener.clearLine(); } diff --git a/lib/src/writer.dart b/lib/src/writer.dart index 64de8ac..2148716 100644 --- a/lib/src/writer.dart +++ b/lib/src/writer.dart @@ -32,19 +32,19 @@ abstract class AnsiWriter implements AnsiListener, StringSink { void clearScreen() => _writeEscape('2', 'J'); @override - void clearScreenBefore() => _writeEscape('0', 'J'); + void clearScreenAfter() => _writeEscape('0', 'J'); @override - void clearScreenAfter() => _writeEscape('1', 'J'); + void clearScreenBefore() => _writeEscape('1', 'J'); @override void clearLine() => _writeEscape('2', 'K'); @override - void clearLineBefore() => _writeEscape('0', 'K'); + void clearLineAfter() => _writeEscape('0', 'K'); @override - void clearLineAfter() => _writeEscape('1', 'K'); + void clearLineBefore() => _writeEscape('1', 'K'); @override void resetStyles() => _writeEscape('0', 'm'); diff --git a/test/writer_test.dart b/test/writer_test.dart index 4e31314..e8ec653 100644 --- a/test/writer_test.dart +++ b/test/writer_test.dart @@ -24,10 +24,10 @@ void main() { expect(readEscaped(), r'\u001b[2J'); ioSink.clearScreenBefore(); - expect(readEscaped(), r'\u001b[0J'); + expect(readEscaped(), r'\u001b[1J'); ioSink.clearScreenAfter(); - expect(readEscaped(), r'\u001b[1J'); + expect(readEscaped(), r'\u001b[0J'); }); test('should write the escape sequence for clearing the line', () { @@ -35,10 +35,10 @@ void main() { expect(readEscaped(), r'\u001b[2K'); ioSink.clearLineBefore(); - expect(readEscaped(), r'\u001b[0K'); + expect(readEscaped(), r'\u001b[1K'); ioSink.clearLineAfter(); - expect(readEscaped(), r'\u001b[1K'); + expect(readEscaped(), r'\u001b[0K'); }); test('should write the escape sequence for resetting styles', () {