Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Update regex used to remove ANSI escape sequences to be more specific to decoration and hyperlinks #16811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PaulHigin merged 4 commits into from
Mar 25, 2022
Merged

Update regex used to remove ANSI escape sequences to be more specific to decoration and hyperlinks #16811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9dfb5a0
Update regex used to remove ANSI escape sequences to be more specific…
SteveL-MSFT Jan 27, 2022
88f896a
add CSI sequence and change default back to `host`
SteveL-MSFT Jan 27, 2022
9402a99
fix test for default outputrendering
SteveL-MSFT Jan 27, 2022
61b1de7
remove hyperlink support
SteveL-MSFT Feb 2, 2022
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
2 changes: 1 addition & 1 deletion 2 src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ public FileInfoFormatting()
/// <summary>
/// Gets or sets the rendering mode for output.
/// </summary>
public OutputRendering OutputRendering { get; set; } = OutputRendering.Ansi;
public OutputRendering OutputRendering { get; set; } = OutputRendering.Host;
SteveL-MSFT marked this conversation as resolved.
Show resolved Hide resolved

/// <summary>
/// Gets value to turn off all attributes.
Expand Down
8 changes: 7 additions & 1 deletion 8 src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,14 @@ private string PlainText
}
}

// graphics/color mode ESC[1;2;...m
private const string GraphicsRegex = @"(\x1b\[\d+(;\d+)*m)";

// CSI escape sequences
private const string CsiRegex = @"(\x1b\[\?\d+[hl])";

// replace regex with .NET 6 API once available
internal static readonly Regex AnsiRegex = new Regex(@"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", RegexOptions.Compiled);
internal static readonly Regex AnsiRegex = new Regex($"{GraphicsRegex}|{CsiRegex}", RegexOptions.Compiled);

/// <summary>
/// Initializes a new instance of the <see cref="ValueStringDecorated"/> struct.
Expand Down
2 changes: 1 addition & 1 deletion 2 test/powershell/engine/Formatting/PSStyle.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Describe 'Tests for $PSStyle automatic variable' {

It '$PSStyle has correct default for OutputRendering' {
$PSStyle | Should -Not -BeNullOrEmpty
$PSStyle.OutputRendering | Should -BeExactly 'Ansi'
$PSStyle.OutputRendering | Should -BeExactly 'Host'
}

It '$PSStyle has correct defaults for style <key>' -TestCases (Get-TestCases $styleDefaults) {
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.