Clean up Widgets

* Move /Widgets/Live/* to /Live/* * Move /Widgets/Prompt/* to /Prompts/* * Move tests and expectations to match the new locations
2025-04-17 17:32:50 +08:00 · 2021-07-12 09:39:20 +02:00 · 2021-07-12 09:39:20 +02:00 · fa5a1e88ec
commit fa5a1e88ec
parent d532e1011f
114 changed files with 5 additions and 5 deletions
--- a/src/Spectre.Console/Widgets/Live/LiveDisplay.cs
+++ b/src/Spectre.Console/Widgets/Live/LiveDisplay.cs
--- a/src/Spectre.Console/Widgets/Live/LiveDisplayContext.cs
+++ b/src/Spectre.Console/Widgets/Live/LiveDisplayContext.cs
--- a/src/Spectre.Console/Widgets/Live/LiveDisplayRenderer.cs
+++ b/src/Spectre.Console/Widgets/Live/LiveDisplayRenderer.cs
--- a/src/Spectre.Console/Rendering/LiveRenderable.cs
+++ b/src/Spectre.Console/Rendering/LiveRenderable.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/DownloadedColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/DownloadedColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/ElapsedTimeColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/ElapsedTimeColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/PercentageColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/PercentageColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/ProgressBarColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/ProgressBarColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/RemainingTimeColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/RemainingTimeColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/SpinnerColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/SpinnerColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/TaskDescriptionColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/TaskDescriptionColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Columns/TransferSpeedColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/Columns/TransferSpeedColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/Progress.cs
+++ b/src/Spectre.Console/Widgets/Progress/Progress.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressColumn.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressColumn.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressContext.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressContext.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressRefreshThread.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressRefreshThread.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressRenderer.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressRenderer.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressSample.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressSample.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressTask.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressTask.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressTaskSettings.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressTaskSettings.cs
--- a/src/Spectre.Console/Widgets/Progress/ProgressTaskState.cs
+++ b/src/Spectre.Console/Widgets/Progress/ProgressTaskState.cs
--- a/src/Spectre.Console/Widgets/Progress/Renderers/DefaultProgressRenderer.cs
+++ b/src/Spectre.Console/Widgets/Progress/Renderers/DefaultProgressRenderer.cs
--- a/src/Spectre.Console/Widgets/Progress/Renderers/FallbackProgressRenderer.cs
+++ b/src/Spectre.Console/Widgets/Progress/Renderers/FallbackProgressRenderer.cs
--- a/src/Spectre.Console/Widgets/Progress/Renderers/FallbackStatusRenderer.cs
+++ b/src/Spectre.Console/Widgets/Progress/Renderers/FallbackStatusRenderer.cs
--- a/src/Spectre.Console/Widgets/Progress/Spinner.Generated.cs
+++ b/src/Spectre.Console/Widgets/Progress/Spinner.Generated.cs
--- a/src/Spectre.Console/Widgets/Progress/Spinner.cs
+++ b/src/Spectre.Console/Widgets/Progress/Spinner.cs
--- a/src/Spectre.Console/Widgets/Progress/Status.cs
+++ b/src/Spectre.Console/Widgets/Progress/Status.cs
--- a/src/Spectre.Console/Widgets/Progress/StatusContext.cs
+++ b/src/Spectre.Console/Widgets/Progress/StatusContext.cs
--- a/src/Spectre.Console/Widgets/Prompt/ConfirmationPrompt.cs
+++ b/src/Spectre.Console/Widgets/Prompt/ConfirmationPrompt.cs
--- a/src/Spectre.Console/Widgets/Prompt/DefaultPromptValue.cs
+++ b/src/Spectre.Console/Widgets/Prompt/DefaultPromptValue.cs
--- a/src/Spectre.Console/Widgets/Prompt/IMultiSelectionItem.cs
+++ b/src/Spectre.Console/Widgets/Prompt/IMultiSelectionItem.cs
--- a/src/Spectre.Console/Widgets/Prompt/IPrompt.cs
+++ b/src/Spectre.Console/Widgets/Prompt/IPrompt.cs
--- a/src/Spectre.Console/Widgets/Prompt/ISelectionItem.cs
+++ b/src/Spectre.Console/Widgets/Prompt/ISelectionItem.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/IListPromptStrategy.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/IListPromptStrategy.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/ListPrompt.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/ListPrompt.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/ListPromptConstants.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/ListPromptConstants.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/ListPromptInputResult.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/ListPromptInputResult.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/ListPromptItem.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/ListPromptItem.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/ListPromptRenderHook.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/ListPromptRenderHook.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/ListPromptState.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/ListPromptState.cs
--- a/src/Spectre.Console/Widgets/Prompt/List/ListPromptTree.cs
+++ b/src/Spectre.Console/Widgets/Prompt/List/ListPromptTree.cs
--- a/src/Spectre.Console/Widgets/Prompt/MultiSelectionPrompt.cs
+++ b/src/Spectre.Console/Widgets/Prompt/MultiSelectionPrompt.cs
--- a/src/Spectre.Console/Widgets/Prompt/MultiSelectionPromptExtensions.cs
+++ b/src/Spectre.Console/Widgets/Prompt/MultiSelectionPromptExtensions.cs
--- a/src/Spectre.Console/Widgets/Prompt/SelectionPrompt.cs
+++ b/src/Spectre.Console/Widgets/Prompt/SelectionPrompt.cs
--- a/src/Spectre.Console/Widgets/Prompt/SelectionPromptExtensions.cs
+++ b/src/Spectre.Console/Widgets/Prompt/SelectionPromptExtensions.cs
--- a/src/Spectre.Console/Widgets/Prompt/SelectionType.cs
+++ b/src/Spectre.Console/Widgets/Prompt/SelectionType.cs
--- a/src/Spectre.Console/Widgets/Prompt/TextPrompt.cs
+++ b/src/Spectre.Console/Widgets/Prompt/TextPrompt.cs
--- a/src/Spectre.Console/Widgets/Prompt/TextPromptExtensions.cs
+++ b/src/Spectre.Console/Widgets/Prompt/TextPromptExtensions.cs
--- a/src/Spectre.Console/Widgets/Prompt/ValidationResult.cs
+++ b/src/Spectre.Console/Widgets/Prompt/ValidationResult.cs
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/NoSuffix.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/NoSuffix.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/AsciiBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/AsciiBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/DoubleBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/DoubleBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/HeavyBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/HeavyBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/NoBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/NoBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/RoundedBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/RoundedBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/SquareBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Box/SquareBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/Ascii2Border.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/Ascii2Border.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleEdgeBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/DoubleEdgeBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyEdgeBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyEdgeBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyHeadBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HeavyHeadBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HorizontalBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/HorizontalBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_Centered.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_Centered.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/NoBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/NoBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/RoundedBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/RoundedBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleHeavyBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SimpleHeavyBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SquareBorder.Output.verified.txt
+++ b/test/Spectre.Console.Tests/Expectations/Rendering/Borders/Table/SquareBorder.Output.verified.txt
--- a/test/Spectre.Console.Tests/Unit/Live/Progress/DownloadedColumnTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Live/Progress/DownloadedColumnTests.cs
--- a/test/Spectre.Console.Tests/Unit/Live/Progress/ProgressColumnFixture.cs
+++ b/test/Spectre.Console.Tests/Unit/Live/Progress/ProgressColumnFixture.cs
--- a/test/Spectre.Console.Tests/Unit/Live/Progress/ProgressTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Live/Progress/ProgressTests.cs
@ -9,7 +9,7 @@ using Xunit;
 namespace Spectre.Console.Tests.Unit
 {
    [UsesVerify]
-    [ExpectationPath("Widgets/Progress")]
+    [ExpectationPath("Live/Progress")]
    public sealed class ProgressTests
    {
        [Fact]
--- a/test/Spectre.Console.Tests/Unit/Live/StatusTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Live/StatusTests.cs
@ -9,7 +9,7 @@ using Xunit;
 namespace Spectre.Console.Tests.Unit
 {
    [UsesVerify]
-    [ExpectationPath("Widgets/Status")]
+    [ExpectationPath("Live/Status")]
    public sealed class StatusTests
    {
        public sealed class DummySpinner1 : Spinner
--- a/test/Spectre.Console.Tests/Unit/Prompts/MultiSelectionPromptTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Prompts/MultiSelectionPromptTests.cs
--- a/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Prompts/TextPromptTests.cs
@ -9,7 +9,7 @@ using Spectre.Verify.Extensions;
 namespace Spectre.Console.Tests.Unit
 {
    [UsesVerify]
-    [ExpectationPath("Widgets/Prompt/Text")]
+    [ExpectationPath("Prompts/Text")]
    public sealed class TextPromptTests
    {
        [Fact]
--- a/test/Spectre.Console.Tests/Unit/Rendering/Borders/BoxBorderTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Rendering/Borders/BoxBorderTests.cs
@ -9,7 +9,7 @@ using Xunit;
 namespace Spectre.Console.Tests.Unit
 {
    [UsesVerify]
-    [ExpectationPath("Borders/Box")]
+    [ExpectationPath("Rendering/Borders/Box")]
    public sealed class BoxBorderTests
    {
        [UsesVerify]
--- a/test/Spectre.Console.Tests/Unit/Rendering/Borders/TableBorderTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Rendering/Borders/TableBorderTests.cs
@ -9,7 +9,7 @@ using Xunit;
 namespace Spectre.Console.Tests.Unit
 {
    [UsesVerify]
-    [ExpectationPath("Borders/Table")]
+    [ExpectationPath("Rendering/Borders/Table")]
    public sealed class TableBorderTests
    {
        [UsesVerify]
--- a/test/Spectre.Console.Tests/Unit/Rendering/RenderHookTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Rendering/RenderHookTests.cs
--- a/test/Spectre.Console.Tests/Unit/Rendering/SegmentTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Rendering/SegmentTests.cs
--- a/test/Spectre.Console.Tests/Unit/Widgets/BarChartTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Widgets/BarChartTests.cs
--- a/Show More
+++ b/Show More