Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions src/TextTools/Format/FormatScanner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ public FormatScanner(ReadOnlySpan<char> format)
_format = format;
IsArgument = false;
_index = 0;
Text = ReadOnlySpan<char>.Empty;
ArgumentFormat = ReadOnlySpan<char>.Empty;
ArgumentAlignment = ReadOnlySpan<char>.Empty;
Text = [];
ArgumentFormat = [];
ArgumentAlignment = [];
}

public bool IsArgument { get; set; }
Expand All @@ -26,9 +26,9 @@ public bool MoveNext()
if (_index >= _format.Length)
{
IsArgument = false;
Text = ReadOnlySpan<char>.Empty;
ArgumentFormat = ReadOnlySpan<char>.Empty;
ArgumentAlignment = ReadOnlySpan<char>.Empty;
Text = [];
ArgumentFormat = [];
ArgumentAlignment = [];
return false;
}

Expand All @@ -46,7 +46,7 @@ public bool MoveNext()

static int ArgumentFormatLength(ReadOnlySpan<char> source)
{
ReadOnlySpan<char> braces = stackalloc char[] { '{', '}' };
ReadOnlySpan<char> braces = ['{', '}'];
var result = 0;

while (true)
Expand Down Expand Up @@ -80,7 +80,7 @@ static int ArgumentFormatLength(ReadOnlySpan<char> source)
bool MoveNextText()
{
var remaining = _format.Slice(_index);
var i = remaining.IndexOfAny(stackalloc char[] { '{', '}' });
var i = remaining.IndexOfAny(['{', '}']);

if (i < 0)
{
Expand All @@ -106,7 +106,7 @@ bool MoveNextText()
bool MoveNextArgument()
{
var remaining = _format.Slice(_index);
var i = remaining.IndexOfAny(stackalloc char[] { ',', ':', '}' });
var i = remaining.IndexOfAny([',', ':', '}']);

if (i < 0)
{
Expand All @@ -123,7 +123,7 @@ bool MoveNextArgument()
if (c == ',')
{
remaining = remaining.Slice(i + 1);
i = remaining.IndexOfAny(stackalloc char[] { ':', '}' });
i = remaining.IndexOfAny([':', '}']);

if (i < 0)
{
Expand All @@ -136,7 +136,7 @@ bool MoveNextArgument()
}
else
{
alignment = ReadOnlySpan<char>.Empty;
alignment = [];
}

ReadOnlySpan<char> format;
Expand All @@ -156,7 +156,7 @@ bool MoveNextArgument()
}
else
{
format = ReadOnlySpan<char>.Empty;
format = [];
}

SetArgument(arg, format, alignment);
Expand All @@ -167,8 +167,8 @@ void SetText(ReadOnlySpan<char> text)
{
Text = text;
IsArgument = false;
ArgumentFormat = ReadOnlySpan<char>.Empty;
ArgumentAlignment = ReadOnlySpan<char>.Empty;
ArgumentFormat = [];
ArgumentAlignment = [];
}

void SetArgument(ReadOnlySpan<char> arg, ReadOnlySpan<char> format, ReadOnlySpan<char> alignment)
Expand Down
4 changes: 2 additions & 2 deletions src/TextTools/Format/FormatString.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static class FormatString
public static bool ContainsEscapes(ReadOnlySpan<char> formatString, out int unescapedLength)
{
unescapedLength = formatString.Length;
ReadOnlySpan<char> braces = stackalloc char[] { '{', '}' };
ReadOnlySpan<char> braces = ['{', '}'];

var i = formatString.IndexOfAny(braces);

Expand All @@ -40,7 +40,7 @@ public static bool ContainsEscapes(ReadOnlySpan<char> formatString, out int unes

public static int WriteUnescaped(ReadOnlySpan<char> formatString, Span<char> unescaped)
{
ReadOnlySpan<char> braces = stackalloc char[] { '{', '}' };
ReadOnlySpan<char> braces = ['{', '}'];

var i = formatString.IndexOfAny(braces);
var length = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/TextTools/StringPool/StringPool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public string GetString(ReadOnlySpan<char> text)
return result;
}

public StringPool Clone() => new StringPool(this);
public StringPool Clone() => new(this);

object ICloneable.Clone() => Clone();

Expand Down