Resolving merge conflicts

This commit is contained in:
BDisp
2025-11-12 15:25:29 +00:00
parent 012356eaeb
commit 87ea2af9bf
49 changed files with 2374 additions and 2030 deletions

View File

@@ -6916,7 +6916,7 @@ line.
{
string [] lines = _textView.Text.Split (Environment.NewLine);
if (lines == null || lines.Length == 0)
if (lines is { Length: 0 })
{
return 0;
}
@@ -7024,11 +7024,11 @@ line.
List<List<Cell>> text =
[
Cell.ToCells (
"This is the first line.".ToRunes ()
"This is the first line.".ToStringList ()
),
Cell.ToCells (
"This is the second line.".ToRunes ()
"This is the second line.".ToStringList ()
)
];
TextView tv = CreateTextView ();
@@ -7091,12 +7091,9 @@ line. ",
{
string csName = color.Key;
foreach (Rune rune in csName.EnumerateRunes ())
{
cells.Add (new () { Rune = rune, Attribute = color.Value.Normal });
}
cells.AddRange (Cell.ToCellList (csName, color.Value.Normal));
cells.Add (new () { Rune = (Rune)'\n', Attribute = color.Value.Focus });
cells.Add (new () { Grapheme = "\n", Attribute = color.Value.Focus });
}
TextView tv = CreateTextView ();