From 7f132e1cf2a6537a65eb856bb4a9916a1ef852f6 Mon Sep 17 00:00:00 2001 From: Keith Rozett Date: Wed, 1 Nov 2023 17:10:01 -0700 Subject: [PATCH 1/5] Fixes Flutter issue #134847 --- packages/flutter_markdown/lib/src/builder.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart index 07cde26ad8b..b50f4dbf9cc 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -323,7 +323,7 @@ class MarkdownBuilder implements md.NodeVisitor { // Leading spaces in paragraph or list item are ignored // https://github.github.com/gfm/#example-192 // https://github.github.com/gfm/#example-236 - if (const ['ul', 'ol', 'p', 'br'].contains(_lastVisitedTag)) { + if (const ['ul', 'ol', 'li', 'p', 'br'].contains(_lastVisitedTag)) { text = text.replaceAll(leadingSpacesPattern, ''); } From 436f8a1ff17fe3259d3cec0a72af51ca65a7a500 Mon Sep 17 00:00:00 2001 From: Keith Rozett Date: Wed, 1 Nov 2023 18:49:27 -0700 Subject: [PATCH 2/5] Complying with version and changelog policy --- packages/flutter_markdown/CHANGELOG.md | 4 ++++ packages/flutter_markdown/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md index dcf09eafb59..424533e40a7 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.18+2 + +* Removes leading whitspace from list items. + ## 0.6.18+1 * Fixes a typo in README. diff --git a/packages/flutter_markdown/pubspec.yaml b/packages/flutter_markdown/pubspec.yaml index b2396c2f2d9..cb14d71d16a 100644 --- a/packages/flutter_markdown/pubspec.yaml +++ b/packages/flutter_markdown/pubspec.yaml @@ -4,7 +4,7 @@ description: A Markdown renderer for Flutter. Create rich text output, formatted with simple Markdown tags. repository: https://github.com/flutter/packages/tree/main/packages/flutter_markdown issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_markdown%22 -version: 0.6.18+1 +version: 0.6.18+2 environment: sdk: ">=3.0.0 <4.0.0" From c5fda241d50cd929840c7b3f5cc4bf82cbfeb0a6 Mon Sep 17 00:00:00 2001 From: Keith Rozett Date: Wed, 1 Nov 2023 18:56:29 -0700 Subject: [PATCH 3/5] Fix formatting --- packages/flutter_markdown/lib/src/builder.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart index b50f4dbf9cc..0ab3346d337 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -323,7 +323,8 @@ class MarkdownBuilder implements md.NodeVisitor { // Leading spaces in paragraph or list item are ignored // https://github.github.com/gfm/#example-192 // https://github.github.com/gfm/#example-236 - if (const ['ul', 'ol', 'li', 'p', 'br'].contains(_lastVisitedTag)) { + if (const ['ul', 'ol', 'li', 'p', 'br'] + .contains(_lastVisitedTag)) { text = text.replaceAll(leadingSpacesPattern, ''); } From 950d44ae11cdb7cc74bc1b8088204e461eba7c16 Mon Sep 17 00:00:00 2001 From: Keith Rozett Date: Thu, 2 Nov 2023 18:45:33 -0700 Subject: [PATCH 4/5] Test --- packages/flutter_markdown/test/list_test.dart | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/flutter_markdown/test/list_test.dart b/packages/flutter_markdown/test/list_test.dart index 9e2b1fcab44..05464e7b93f 100644 --- a/packages/flutter_markdown/test/list_test.dart +++ b/packages/flutter_markdown/test/list_test.dart @@ -72,6 +72,28 @@ void defineTests() { 'two', ]); }); + + testWidgets( + 'leading spaces are ignored (non-paragraph test case)', + (WidgetTester tester) async { + const String data = '- one\n- two\n- three'; + await tester.pumpWidget( + boilerplate( + const MarkdownBody(data: data), + ), + ); + + final Iterable widgets = tester.allWidgets; + expectTextStrings(widgets, [ + '•', + 'one', + '•', + 'two', + '•', + 'three', + ]); + }, + ); }); group('Ordered List', () { From d86bd5e546055189ed050374f3253e098bac635d Mon Sep 17 00:00:00 2001 From: Keith Rozett Date: Mon, 6 Nov 2023 10:12:00 -0800 Subject: [PATCH 5/5] Fix typo --- packages/flutter_markdown/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flutter_markdown/CHANGELOG.md b/packages/flutter_markdown/CHANGELOG.md index 424533e40a7..dd37dea0bef 100644 --- a/packages/flutter_markdown/CHANGELOG.md +++ b/packages/flutter_markdown/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.6.18+2 -* Removes leading whitspace from list items. +* Removes leading whitespace from list items. ## 0.6.18+1