tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-04-16 08:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

modified tokenizer to not break on on ]]] at the end of a style

Browse Source
This commit is contained in:
Nils Andresen 2022-10-23 21:07:10 +02:00 committed by Patrik Svensson
parent 4258cbfb85
commit f895bb175d
2 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Spectre.Console/Internal/Text/Markup/MarkupTokenizer.cs
View File

@ -122,10 +122,18 @@ internal sealed class MarkupTokenizer : IDisposable
var encounteredClosing = false; var encounteredClosing = false;
while (!_reader.Eof) while (!_reader.Eof)
{ {
var currentStylePartCanContainMarkup =
builder.ToString()
.Split(' ')
.Last()
.StartsWith("link=", StringComparison.OrdinalIgnoreCase);
current = _reader.Peek(); current = _reader.Peek();
if (current == ']' && !encounteredOpening) if (currentStylePartCanContainMarkup)
{ {
switch (current)
{
case ']' when !encounteredOpening:
if (encounteredClosing) if (encounteredClosing)
{ {
builder.Append(_reader.Read()); builder.Append(_reader.Read());
@ -136,10 +144,8 @@ internal sealed class MarkupTokenizer : IDisposable
_reader.Read(); _reader.Read();
encounteredClosing = true; encounteredClosing = true;
continue; continue;
}
if (current == '[' && !encounteredClosing) case '[' when !encounteredClosing:
{
if (encounteredOpening) if (encounteredOpening)
{ {
builder.Append(_reader.Read()); builder.Append(_reader.Read());
@ -151,6 +157,21 @@ internal sealed class MarkupTokenizer : IDisposable
encounteredOpening = true; encounteredOpening = true;
continue; continue;
} }
}
else
{
switch (current)
{
case ']':
_reader.Read();
encounteredClosing = true;
break;
case '[':
_reader.Read();
encounteredOpening = true;
break;
}
}
if (encounteredClosing) if (encounteredClosing)
{ {

20
test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Markup.cs
View File

@ -154,5 +154,25 @@ public partial class AnsiConsoleTests
// Then // Then
console.Output.ShouldBe("[grey][white]"); console.Output.ShouldBe("[grey][white]");
} }
[Theory]
[InlineData("[white][[[/][white]]][/]", "[]")]
[InlineData("[white][[[/]", "[")]
[InlineData("[white]]][/]", "]")]
[InlineData("[black on white link=https://www.gooole.com/q=]]]Search for a bracket[/]", "Search for a bracket")]
[InlineData("[link=https://www.gooole.com/q=]] black on white]Search for a bracket[/]", "Search for a bracket")]
[InlineData("[link]https://www.gooole.com/q=]][/]", "https://www.gooole.com/q=]")]
public void Should_Not_Fail_As_In_GH1024(string markup, string expected)
{
// Given
var console = new TestConsole();
console.EmitAnsiSequences = false;
// When
console.Markup(markup);
// Then
console.Output.ShouldBe(expected);
}
} }
} }