[web] Don't include end-of-line characters in line boundary (flutter#…

…39693)
knopp · Feb 17, 2023 · a37e27b · a37e27b
1 parent 1d7f0c6
commit a37e27b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart b/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
@@ -237,7 +237,7 @@ class CanvasParagraph implements ui.Paragraph {
     }
 
     final ParagraphLine line = lines[i];
-    return ui.TextRange(start: line.startIndex, end: line.endIndex);
+    return ui.TextRange(start: line.startIndex, end: line.endIndex - line.trailingNewlines);
   }
 
   @override

diff --git a/lib/web_ui/test/text/canvas_paragraph_test.dart b/lib/web_ui/test/text/canvas_paragraph_test.dart
@@ -700,7 +700,8 @@ Future<void> testMain() async {
       for (int i = 0; i < 11; i++) {
         expect(
           paragraph.getLineBoundary(ui.TextPosition(offset: i)),
-          const ui.TextRange(start: 0, end: 11),
+          // The "\n" is not included in the line boundary.
+          const ui.TextRange(start: 0, end: 10),
           reason: 'failed at offset $i',
         );
       }
@@ -709,7 +710,8 @@ Future<void> testMain() async {
       for (int i = 11; i < 23; i++) {
         expect(
           paragraph.getLineBoundary(ui.TextPosition(offset: i)),
-          const ui.TextRange(start: 11, end: 23),
+          // The "\n" is not included in the line boundary.
+          const ui.TextRange(start: 11, end: 22),
           reason: 'failed at offset $i',
         );
       }