Skip to content

Does PSStyle early initialization less expensive #16320

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
daxian-dbw merged 2 commits into from
Oct 28, 2021
Merged

Does PSStyle early initialization less expensive #16320

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8cbeb9
Does PSStyle early initialization less expensive
iSazonov Oct 28, 2021
55a118e
Address feedback
iSazonov Oct 28, 2021
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
40 changes: 25 additions & 15 deletions 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 @@ -35,7 +35,7 @@ public enum ProgressView
/// <summary>Classic rendering of progress.</summary>
Classic = 1,
}

#region PSStyle
/// <summary>
/// Contains configuration for how PowerShell renders text.
Expand Down Expand Up @@ -365,7 +365,7 @@ public string Error
get => _error;
set => _error = ValidateNoContent(value);
}

private string _error = "\x1b[31;1m";

/// <summary>
Expand Down Expand Up @@ -397,7 +397,7 @@ public string Debug
{
get => _debug;
set => _debug = ValidateNoContent(value);
}
}

private string _debug = "\x1b[33;1m";
}
Expand Down Expand Up @@ -467,6 +467,16 @@ public void Add(string extension, string decoration)
_extensionDictionary.Add(ValidateExtension(extension), ValidateNoContent(decoration));
}

/// <summary>
/// Add new extension and decoration to dictionary without validation.
/// </summary>
/// <param name="extension">Extension to add.</param>
/// <param name="decoration">ANSI string value to add.</param>
internal void AddWithoutValidation(string extension, string decoration)
{
_extensionDictionary.Add(extension, decoration);
}

/// <summary>
/// Remove an extension from dictionary.
/// </summary>
Expand Down Expand Up @@ -543,19 +553,19 @@ public FileInfoFormatting()
Extension = new FileExtensionDictionary();

// archives
Extension.Add(".zip", "\x1b[31;1m");
Extension.Add(".tgz", "\x1b[31;1m");
Extension.Add(".gz", "\x1b[31;1m");
Extension.Add(".tar", "\x1b[31;1m");
Extension.Add(".nupkg", "\x1b[31;1m");
Extension.Add(".cab", "\x1b[31;1m");
Extension.Add(".7z", "\x1b[31;1m");
Extension.AddWithoutValidation(".zip", "\x1b[31;1m");
Extension.AddWithoutValidation(".tgz", "\x1b[31;1m");
Extension.AddWithoutValidation(".gz", "\x1b[31;1m");
Extension.AddWithoutValidation(".tar", "\x1b[31;1m");
Extension.AddWithoutValidation(".nupkg", "\x1b[31;1m");
Extension.AddWithoutValidation(".cab", "\x1b[31;1m");
Extension.AddWithoutValidation(".7z", "\x1b[31;1m");

// powershell
Extension.Add(".ps1", "\x1b[33;1m");
Extension.Add(".psd1", "\x1b[33;1m");
Extension.Add(".psm1", "\x1b[33;1m");
Extension.Add(".ps1xml", "\x1b[33;1m");
Extension.AddWithoutValidation(".ps1", "\x1b[33;1m");
Extension.AddWithoutValidation(".psd1", "\x1b[33;1m");
Extension.AddWithoutValidation(".psm1", "\x1b[33;1m");
Extension.AddWithoutValidation(".ps1xml", "\x1b[33;1m");
}
}

Expand Down Expand Up @@ -688,7 +698,7 @@ private PSStyle()

private static string ValidateNoContent(string text)
{
var decorartedString = new StringDecorated(text);
var decorartedString = new ValueStringDecorated(text);
if (decorartedString.ContentLength > 0)
{
throw new ArgumentException(string.Format(PSStyleStrings.TextContainsContent, decorartedString.ToString(OutputRendering.PlainText)));
Expand Down