tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-10-31 09:09:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup AnsiSequences.cs

Browse Source 
1. Update CSI constant to include the [ character.
See ECMA-48 Section 8.3.16
https://www.ecma-international.org/wp-content/uploads/ECMA-48_5th_edition_june_1991.pdf

2. Use string interpolation, because it's easier to read
(and internally uses a StringBuilder)

3. Add ESC constant, because the AnsiBuilder needs it to create links.

4. Remove unused SGR overload.
This commit is contained in:
Christian Wischenbart
2021-04-05 22:56:50 +02:00
committed by Patrik Svensson
parent 8cf7794852
commit 39b59c8d4a
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Spectre.Console/Internal/Backends/Ansi/AnsiBuilder.cs
View File

@@ -65,7 +65,7 @@ namespace Spectre.Console
}
var linkId = _linkHasher.GenerateId(link, text);
ansi = $"{CSI}]8;id={linkId};{link}{CSI}\\{ansi}{CSI}]8;;{CSI}\\";
ansi = $"{ESC}]8;id={linkId};{link}{ESC}\\{ansi}{ESC}]8;;{ESC}\\";
}
return ansi;

40
src/Spectre.Console/Internal/Backends/Ansi/AnsiSequences.cs
View File

@@ -4,10 +4,15 @@ namespace Spectre.Console
{
internal static class AnsiSequences
{
/// <summary>
/// The ASCII escape character (decimal 27).
/// </summary>
public const string ESC = "\u001b";
/// <summary>
/// Introduces a control sequence that uses 8-bit characters.
/// </summary>
public const string CSI = "\u001b";
public const string CSI = ESC + "[";
/// <summary>
/// Text cursor enable.
@@ -17,18 +22,6 @@ namespace Spectre.Console
/// </remarks>
public const int DECTCEM = 25;
/// <summary>
/// This control function selects one or more character attributes at the same time.
/// </summary>
/// <remarks>
/// See <see href="https://vt100.net/docs/vt510-rm/SGR.html"/>.
/// </remarks>
/// <returns>The ANSI escape code.</returns>
public static string SGR(params int[] codes)
{
return CSI + "[" + string.Join(";", codes.Select(c => c.ToString())) + "m";
}
/// <summary>
/// This control function selects one or more character attributes at the same time.
/// </summary>
@@ -38,7 +31,8 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string SGR(params byte[] codes)
{
return CSI + "[" + string.Join(";", codes.Select(c => c.ToString())) + "m";
var joinedCodes = string.Join(";", codes.Select(c => c.ToString()));
return $"{CSI}{joinedCodes}m";
}
/// <summary>
@@ -53,7 +47,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string ED(int code)
{
return CSI + $"[{code}J";
return $"{CSI}{code}J";
}
/// <summary>
@@ -68,7 +62,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string CUU(int steps)
{
return CSI + $"[{steps}A";
return $"{CSI}{steps}A";
}
/// <summary>
@@ -83,7 +77,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string CUD(int steps)
{
return CSI + $"[{steps}B";
return $"{CSI}{steps}B";
}
/// <summary>
@@ -97,7 +91,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string CUF(int steps)
{
return CSI + $"[{steps}C";
return $"{CSI}{steps}C";
}
/// <summary>
@@ -111,7 +105,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string CUB(int steps)
{
return CSI + $"[{steps}D";
return $"{CSI}{steps}D";
}
/// <summary>
@@ -125,7 +119,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string CUP(int line, int column)
{
return CSI + $"[{line};{column}H";
return $"{CSI}{line};{column}H";
}
/// <summary>
@@ -137,7 +131,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string RM(int code)
{
return CSI + $"[?{code}l";
return $"{CSI}?{code}l";
}
/// <summary>
@@ -149,7 +143,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string SM(int code)
{
return CSI + $"[?{code}h";
return $"{CSI}?{code}h";
}
/// <summary>
@@ -163,7 +157,7 @@ namespace Spectre.Console
/// <returns>The ANSI escape code.</returns>
public static string EL(int code)
{
return CSI + $"[{code}K";
return $"{CSI}{code}K";
}
}
}