From 7fde3dac2d1c8ce8880060202373d0def05ea148 Mon Sep 17 00:00:00 2001 From: Isaac Daly Date: Sun, 9 Feb 2025 22:15:37 +1100 Subject: [PATCH] Update deps (#1101) Something's up with dependabot, so manually doing it in the interim --- .config/dotnet-tools.json | 11 +- Directory.Packages.props | 38 ++-- src/Whim.Bar.Tests/BarLayoutEngineTests.cs | 39 ++-- src/Whim.Bar/BarLayoutEngine.cs | 15 +- .../CommandPaletteWindowViewModelTests.cs | 103 ++++++++--- .../FreeText/FreeTextVariantViewModelTests.cs | 13 +- .../Select/SelectVariantViewModelTests.cs | 71 ++++---- .../FloatingLayoutEngineTests.cs | 13 +- src/Whim.Gaps.Tests/GapsLayoutEngineTests.cs | 41 ++--- src/Whim.Gaps/GapsLayoutEngine.cs | 15 +- .../LayoutPreviewPluginTests.cs | 117 ++++++------ src/Whim.LayoutPreview/LayoutPreviewPlugin.cs | 11 +- .../SliceLayoutPluginTests.cs | 11 +- .../SliceLayoutsTests.cs | 8 +- .../SliceLayoutEngineHelpers.cs | 6 +- src/Whim.TestUtils/MonitorTestUtils.cs | 2 +- .../ProxyLayoutEngineBaseTests.cs | 13 +- src/Whim.Tests/Keybind/KeybindHookTests.cs | 65 ++++--- .../Layout/ColumnLayoutEngineTests.cs | 13 +- src/Whim.Tests/Location/RectangleTests.cs | 30 ++-- .../Monitor/MonitorsChangedEventArgsTests.cs | 39 ++-- .../Native/DeferWindowPosHandleTests.cs | 15 +- src/Whim.Tests/Native/MonitorInfoTests.cs | 6 +- .../MonitorEventListenerTests.cs | 19 +- .../WindowSector/WindowEventListenerTests.cs | 22 ++- .../Transforms/AddWorkspaceTransformTests.cs | 40 +++-- .../LayoutEngineCustomActionTransformTests.cs | 50 +++--- src/Whim.Tests/Window/WindowStateTests.cs | 169 ++++++++---------- .../Workspace/LegacyWorkspaceTests.cs | 13 +- .../MonitorWorkspaceChangedEventTests.cs | 91 +++++----- .../TreeLayoutCommandPaletteCommandsTests.cs | 8 +- .../MoveWindowEdgesInDirectionTests.cs | 15 +- .../LayoutEngine/PerformCustomActionTests.cs | 13 +- .../Tree/TreeHelpersTests.cs | 13 +- src/Whim.TreeLayout/Tree/TreeHelpers.cs | 15 +- src/Whim.Yaml/Whim.Yaml.csproj | 4 + src/Whim.Yaml/YamlBarPluginLoader.cs | 31 ++-- src/Whim.Yaml/YamlLayoutEngineLoader.cs | 30 ++-- src/Whim/Native/NativeManager.cs | 13 +- .../Transforms/MonitorsChangedTransform.cs | 13 +- .../Transforms/AddWorkspaceTransform.cs | 11 +- .../WindowMessage/WindowMessageMonitor.cs | 19 +- 42 files changed, 654 insertions(+), 630 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a214c9009..cfb601e7d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,24 +3,19 @@ "isRoot": true, "tools": { "xamlstyler.console": { - "version": "3.2404.2", + "version": "3.2501.8", "commands": ["xstyler"], "rollForward": false }, "csharpier": { - "version": "0.29.2", + "version": "0.30.6", "commands": ["dotnet-csharpier"], "rollForward": false }, "docfx": { - "version": "2.78.0", + "version": "2.78.2", "commands": ["docfx"], "rollForward": false - }, - "corvus.json.jsonschema.typegeneratortool": { - "version": "4.0.9", - "commands": ["generatejsonschematypes"], - "rollForward": false } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index d9bcae2d5..a7143d155 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,35 +3,35 @@ true - - - - - - - + + + + + + + - - + + - - - + + + - - - - + + + + - - - + + + \ No newline at end of file diff --git a/src/Whim.Bar.Tests/BarLayoutEngineTests.cs b/src/Whim.Bar.Tests/BarLayoutEngineTests.cs index 17471de9c..a8d6b396b 100644 --- a/src/Whim.Bar.Tests/BarLayoutEngineTests.cs +++ b/src/Whim.Bar.Tests/BarLayoutEngineTests.cs @@ -298,13 +298,12 @@ public void DoLayout(ILayoutEngine innerLayoutEngine, IWindow window1, IWindow w }, ]; - Rectangle expectedGivenRect = - new() - { - Y = 30, - Width = 100, - Height = 70, - }; + Rectangle expectedGivenRect = new() + { + Y = 30, + Width = 100, + Height = 70, + }; innerLayoutEngine.DoLayout(expectedGivenRect, monitor).Returns(expectedWindowStates); @@ -337,13 +336,12 @@ public void PerformCustomAction_NotSame(ILayoutEngine innerLayoutEngine, ILayout { // Given BarLayoutEngine engine = CreateSut(innerLayoutEngine); - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = null, - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = null, + }; innerLayoutEngine.PerformCustomAction(action).Returns(performCustomActionResult); // When @@ -359,13 +357,12 @@ public void PerformCustomAction_Same(ILayoutEngine innerLayoutEngine) { // Given BarLayoutEngine engine = CreateSut(innerLayoutEngine); - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = null, - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = null, + }; innerLayoutEngine.PerformCustomAction(action).Returns(innerLayoutEngine); // When diff --git a/src/Whim.Bar/BarLayoutEngine.cs b/src/Whim.Bar/BarLayoutEngine.cs index 190ba60f0..166c506ea 100644 --- a/src/Whim.Bar/BarLayoutEngine.cs +++ b/src/Whim.Bar/BarLayoutEngine.cs @@ -39,14 +39,13 @@ public override IEnumerable DoLayout(IRectangle rectangle, IM double scale = monitor.ScaleFactor / 100.0; int height = (int)(_barConfig.Height * scale); - Rectangle proxiedRect = - new() - { - X = rectangle.X, - Y = rectangle.Y + height, - Width = rectangle.Width, - Height = Math.Max(0, rectangle.Height - height), - }; + Rectangle proxiedRect = new() + { + X = rectangle.X, + Y = rectangle.Y + height, + Width = rectangle.Width, + Height = Math.Max(0, rectangle.Height - height), + }; return InnerLayoutEngine.DoLayout(proxiedRect, monitor); } diff --git a/src/Whim.CommandPalette.Tests/CommandPaletteWindowViewModelTests.cs b/src/Whim.CommandPalette.Tests/CommandPaletteWindowViewModelTests.cs index 36f5b069a..7ee1140dd 100644 --- a/src/Whim.CommandPalette.Tests/CommandPaletteWindowViewModelTests.cs +++ b/src/Whim.CommandPalette.Tests/CommandPaletteWindowViewModelTests.cs @@ -48,8 +48,13 @@ public void RequestHide() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); // When // Then @@ -61,8 +66,13 @@ public void OnKeyDown_Escape() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); // When // Then @@ -78,8 +88,13 @@ public void OnKeyDown_OtherKeys() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); vm.Activate(new MenuVariantConfig() { Commands = [] }, null); @@ -95,8 +110,13 @@ public void Activate_UseDefaults() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); // When Assert.Raises( @@ -116,8 +136,13 @@ public void Activate_DefineItems() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); IMonitor monitor = Substitute.For(); monitor.WorkingArea.Returns( @@ -130,13 +155,12 @@ public void Activate_DefineItems() } ); - MenuVariantConfig config = - new() - { - Commands = [], - InitialText = "Initial text", - Hint = "Hint", - }; + MenuVariantConfig config = new() + { + Commands = [], + InitialText = "Initial text", + Hint = "Hint", + }; IEnumerable ICommands = [new Command("id", "title", () => { })]; @@ -185,8 +209,13 @@ public void Activate_Variant(BaseVariantConfig config, bool expected, string con { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); // When vm.Activate(config, null); @@ -201,8 +230,13 @@ public void Update() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); MenuVariantConfig config = new() { Commands = [] }; @@ -220,8 +254,13 @@ public void IsVisible_True() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); MenuVariantConfig config = new() { Commands = [] }; @@ -239,8 +278,13 @@ public void IsVisible_False() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); // When bool result = vm.IsVisible; @@ -254,8 +298,13 @@ public void RequestFocusTextBox() { // Given Wrapper wrapper = new(); - CommandPaletteWindowViewModel vm = - new(wrapper.Context, wrapper.Plugin, wrapper.MenuVariant, wrapper.FreeTextVariant, wrapper.SelectVariant); + CommandPaletteWindowViewModel vm = new( + wrapper.Context, + wrapper.Plugin, + wrapper.MenuVariant, + wrapper.FreeTextVariant, + wrapper.SelectVariant + ); // When // Then diff --git a/src/Whim.CommandPalette.Tests/Variants/FreeText/FreeTextVariantViewModelTests.cs b/src/Whim.CommandPalette.Tests/Variants/FreeText/FreeTextVariantViewModelTests.cs index a40cfc216..2ca11d383 100644 --- a/src/Whim.CommandPalette.Tests/Variants/FreeText/FreeTextVariantViewModelTests.cs +++ b/src/Whim.CommandPalette.Tests/Variants/FreeText/FreeTextVariantViewModelTests.cs @@ -16,13 +16,12 @@ public void Customize(IFixture fixture) FreeTextVariantCallback callback = Substitute.For(); fixture.Inject(callback); - FreeTextVariantConfig config = - new() - { - InitialText = "Hello, world!", - Callback = callback, - Prompt = "Hello, world!", - }; + FreeTextVariantConfig config = new() + { + InitialText = "Hello, world!", + Callback = callback, + Prompt = "Hello, world!", + }; fixture.Inject(config); } } diff --git a/src/Whim.CommandPalette.Tests/Variants/Select/SelectVariantViewModelTests.cs b/src/Whim.CommandPalette.Tests/Variants/Select/SelectVariantViewModelTests.cs index 7e28747bd..35229bb92 100644 --- a/src/Whim.CommandPalette.Tests/Variants/Select/SelectVariantViewModelTests.cs +++ b/src/Whim.CommandPalette.Tests/Variants/Select/SelectVariantViewModelTests.cs @@ -106,13 +106,12 @@ public void Update_Activated_NoMatches() IEnumerable optionsMock = Substitute.For>(); optionsMock.GetEnumerator().Returns(_ => new List().GetEnumerator()); - SelectVariantConfig activationConfig = - new() - { - Callback = (items) => { }, - Options = optionsMock, - ConfirmButtonText = "Call", - }; + SelectVariantConfig activationConfig = new() + { + Callback = (items) => { }, + Options = optionsMock, + ConfirmButtonText = "Call", + }; selectVariantViewModel.Activate(activationConfig); @@ -219,13 +218,12 @@ [new FilterTextMatch(0, o.Title.Length)], )) ); - SelectVariantConfig activationConfig = - new() - { - Callback = callbackMock, - Options = options, - Matcher = matcherMock, - }; + SelectVariantConfig activationConfig = new() + { + Callback = callbackMock, + Options = options, + Matcher = matcherMock, + }; return ( selectVariantViewModel, @@ -528,14 +526,13 @@ var createdRows ) = CreateOptionsStubs(); selectVariantViewModel.LoadSelectMatches("test", activationConfig); - SelectOption newOption = - new() - { - Id = "5", - Title = "title5", - IsSelected = false, - IsEnabled = false, - }; + SelectOption newOption = new() + { + Id = "5", + Title = "title5", + IsSelected = false, + IsEnabled = false, + }; List updatedOptions = [options[0], newOption, options[2]]; @@ -587,14 +584,13 @@ var createdRows selectVariantViewModel.Activate(activationConfig); // Second load - SelectOption secondNewOption = - new() - { - Id = "5", - Title = "title5", - IsSelected = false, - IsEnabled = false, - }; + SelectOption secondNewOption = new() + { + Id = "5", + Title = "title5", + IsSelected = false, + IsEnabled = false, + }; List secondOptions = [secondNewOption]; List secondVariantItems = secondOptions .Select(o => new SelectVariantRowModel(o)) @@ -614,14 +610,13 @@ var createdRows ); // When third load - SelectOption thirdNewOption = - new() - { - Id = "6", - Title = "title6", - IsSelected = false, - IsEnabled = false, - }; + SelectOption thirdNewOption = new() + { + Id = "6", + Title = "title6", + IsSelected = false, + IsEnabled = false, + }; List thirdOptions = [secondNewOption, thirdNewOption]; List thirdVariantItems = thirdOptions.Select(o => new SelectVariantRowModel(o)).ToList(); diff --git a/src/Whim.FloatingWindow.Tests/FloatingLayoutEngineTests.cs b/src/Whim.FloatingWindow.Tests/FloatingLayoutEngineTests.cs index fed03b1d4..986193f5c 100644 --- a/src/Whim.FloatingWindow.Tests/FloatingLayoutEngineTests.cs +++ b/src/Whim.FloatingWindow.Tests/FloatingLayoutEngineTests.cs @@ -285,13 +285,12 @@ public void PerformCustomAction(IContext context, IWindow window) { // Given ILayoutEngine engine = new FloatingLayoutEngine(context, identity).AddWindow(window); - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = null, - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = null, + }; // When ILayoutEngine newEngine = engine.PerformCustomAction(action); diff --git a/src/Whim.Gaps.Tests/GapsLayoutEngineTests.cs b/src/Whim.Gaps.Tests/GapsLayoutEngineTests.cs index b02fcfa6d..1d9c6fb24 100644 --- a/src/Whim.Gaps.Tests/GapsLayoutEngineTests.cs +++ b/src/Whim.Gaps.Tests/GapsLayoutEngineTests.cs @@ -120,14 +120,13 @@ IContext ctx GapsLayoutEngine gapsLayoutEngine = new(gapsConfig, innerLayoutEngine); - Rectangle rect = - new() - { - X = 0, - Y = 0, - Width = 1920, - Height = 1080, - }; + Rectangle rect = new() + { + X = 0, + Y = 0, + Width = 1920, + Height = 1080, + }; IMonitor monitor = Substitute.For(); monitor.ScaleFactor.Returns(scale); @@ -886,13 +885,12 @@ public void PerformCustomAction_NotSame(ILayoutEngine innerLayoutEngine, ILayout // Given GapsConfig gapsConfig = new() { OuterGap = 10, InnerGap = 5 }; - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = Substitute.For(), - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = Substitute.For(), + }; innerLayoutEngine.PerformCustomAction(action).Returns(performCustomActionResult); GapsLayoutEngine gapsLayoutEngine = new(gapsConfig, innerLayoutEngine); @@ -912,13 +910,12 @@ public void PerformCustomAction_Same(ILayoutEngine innerLayoutEngine) // Given GapsConfig gapsConfig = new() { OuterGap = 10, InnerGap = 5 }; - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = Substitute.For(), - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = Substitute.For(), + }; innerLayoutEngine.PerformCustomAction(action).Returns(innerLayoutEngine); GapsLayoutEngine gapsLayoutEngine = new(gapsConfig, innerLayoutEngine); diff --git a/src/Whim.Gaps/GapsLayoutEngine.cs b/src/Whim.Gaps/GapsLayoutEngine.cs index 837655601..2b4b7e01f 100644 --- a/src/Whim.Gaps/GapsLayoutEngine.cs +++ b/src/Whim.Gaps/GapsLayoutEngine.cs @@ -86,14 +86,13 @@ public override IEnumerable DoLayout(IRectangle rectangle, IM int doubleOuterGap = outerGap * 2; int doubleInnerGap = innerGap * 2; - Rectangle proxiedRect = - new() - { - X = rectangle.X + outerGap, - Y = rectangle.Y + outerGap, - Width = rectangle.Width - doubleOuterGap, - Height = rectangle.Height - doubleOuterGap, - }; + Rectangle proxiedRect = new() + { + X = rectangle.X + outerGap, + Y = rectangle.Y + outerGap, + Width = rectangle.Width - doubleOuterGap, + Height = rectangle.Height - doubleOuterGap, + }; int idx = 0; foreach (IWindowState windowState in InnerLayoutEngine.DoLayout(proxiedRect, monitor)) diff --git a/src/Whim.LayoutPreview.Tests/LayoutPreviewPluginTests.cs b/src/Whim.LayoutPreview.Tests/LayoutPreviewPluginTests.cs index 79f36bbfe..a475e6bb2 100644 --- a/src/Whim.LayoutPreview.Tests/LayoutPreviewPluginTests.cs +++ b/src/Whim.LayoutPreview.Tests/LayoutPreviewPluginTests.cs @@ -121,13 +121,12 @@ internal void WindowMoveStarted_NotDragged(IContext ctx, MutableRootSector rootS { // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMoveStartedEventArgs e = - new() - { - Window = Substitute.For(), - CursorDraggedPoint = null, - MovedEdges = null, - }; + WindowMoveStartedEventArgs e = new() + { + Window = Substitute.For(), + CursorDraggedPoint = null, + MovedEdges = null, + }; // When plugin.PreInitialize(); @@ -144,13 +143,12 @@ internal void WindowMoved_NotDragged(IContext ctx, MutableRootSector rootSector) { // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMovedEventArgs e = - new() - { - Window = Substitute.For(), - CursorDraggedPoint = null, - MovedEdges = null, - }; + WindowMovedEventArgs e = new() + { + Window = Substitute.For(), + CursorDraggedPoint = null, + MovedEdges = null, + }; // When plugin.PreInitialize(); @@ -167,13 +165,12 @@ internal void WindowMoved_MovingEdges(IContext ctx, MutableRootSector rootSector { // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMovedEventArgs e = - new() - { - Window = Substitute.For(), - CursorDraggedPoint = new Rectangle(), - MovedEdges = Direction.LeftDown, - }; + WindowMovedEventArgs e = new() + { + Window = Substitute.For(), + CursorDraggedPoint = new Rectangle(), + MovedEdges = Direction.LeftDown, + }; // When plugin.PreInitialize(); @@ -194,13 +191,12 @@ IWorkspace workspace { // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMovedEventArgs e = - new() - { - Window = Substitute.For(), - CursorDraggedPoint = new Rectangle(), - MovedEdges = null, - }; + WindowMovedEventArgs e = new() + { + Window = Substitute.For(), + CursorDraggedPoint = new Rectangle(), + MovedEdges = null, + }; rootSector.MapSector.MonitorWorkspaceMap = rootSector.MapSector.MonitorWorkspaceMap.Clear(); workspace.ActiveLayoutEngine.ClearReceivedCalls(); @@ -234,13 +230,12 @@ IMonitor monitor ctx.MonitorManager.GetMonitorAtPoint(Arg.Any>()).Returns(monitor); using LayoutPreviewPlugin plugin = new(ctx); - WindowMovedEventArgs e = - new() - { - Window = window, - CursorDraggedPoint = new Rectangle(), - MovedEdges = null, - }; + WindowMovedEventArgs e = new() + { + Window = window, + CursorDraggedPoint = new Rectangle(), + MovedEdges = null, + }; // When plugin.PreInitialize(); @@ -261,13 +256,12 @@ Workspace workspace { // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMovedEventArgs e = - new() - { - Window = window, - CursorDraggedPoint = new Rectangle(), - MovedEdges = null, - }; + WindowMovedEventArgs e = new() + { + Window = window, + CursorDraggedPoint = new Rectangle(), + MovedEdges = null, + }; workspace.ActiveLayoutEngine.ClearReceivedCalls(); @@ -288,13 +282,12 @@ internal void WindowMoveEnded(IContext ctx, MutableRootSector rootSector) { // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMoveEndedEventArgs e = - new() - { - Window = Substitute.For(), - CursorDraggedPoint = null, - MovedEdges = null, - }; + WindowMoveEndedEventArgs e = new() + { + Window = Substitute.For(), + CursorDraggedPoint = null, + MovedEdges = null, + }; // When plugin.PreInitialize(); @@ -339,13 +332,12 @@ internal void WindowEvents_WindowRemoved_Hidden(IContext ctx, MutableRootSector // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMovedEventArgs moveArgs = - new() - { - Window = movedWindow, - CursorDraggedPoint = new Rectangle(), - MovedEdges = null, - }; + WindowMovedEventArgs moveArgs = new() + { + Window = movedWindow, + CursorDraggedPoint = new Rectangle(), + MovedEdges = null, + }; WindowEventArgs removeArgs = new WindowRemovedEventArgs() { Window = movedWindow }; // When @@ -364,13 +356,12 @@ internal void WindowEvents_WindowFocused(IContext ctx, MutableRootSector rootSec // Given using LayoutPreviewPlugin plugin = new(ctx); - WindowMovedEventArgs moveArgs = - new() - { - Window = movedWindow, - CursorDraggedPoint = new Rectangle(), - MovedEdges = null, - }; + WindowMovedEventArgs moveArgs = new() + { + Window = movedWindow, + CursorDraggedPoint = new Rectangle(), + MovedEdges = null, + }; WindowFocusedEventArgs focusArgs = new() { Window = movedWindow }; diff --git a/src/Whim.LayoutPreview/LayoutPreviewPlugin.cs b/src/Whim.LayoutPreview/LayoutPreviewPlugin.cs index 543a56ff0..aff045f6f 100644 --- a/src/Whim.LayoutPreview/LayoutPreviewPlugin.cs +++ b/src/Whim.LayoutPreview/LayoutPreviewPlugin.cs @@ -91,12 +91,11 @@ e.CursorDraggedPoint is not IPoint cursorDraggedPoint Rectangle rect = new() { Height = monitor.WorkingArea.Height, Width = monitor.WorkingArea.Width }; // Adjust the cursor point so that it's relative to the monitor's rectangle. - Point adjustedCursorPoint = - new() - { - X = cursorDraggedPoint.X - monitor.WorkingArea.X, - Y = cursorDraggedPoint.Y - monitor.WorkingArea.Y, - }; + Point adjustedCursorPoint = new() + { + X = cursorDraggedPoint.X - monitor.WorkingArea.X, + Y = cursorDraggedPoint.Y - monitor.WorkingArea.Y, + }; _layoutPreviewWindow?.Update( layoutEngine.DoLayout(rect, monitor).ToArray(), diff --git a/src/Whim.SliceLayout.Tests/SliceLayoutPluginTests.cs b/src/Whim.SliceLayout.Tests/SliceLayoutPluginTests.cs index 50995e2c4..189f8f0f6 100644 --- a/src/Whim.SliceLayout.Tests/SliceLayoutPluginTests.cs +++ b/src/Whim.SliceLayout.Tests/SliceLayoutPluginTests.cs @@ -200,12 +200,11 @@ public void DemoteWindowInStack(IContext ctx, IWindow window, IWorkspace workspa public void WindowInsertionType_Set(WindowInsertionType insertionType) { // Given - SliceLayoutPlugin plugin = - new(Substitute.For()) - { - // When - WindowInsertionType = insertionType, - }; + SliceLayoutPlugin plugin = new(Substitute.For()) + { + // When + WindowInsertionType = insertionType, + }; // Then Assert.Equal(insertionType, plugin.WindowInsertionType); diff --git a/src/Whim.SliceLayout.Tests/SliceLayoutsTests.cs b/src/Whim.SliceLayout.Tests/SliceLayoutsTests.cs index 43f8fd7d6..07bb08fb7 100644 --- a/src/Whim.SliceLayout.Tests/SliceLayoutsTests.cs +++ b/src/Whim.SliceLayout.Tests/SliceLayoutsTests.cs @@ -58,8 +58,12 @@ public void SanityCheck_RowsNotEqual(IContext ctx, ISliceLayoutPlugin plugin) { // Given LayoutEngineIdentity identity = new(); - SliceLayoutEngine row1 = - new(ctx, plugin, identity, new ParentArea(isRow: true, (1, new OverflowArea(isRow: true)))); + SliceLayoutEngine row1 = new( + ctx, + plugin, + identity, + new ParentArea(isRow: true, (1, new OverflowArea(isRow: true))) + ); SliceLayoutEngine row2 = new(ctx, plugin, identity, new ParentArea(isRow: true, (1, new SliceArea(0, 0)))); // Then diff --git a/src/Whim.SliceLayout/SliceLayoutEngineHelpers.cs b/src/Whim.SliceLayout/SliceLayoutEngineHelpers.cs index 6697df94a..39c86f0ea 100644 --- a/src/Whim.SliceLayout/SliceLayoutEngineHelpers.cs +++ b/src/Whim.SliceLayout/SliceLayoutEngineHelpers.cs @@ -128,8 +128,10 @@ private SliceLayoutEngine RotateWindowIndices(int currentIndex, int targetIndex) { Logger.Debug($"Getting window at {point}"); - Point scaledPoint = - new((int)(point.X * _cachedWindowStatesScale), (int)(point.Y * _cachedWindowStatesScale)); + Point scaledPoint = new( + (int)(point.X * _cachedWindowStatesScale), + (int)(point.Y * _cachedWindowStatesScale) + ); IWindowState[] windowStates = GetLazyWindowStates(); for (int idx = 0; idx < windowStates.Length; idx++) diff --git a/src/Whim.TestUtils/MonitorTestUtils.cs b/src/Whim.TestUtils/MonitorTestUtils.cs index 2476e8ba2..ac7605002 100644 --- a/src/Whim.TestUtils/MonitorTestUtils.cs +++ b/src/Whim.TestUtils/MonitorTestUtils.cs @@ -89,7 +89,7 @@ public static void SetupMultipleMonitors( { unsafe { - callInfo.ArgAt(2).Invoke(hMonitor, (HDC)0, &rect, (LPARAM)0); + callInfo.ArgAt(2).Invoke(hMonitor, new HDC(0), &rect, (LPARAM)0); } } diff --git a/src/Whim.TestUtils/ProxyLayoutEngineBaseTests.cs b/src/Whim.TestUtils/ProxyLayoutEngineBaseTests.cs index 6d62278dc..76c8ce8d4 100644 --- a/src/Whim.TestUtils/ProxyLayoutEngineBaseTests.cs +++ b/src/Whim.TestUtils/ProxyLayoutEngineBaseTests.cs @@ -186,13 +186,12 @@ public void PerformCustomAction_WindowIsPresent(ILayoutEngine inner, IWindow win { // Given ILayoutEngine layoutEngine = CreateLayoutEngine(inner).AddWindow(window1); - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = null, - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = null, + }; // When layoutEngine.PerformCustomAction(action); diff --git a/src/Whim.Tests/Keybind/KeybindHookTests.cs b/src/Whim.Tests/Keybind/KeybindHookTests.cs index 411b2fe87..1aee11662 100644 --- a/src/Whim.Tests/Keybind/KeybindHookTests.cs +++ b/src/Whim.Tests/Keybind/KeybindHookTests.cs @@ -182,40 +182,39 @@ internal void LowLevelKeyboardProc_IgnoredKey(VIRTUAL_KEY key, IContext ctx, IIn internalCtx.CoreNativeManager.Received(1).CallNextHookEx(0, PInvoke.WM_KEYDOWN, 0); } - public static readonly TheoryData KeybindsToExecute = - new() + public static readonly TheoryData KeybindsToExecute = new() + { + { + new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_LSHIFT }, + VIRTUAL_KEY.VK_A, + new Keybind(KeyModifiers.LShift, VIRTUAL_KEY.VK_A) + }, + { + new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_RSHIFT }, + VIRTUAL_KEY.VK_A, + new Keybind(KeyModifiers.RShift, VIRTUAL_KEY.VK_A) + }, + { + new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_LMENU, VIRTUAL_KEY.VK_LCONTROL }, + VIRTUAL_KEY.VK_A, + new Keybind(KeyModifiers.LAlt | KeyModifiers.LControl, VIRTUAL_KEY.VK_A) + }, + { + new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_RMENU, VIRTUAL_KEY.VK_RCONTROL }, + VIRTUAL_KEY.VK_A, + new Keybind(KeyModifiers.RAlt | KeyModifiers.RControl, VIRTUAL_KEY.VK_A) + }, + { + new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_LWIN }, + VIRTUAL_KEY.VK_A, + new Keybind(KeyModifiers.LWin, VIRTUAL_KEY.VK_A) + }, { - { - new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_LSHIFT }, - VIRTUAL_KEY.VK_A, - new Keybind(KeyModifiers.LShift, VIRTUAL_KEY.VK_A) - }, - { - new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_RSHIFT }, - VIRTUAL_KEY.VK_A, - new Keybind(KeyModifiers.RShift, VIRTUAL_KEY.VK_A) - }, - { - new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_LMENU, VIRTUAL_KEY.VK_LCONTROL }, - VIRTUAL_KEY.VK_A, - new Keybind(KeyModifiers.LAlt | KeyModifiers.LControl, VIRTUAL_KEY.VK_A) - }, - { - new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_RMENU, VIRTUAL_KEY.VK_RCONTROL }, - VIRTUAL_KEY.VK_A, - new Keybind(KeyModifiers.RAlt | KeyModifiers.RControl, VIRTUAL_KEY.VK_A) - }, - { - new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_LWIN }, - VIRTUAL_KEY.VK_A, - new Keybind(KeyModifiers.LWin, VIRTUAL_KEY.VK_A) - }, - { - new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_RWIN }, - VIRTUAL_KEY.VK_A, - new Keybind(KeyModifiers.RWin, VIRTUAL_KEY.VK_A) - }, - }; + new VIRTUAL_KEY[] { VIRTUAL_KEY.VK_RWIN }, + VIRTUAL_KEY.VK_A, + new Keybind(KeyModifiers.RWin, VIRTUAL_KEY.VK_A) + }, + }; [MemberData(nameof(KeybindsToExecute))] [Theory] diff --git a/src/Whim.Tests/Layout/ColumnLayoutEngineTests.cs b/src/Whim.Tests/Layout/ColumnLayoutEngineTests.cs index 39a2cc557..827f0d00e 100644 --- a/src/Whim.Tests/Layout/ColumnLayoutEngineTests.cs +++ b/src/Whim.Tests/Layout/ColumnLayoutEngineTests.cs @@ -962,13 +962,12 @@ public void PerformCustomAction(IWindow window) { // Given ILayoutEngine engine = new ColumnLayoutEngine(identity).AddWindow(window); - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = Substitute.For(), - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = Substitute.For(), + }; // When ILayoutEngine newEngine = engine.PerformCustomAction(action); diff --git a/src/Whim.Tests/Location/RectangleTests.cs b/src/Whim.Tests/Location/RectangleTests.cs index 2a9501b2f..14297510f 100644 --- a/src/Whim.Tests/Location/RectangleTests.cs +++ b/src/Whim.Tests/Location/RectangleTests.cs @@ -60,14 +60,13 @@ public void IsPointInside_ReturnsTrue_WhenPointIsOnEdge() public void Add_ReturnsNewRectangle_WhenRectanglesAreAdded() { Rectangle rect1 = new() { Width = 10, Height = 10 }; - Rectangle rect2 = - new() - { - X = 5, - Y = 5, - Width = 5, - Height = 5, - }; + Rectangle rect2 = new() + { + X = 5, + Y = 5, + Width = 5, + Height = 5, + }; IRectangle rect3 = rect1.Add(rect2); Assert.StrictEqual( new Rectangle() @@ -86,14 +85,13 @@ public void GetHashCode_NotEqual() { // Given Rectangle rect1 = new() { Width = 10, Height = 10 }; - Rectangle rect2 = - new() - { - X = 5, - Y = 5, - Width = 5, - Height = 5, - }; + Rectangle rect2 = new() + { + X = 5, + Y = 5, + Width = 5, + Height = 5, + }; // When int hashCode1 = rect1.GetHashCode(); diff --git a/src/Whim.Tests/Monitor/MonitorsChangedEventArgsTests.cs b/src/Whim.Tests/Monitor/MonitorsChangedEventArgsTests.cs index 8ad3e4436..29266ff3d 100644 --- a/src/Whim.Tests/Monitor/MonitorsChangedEventArgsTests.cs +++ b/src/Whim.Tests/Monitor/MonitorsChangedEventArgsTests.cs @@ -6,13 +6,12 @@ public class MonitorsChangedEventArgsTests public void CurrentMonitors_ReturnsSameInstance() { // Given - MonitorsChangedEventArgs args = - new() - { - UnchangedMonitors = [], - RemovedMonitors = [], - AddedMonitors = [], - }; + MonitorsChangedEventArgs args = new() + { + UnchangedMonitors = [], + RemovedMonitors = [], + AddedMonitors = [], + }; // When IEnumerable currentMonitors1 = args.CurrentMonitors; @@ -31,13 +30,12 @@ IMonitor addedMonitor2 ) { // Given - MonitorsChangedEventArgs args = - new() - { - UnchangedMonitors = [unchangedMonitor1, unchangedMonitor2], - RemovedMonitors = [], - AddedMonitors = [addedMonitor1, addedMonitor2], - }; + MonitorsChangedEventArgs args = new() + { + UnchangedMonitors = [unchangedMonitor1, unchangedMonitor2], + RemovedMonitors = [], + AddedMonitors = [addedMonitor1, addedMonitor2], + }; // When IEnumerable currentMonitors = args.CurrentMonitors; @@ -63,13 +61,12 @@ IMonitor removedMonitor2 // Given - MonitorsChangedEventArgs args = - new() - { - UnchangedMonitors = [unchangedMonitor1, unchangedMonitor2], - RemovedMonitors = [removedMonitor1, removedMonitor2], - AddedMonitors = [], - }; + MonitorsChangedEventArgs args = new() + { + UnchangedMonitors = [unchangedMonitor1, unchangedMonitor2], + RemovedMonitors = [removedMonitor1, removedMonitor2], + AddedMonitors = [], + }; // When IEnumerable previousMonitors = args.PreviousMonitors; diff --git a/src/Whim.Tests/Native/DeferWindowPosHandleTests.cs b/src/Whim.Tests/Native/DeferWindowPosHandleTests.cs index 5b0a998c4..90b44af5b 100644 --- a/src/Whim.Tests/Native/DeferWindowPosHandleTests.cs +++ b/src/Whim.Tests/Native/DeferWindowPosHandleTests.cs @@ -123,14 +123,13 @@ internal void NoForceTwoPasses(IContext ctx, IInternalContext internalCtx, Mutab internal void SetMultipleWindows(IContext ctx, IInternalContext internalCtx, MutableRootSector root) { // Given - DeferWindowPosState state1 = - new( - (HWND)1, - WindowSize.Normal, - Rectangle.UnitSquare(), - (HWND)123, - SET_WINDOW_POS_FLAGS.SWP_NOSENDCHANGING - ); + DeferWindowPosState state1 = new( + (HWND)1, + WindowSize.Normal, + Rectangle.UnitSquare(), + (HWND)123, + SET_WINDOW_POS_FLAGS.SWP_NOSENDCHANGING + ); DeferWindowPosState state2 = new((HWND)2, WindowSize.Minimized, new Rectangle(1, 2, 3, 4), (HWND)234); DeferWindowPosState state3 = new((HWND)3, WindowSize.Maximized, new Rectangle(5, 6, 7, 8)); DeferWindowPosState state4 = new((HWND)4, WindowSize.Normal, new Rectangle(9, 10, 11, 12)); diff --git a/src/Whim.Tests/Native/MonitorInfoTests.cs b/src/Whim.Tests/Native/MonitorInfoTests.cs index 218d7217c..6b85c0bf6 100644 --- a/src/Whim.Tests/Native/MonitorInfoTests.cs +++ b/src/Whim.Tests/Native/MonitorInfoTests.cs @@ -19,8 +19,10 @@ public void GetDeviceName() public void IsPrimary() { // Given - MONITORINFOEXW monitor = - new() { monitorInfo = new MONITORINFO { dwFlags = (uint)MONITOR_FROM_FLAGS.MONITOR_DEFAULTTOPRIMARY } }; + MONITORINFOEXW monitor = new() + { + monitorInfo = new MONITORINFO { dwFlags = (uint)MONITOR_FROM_FLAGS.MONITOR_DEFAULTTOPRIMARY }, + }; // When bool result = monitor.IsPrimary(); diff --git a/src/Whim.Tests/Store/MonitorSector/MonitorEventListenerTests.cs b/src/Whim.Tests/Store/MonitorSector/MonitorEventListenerTests.cs index 0a279349e..03725ad65 100644 --- a/src/Whim.Tests/Store/MonitorSector/MonitorEventListenerTests.cs +++ b/src/Whim.Tests/Store/MonitorSector/MonitorEventListenerTests.cs @@ -6,17 +6,16 @@ namespace Whim.Tests; [SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope")] public class MonitorEventListenerTests { - private static readonly WindowMessageMonitorEventArgs _windowMessageArgs = - new() + private static readonly WindowMessageMonitorEventArgs _windowMessageArgs = new() + { + MessagePayload = new() { - MessagePayload = new() - { - HWnd = (HWND)1, - LParam = (LPARAM)1, - UMsg = 1, - WParam = (WPARAM)1, - }, - }; + HWnd = (HWND)1, + LParam = (LPARAM)1, + UMsg = 1, + WParam = (WPARAM)1, + }, + }; [Theory, AutoSubstituteData] [SuppressMessage("Usage", "NS5000:Received check.")] diff --git a/src/Whim.Tests/Store/WindowSector/WindowEventListenerTests.cs b/src/Whim.Tests/Store/WindowSector/WindowEventListenerTests.cs index 9905d7cb0..6798362a5 100644 --- a/src/Whim.Tests/Store/WindowSector/WindowEventListenerTests.cs +++ b/src/Whim.Tests/Store/WindowSector/WindowEventListenerTests.cs @@ -184,7 +184,7 @@ IInternalContext internalCtx // When we invoke the WinEventProc with the given params capture.WinEventProc!.Invoke( - (HWINEVENTHOOK)0, + new HWINEVENTHOOK(0), PInvoke.EVENT_OBJECT_SHOW, hwndValue == null ? HWND.Null : (HWND)hwndValue, idObject, @@ -212,7 +212,7 @@ internal void CreateWindow_Fail(IContext ctx, IInternalContext internalCtx) sut.Initialize(); // When we create a window - capture.WinEventProc!.Invoke((HWINEVENTHOOK)0, PInvoke.EVENT_OBJECT_SHOW, hwnd, 0, 0, 0, 0); + capture.WinEventProc!.Invoke(new HWINEVENTHOOK(0), PInvoke.EVENT_OBJECT_SHOW, hwnd, 0, 0, 0, 0); // Then we don't receive any further dispatches AssertDispatches(ctx, windowAddedTransformCount: 1); @@ -232,7 +232,7 @@ internal void CreateWindow_ShowWindow(IContext ctx, IInternalContext internalCtx sut.Initialize(); // When we create a window - capture.WinEventProc!.Invoke((HWINEVENTHOOK)0, PInvoke.EVENT_OBJECT_SHOW, hwnd, 0, 0, 0, 0); + capture.WinEventProc!.Invoke(new HWINEVENTHOOK(0), PInvoke.EVENT_OBJECT_SHOW, hwnd, 0, 0, 0, 0); // Then we don't receive any further dispatches AssertDispatches(ctx, windowAddedTransformCount: 1); @@ -317,7 +317,7 @@ IInternalContext internalCtx sut.Initialize(); // When we send through the event - capture.WinEventProc!.Invoke((HWINEVENTHOOK)0, ev, window.Handle, 0, 0, 0, 0); + capture.WinEventProc!.Invoke(new HWINEVENTHOOK(0), ev, window.Handle, 0, 0, 0, 0); // Then a transform was dispatched ctx.Store.Received(1).Dispatch(createTransform(window)); @@ -337,7 +337,7 @@ internal void WinEventProc_Ignore(IContext ctx, IInternalContext internalCtx, IW sut.Initialize(); // When we send through the event - capture.WinEventProc!.Invoke((HWINEVENTHOOK)0, PInvoke.EVENT_OBJECT_SHOW, window.Handle, 0, 0, 0, 0); + capture.WinEventProc!.Invoke(new HWINEVENTHOOK(0), PInvoke.EVENT_OBJECT_SHOW, window.Handle, 0, 0, 0, 0); // Then nothing happens AssertDispatches(ctx); @@ -354,7 +354,7 @@ internal void Default(IContext ctx, IInternalContext internalCtx) sut.Initialize(); // When we send through the event - capture.WinEventProc!.Invoke((HWINEVENTHOOK)0, 0xBAAAD, window.Handle, 0, 0, 0, 0); + capture.WinEventProc!.Invoke(new HWINEVENTHOOK(0), 0xBAAAD, window.Handle, 0, 0, 0, 0); // Then nothing happens AssertDispatches(ctx); @@ -373,7 +373,15 @@ internal void Throws(IContext ctx, IInternalContext internalCtx) ctx.Store.Dispatch(Arg.Any()).Throws(new WhimException("welp")); // When we send through the event - capture.WinEventProc!.Invoke((HWINEVENTHOOK)0, PInvoke.EVENT_SYSTEM_MINIMIZESTART, window.Handle, 0, 0, 0, 0); + capture.WinEventProc!.Invoke( + new HWINEVENTHOOK(0), + PInvoke.EVENT_SYSTEM_MINIMIZESTART, + window.Handle, + 0, + 0, + 0, + 0 + ); // Then nothing happens AssertDispatches(ctx, windowMinimizeStartedTransformCount: 1); diff --git a/src/Whim.Tests/Store/WorkspaceSector/Transforms/AddWorkspaceTransformTests.cs b/src/Whim.Tests/Store/WorkspaceSector/Transforms/AddWorkspaceTransformTests.cs index 318a256ce..fb095c837 100644 --- a/src/Whim.Tests/Store/WorkspaceSector/Transforms/AddWorkspaceTransformTests.cs +++ b/src/Whim.Tests/Store/WorkspaceSector/Transforms/AddWorkspaceTransformTests.cs @@ -61,15 +61,20 @@ private static void AssertWorkspaceToCreate( workspaceToCreate.MonitorIndices.Should().BeEquivalentTo(monitorIndices); } - private static readonly List createLeafLayoutEngines = - new() { (id) => Substitute.For() }; + private static readonly List createLeafLayoutEngines = new() + { + (id) => Substitute.For(), + }; [Theory, AutoSubstituteData] internal void NoName(IContext ctx, MutableRootSector root) { Guid id = Guid.NewGuid(); - AddWorkspaceTransform sut = - new(CreateLeafLayoutEngines: createLeafLayoutEngines, WorkspaceId: id, MonitorIndices: [1, 2]); + AddWorkspaceTransform sut = new( + CreateLeafLayoutEngines: createLeafLayoutEngines, + WorkspaceId: id, + MonitorIndices: [1, 2] + ); Result result = ctx.Store.Dispatch(sut); AssertWorkspaceToCreate(root, result, id, null, createLeafLayoutEngines, [1, 2]); } @@ -113,8 +118,12 @@ internal void WorkspaceId(IContext ctx, MutableRootSector root) internal void Everything(IContext ctx, MutableRootSector root) { Guid id = Guid.NewGuid(); - AddWorkspaceTransform sut = - new("Test", CreateLeafLayoutEngines: createLeafLayoutEngines, WorkspaceId: id, MonitorIndices: [1, 2]); + AddWorkspaceTransform sut = new( + "Test", + CreateLeafLayoutEngines: createLeafLayoutEngines, + WorkspaceId: id, + MonitorIndices: [1, 2] + ); Result result = ctx.Store.Dispatch(sut); AssertWorkspaceToCreate(root, result, id, "Test", createLeafLayoutEngines, [1, 2]); } @@ -122,10 +131,15 @@ internal void Everything(IContext ctx, MutableRootSector root) public class AddWorkspaceTransformTests_Initialized { - private static readonly List sectorCreateLeafLayoutEngines = - new() { (id) => Substitute.For() }; - private static readonly List transformCreateLeafLayoutEngines = - new() { (id) => Substitute.For(), (id) => Substitute.For() }; + private static readonly List sectorCreateLeafLayoutEngines = new() + { + (id) => Substitute.For(), + }; + private static readonly List transformCreateLeafLayoutEngines = new() + { + (id) => Substitute.For(), + (id) => Substitute.For(), + }; private static void Setup_WorkspaceSector(MutableRootSector root) { @@ -232,8 +246,10 @@ internal void NoMonitorIndices(IContext ctx, MutableRootSector root) internal void NoName(IContext ctx, MutableRootSector root) { Setup_WorkspaceSector(root); - AddWorkspaceTransform sut = - new(CreateLeafLayoutEngines: transformCreateLeafLayoutEngines, MonitorIndices: [1, 2]); + AddWorkspaceTransform sut = new( + CreateLeafLayoutEngines: transformCreateLeafLayoutEngines, + MonitorIndices: [1, 2] + ); AssertExecuteTransform(ctx, sut, root, null, "Workspace 1", transformCreateLeafLayoutEngines.Count, [1, 2]); } diff --git a/src/Whim.Tests/Store/WorkspaceSector/Transforms/LayoutEngineCustomActionTransformTests.cs b/src/Whim.Tests/Store/WorkspaceSector/Transforms/LayoutEngineCustomActionTransformTests.cs index a125f7633..c587b7f03 100644 --- a/src/Whim.Tests/Store/WorkspaceSector/Transforms/LayoutEngineCustomActionTransformTests.cs +++ b/src/Whim.Tests/Store/WorkspaceSector/Transforms/LayoutEngineCustomActionTransformTests.cs @@ -83,16 +83,15 @@ IWindow window [Theory, AutoSubstituteData] internal void PayloadAction_NoChanges(IContext ctx, MutableRootSector root, IWindow window) { - LayoutEngineCustomActionWithPayloadTransform sut = - new( - WorkspaceId, - new LayoutEngineCustomAction - { - Name = "Action", - Payload = window, - Window = window, - } - ); + LayoutEngineCustomActionWithPayloadTransform sut = new( + WorkspaceId, + new LayoutEngineCustomAction + { + Name = "Action", + Payload = window, + Window = window, + } + ); NoChanges(sut, ctx, root, window); } @@ -100,8 +99,10 @@ internal void PayloadAction_NoChanges(IContext ctx, MutableRootSector root, IWin [Theory, AutoSubstituteData] internal void NoPayload_NoChanges(IContext ctx, MutableRootSector root, IWindow window) { - LayoutEngineCustomActionTransform sut = - new(WorkspaceId, new LayoutEngineCustomAction { Name = "Action", Window = window }); + LayoutEngineCustomActionTransform sut = new( + WorkspaceId, + new LayoutEngineCustomAction { Name = "Action", Window = window } + ); NoChanges(sut, ctx, root, window); } @@ -109,16 +110,15 @@ internal void NoPayload_NoChanges(IContext ctx, MutableRootSector root, IWindow [Theory, AutoSubstituteData] internal void PayloadAction_Changes(IContext ctx, MutableRootSector root, IWindow window) { - LayoutEngineCustomActionWithPayloadTransform sut = - new( - WorkspaceId, - new LayoutEngineCustomAction - { - Name = "Action", - Payload = window, - Window = window, - } - ); + LayoutEngineCustomActionWithPayloadTransform sut = new( + WorkspaceId, + new LayoutEngineCustomAction + { + Name = "Action", + Payload = window, + Window = window, + } + ); Changes(sut, ctx, root, window); } @@ -126,8 +126,10 @@ internal void PayloadAction_Changes(IContext ctx, MutableRootSector root, IWindo [Theory, AutoSubstituteData] internal void NoPayload_Changes(IContext ctx, MutableRootSector root, IWindow window) { - LayoutEngineCustomActionTransform sut = - new(WorkspaceId, new LayoutEngineCustomAction { Name = "Action", Window = window }); + LayoutEngineCustomActionTransform sut = new( + WorkspaceId, + new LayoutEngineCustomAction { Name = "Action", Window = window } + ); Changes(sut, ctx, root, window); } diff --git a/src/Whim.Tests/Window/WindowStateTests.cs b/src/Whim.Tests/Window/WindowStateTests.cs index 859985357..fe3f96d87 100644 --- a/src/Whim.Tests/Window/WindowStateTests.cs +++ b/src/Whim.Tests/Window/WindowStateTests.cs @@ -6,13 +6,12 @@ public class WindowStateTests public void Equals_NotWindowState(IWindow window) { // Given - WindowState windowState = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window, - }; + WindowState windowState = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window, + }; // When bool result = windowState.Equals(new object()); @@ -25,20 +24,18 @@ public void Equals_NotWindowState(IWindow window) public void Equals_DifferentRect(IWindow window) { // Given - WindowState windowState1 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window, - }; - WindowState windowState2 = - new() - { - Rectangle = new Rectangle() { X = 1, Y = 1 }, - WindowSize = WindowSize.Normal, - Window = window, - }; + WindowState windowState1 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window, + }; + WindowState windowState2 = new() + { + Rectangle = new Rectangle() { X = 1, Y = 1 }, + WindowSize = WindowSize.Normal, + Window = window, + }; // When bool result = windowState1.Equals(windowState2); @@ -51,20 +48,18 @@ public void Equals_DifferentRect(IWindow window) public void Equals_DifferentWindowSize(IWindow window) { // Given - WindowState windowState1 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window, - }; - WindowState windowState2 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Maximized, - Window = window, - }; + WindowState windowState1 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window, + }; + WindowState windowState2 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Maximized, + Window = window, + }; // When bool result = windowState1.Equals(windowState2); @@ -77,20 +72,18 @@ public void Equals_DifferentWindowSize(IWindow window) public void Equals_DifferentWindow(IWindow window1, IWindow window2) { // Given - WindowState windowState1 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window1, - }; - WindowState windowState2 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window2, - }; + WindowState windowState1 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window1, + }; + WindowState windowState2 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window2, + }; // When bool result = windowState1.Equals(windowState2); @@ -103,20 +96,18 @@ public void Equals_DifferentWindow(IWindow window1, IWindow window2) public void Equals_Success(IWindow window) { // Given - WindowState windowState1 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window, - }; - WindowState windowState2 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window, - }; + WindowState windowState1 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window, + }; + WindowState windowState2 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window, + }; // When bool result = windowState1.Equals(windowState2); @@ -129,20 +120,18 @@ public void Equals_Success(IWindow window) public void Equals_Operator_Success(IWindow window) { // Given - WindowState windowState1 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window, - }; - WindowState windowState2 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window, - }; + WindowState windowState1 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window, + }; + WindowState windowState2 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window, + }; // When bool result = windowState1 == windowState2; @@ -155,20 +144,18 @@ public void Equals_Operator_Success(IWindow window) public void NotEquals_Operator_Success(IWindow window1, IWindow window2) { // Given - WindowState windowState1 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window1, - }; - WindowState windowState2 = - new() - { - Rectangle = new Rectangle(), - WindowSize = WindowSize.Normal, - Window = window2, - }; + WindowState windowState1 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window1, + }; + WindowState windowState2 = new() + { + Rectangle = new Rectangle(), + WindowSize = WindowSize.Normal, + Window = window2, + }; // When bool result = windowState1 != windowState2; diff --git a/src/Whim.Tests/Workspace/LegacyWorkspaceTests.cs b/src/Whim.Tests/Workspace/LegacyWorkspaceTests.cs index c622a60b4..469f7c92d 100644 --- a/src/Whim.Tests/Workspace/LegacyWorkspaceTests.cs +++ b/src/Whim.Tests/Workspace/LegacyWorkspaceTests.cs @@ -407,13 +407,12 @@ internal void PerformCustomLayoutEngineAction_Payload(bool isChanged, IContext c { // Given Workspace workspace = CreateWorkspace(ctx); - LayoutEngineCustomAction action = - new() - { - Name = "Test", - Window = window, - Payload = window, - }; + LayoutEngineCustomAction action = new() + { + Name = "Test", + Window = window, + Payload = window, + }; ctx.Store.Dispatch(new LayoutEngineCustomActionWithPayloadTransform(workspace.Id, action)) .Returns(isChanged); diff --git a/src/Whim.Tests/Workspace/MonitorWorkspaceChangedEventTests.cs b/src/Whim.Tests/Workspace/MonitorWorkspaceChangedEventTests.cs index d39b7e61a..bfd6558ff 100644 --- a/src/Whim.Tests/Workspace/MonitorWorkspaceChangedEventTests.cs +++ b/src/Whim.Tests/Workspace/MonitorWorkspaceChangedEventTests.cs @@ -44,20 +44,18 @@ public void Equals_DifferentPreviousWorkspace(IContext ctx, IMonitor monitor) IWorkspace workspace = StoreTestUtils.CreateWorkspace(ctx); IWorkspace aWorkspace = StoreTestUtils.CreateWorkspace(ctx); IWorkspace bWorkspace = StoreTestUtils.CreateWorkspace(ctx); - MonitorWorkspaceChangedEventArgs a = - new() - { - Monitor = monitor, - CurrentWorkspace = workspace, - PreviousWorkspace = aWorkspace, - }; - MonitorWorkspaceChangedEventArgs b = - new() - { - Monitor = monitor, - CurrentWorkspace = workspace, - PreviousWorkspace = bWorkspace, - }; + MonitorWorkspaceChangedEventArgs a = new() + { + Monitor = monitor, + CurrentWorkspace = workspace, + PreviousWorkspace = aWorkspace, + }; + MonitorWorkspaceChangedEventArgs b = new() + { + Monitor = monitor, + CurrentWorkspace = workspace, + PreviousWorkspace = bWorkspace, + }; // Then Assert.False(a.Equals(b)); @@ -70,20 +68,18 @@ public void Equals_DifferentCurrentWorkspace(IContext ctx, IMonitor monitor) IWorkspace aCurrentWorkspace = StoreTestUtils.CreateWorkspace(ctx); IWorkspace bCurrentWorkspace = StoreTestUtils.CreateWorkspace(ctx); IWorkspace previousWorkspace = StoreTestUtils.CreateWorkspace(ctx); - MonitorWorkspaceChangedEventArgs a = - new() - { - Monitor = monitor, - CurrentWorkspace = aCurrentWorkspace, - PreviousWorkspace = bCurrentWorkspace, - }; - MonitorWorkspaceChangedEventArgs b = - new() - { - Monitor = monitor, - CurrentWorkspace = aCurrentWorkspace, - PreviousWorkspace = previousWorkspace, - }; + MonitorWorkspaceChangedEventArgs a = new() + { + Monitor = monitor, + CurrentWorkspace = aCurrentWorkspace, + PreviousWorkspace = bCurrentWorkspace, + }; + MonitorWorkspaceChangedEventArgs b = new() + { + Monitor = monitor, + CurrentWorkspace = aCurrentWorkspace, + PreviousWorkspace = previousWorkspace, + }; // Then Assert.False(a.Equals(b)); @@ -93,20 +89,18 @@ public void Equals_DifferentCurrentWorkspace(IContext ctx, IMonitor monitor) public void Equals_Sucess(IMonitor monitor, IWorkspace currentWorkspace, IWorkspace previousWorkspace) { // Given - MonitorWorkspaceChangedEventArgs a = - new() - { - Monitor = monitor, - CurrentWorkspace = currentWorkspace, - PreviousWorkspace = previousWorkspace, - }; - MonitorWorkspaceChangedEventArgs b = - new() - { - Monitor = monitor, - CurrentWorkspace = currentWorkspace, - PreviousWorkspace = previousWorkspace, - }; + MonitorWorkspaceChangedEventArgs a = new() + { + Monitor = monitor, + CurrentWorkspace = currentWorkspace, + PreviousWorkspace = previousWorkspace, + }; + MonitorWorkspaceChangedEventArgs b = new() + { + Monitor = monitor, + CurrentWorkspace = currentWorkspace, + PreviousWorkspace = previousWorkspace, + }; // Then Assert.True(a.Equals(b)); @@ -116,13 +110,12 @@ public void Equals_Sucess(IMonitor monitor, IWorkspace currentWorkspace, IWorksp public void GetHashCode_Success(IMonitor monitor, IWorkspace currentWorkspace, IWorkspace previousWorkspace) { // Given - MonitorWorkspaceChangedEventArgs a = - new() - { - Monitor = monitor, - CurrentWorkspace = currentWorkspace, - PreviousWorkspace = previousWorkspace, - }; + MonitorWorkspaceChangedEventArgs a = new() + { + Monitor = monitor, + CurrentWorkspace = currentWorkspace, + PreviousWorkspace = previousWorkspace, + }; // Then Assert.Equal(HashCode.Combine(monitor, previousWorkspace, currentWorkspace), a.GetHashCode()); diff --git a/src/Whim.TreeLayout.CommandPalette.Tests/TreeLayoutCommandPaletteCommandsTests.cs b/src/Whim.TreeLayout.CommandPalette.Tests/TreeLayoutCommandPaletteCommandsTests.cs index ab942581c..069a4c5c0 100644 --- a/src/Whim.TreeLayout.CommandPalette.Tests/TreeLayoutCommandPaletteCommandsTests.cs +++ b/src/Whim.TreeLayout.CommandPalette.Tests/TreeLayoutCommandPaletteCommandsTests.cs @@ -21,8 +21,12 @@ public void Customize(IFixture fixture) ITreeLayoutPlugin treeLayoutPlugin = fixture.Freeze(); ICommandPalettePlugin commandPalettePlugin = fixture.Freeze(); - TreeLayoutCommandPalettePluginCommands commands = - new(ctx, treeLayoutCommandPalettePlugin, treeLayoutPlugin, commandPalettePlugin); + TreeLayoutCommandPalettePluginCommands commands = new( + ctx, + treeLayoutCommandPalettePlugin, + treeLayoutPlugin, + commandPalettePlugin + ); fixture.Inject(commands); } } diff --git a/src/Whim.TreeLayout.Tests/LayoutEngine/MoveWindowEdgesInDirectionTests.cs b/src/Whim.TreeLayout.Tests/LayoutEngine/MoveWindowEdgesInDirectionTests.cs index d2fdffc92..e0fa0ac59 100644 --- a/src/Whim.TreeLayout.Tests/LayoutEngine/MoveWindowEdgesInDirectionTests.cs +++ b/src/Whim.TreeLayout.Tests/LayoutEngine/MoveWindowEdgesInDirectionTests.cs @@ -1008,14 +1008,13 @@ IMonitor monitor // Given Assert.Equal(4, windows.Length); var (topLeft, bottomLeft, topRight, bottomRight) = (windows[0], windows[1], windows[2], windows[3]); - Dictionary windowsDict = - new() - { - { "topLeft", topLeft }, - { "topRight", topRight }, - { "bottomLeft", bottomLeft }, - { "bottomRight", bottomRight }, - }; + Dictionary windowsDict = new() + { + { "topLeft", topLeft }, + { "topRight", topRight }, + { "bottomLeft", bottomLeft }, + { "bottomRight", bottomRight }, + }; LayoutEngineWrapper wrapper = new(); diff --git a/src/Whim.TreeLayout.Tests/LayoutEngine/PerformCustomActionTests.cs b/src/Whim.TreeLayout.Tests/LayoutEngine/PerformCustomActionTests.cs index c172b7c97..fd49b215a 100644 --- a/src/Whim.TreeLayout.Tests/LayoutEngine/PerformCustomActionTests.cs +++ b/src/Whim.TreeLayout.Tests/LayoutEngine/PerformCustomActionTests.cs @@ -10,13 +10,12 @@ public void PerformCustomAction(IWindow window) { // Given LayoutEngineWrapper wrapper = new LayoutEngineWrapper().SetAsLastFocusedWindow(null); - LayoutEngineCustomAction action = - new() - { - Name = "Action", - Payload = "payload", - Window = window, - }; + LayoutEngineCustomAction action = new() + { + Name = "Action", + Payload = "payload", + Window = window, + }; ILayoutEngine engine = new TreeLayoutEngine(wrapper.Context, wrapper.Plugin, wrapper.Identity); // When diff --git a/src/Whim.TreeLayout.Tests/Tree/TreeHelpersTests.cs b/src/Whim.TreeLayout.Tests/Tree/TreeHelpersTests.cs index a662c16cf..98f008775 100644 --- a/src/Whim.TreeLayout.Tests/Tree/TreeHelpersTests.cs +++ b/src/Whim.TreeLayout.Tests/Tree/TreeHelpersTests.cs @@ -295,13 +295,12 @@ internal void GetNodeContainingPoint_InvalidNode(INode node) internal void GetNodeContainingPoint_DoesNotContainPointInChildNode() { // Given - SplitNode node = - new( - equalWeight: false, - isHorizontal: true, - [new WindowNode(Substitute.For()), new WindowNode(Substitute.For())], - [0.5, 0.25] - ); + SplitNode node = new( + equalWeight: false, + isHorizontal: true, + [new WindowNode(Substitute.For()), new WindowNode(Substitute.For())], + [0.5, 0.25] + ); Point point = new() { X = 0.8, Y = 0.4 }; diff --git a/src/Whim.TreeLayout/Tree/TreeHelpers.cs b/src/Whim.TreeLayout/Tree/TreeHelpers.cs index 47b2f8163..bc7054c6b 100644 --- a/src/Whim.TreeLayout/Tree/TreeHelpers.cs +++ b/src/Whim.TreeLayout/Tree/TreeHelpers.cs @@ -349,14 +349,13 @@ public static IEnumerable GetWindowRectangles(this INo double precedingWeight = 0; foreach ((double weight, INode child) in parent) { - Rectangle childRectangle = - new() - { - X = rectangle.X, - Y = rectangle.Y, - Width = rectangle.Width, - Height = rectangle.Height, - }; + Rectangle childRectangle = new() + { + X = rectangle.X, + Y = rectangle.Y, + Width = rectangle.Width, + Height = rectangle.Height, + }; if (parent.IsHorizontal) { diff --git a/src/Whim.Yaml/Whim.Yaml.csproj b/src/Whim.Yaml/Whim.Yaml.csproj index dfee11c6a..c7dbc6fa2 100644 --- a/src/Whim.Yaml/Whim.Yaml.csproj +++ b/src/Whim.Yaml/Whim.Yaml.csproj @@ -57,6 +57,10 @@ + + NullOrUndefined + + diff --git a/src/Whim.Yaml/YamlBarPluginLoader.cs b/src/Whim.Yaml/YamlBarPluginLoader.cs index c73edbba6..8d43ddb83 100644 --- a/src/Whim.Yaml/YamlBarPluginLoader.cs +++ b/src/Whim.Yaml/YamlBarPluginLoader.cs @@ -52,7 +52,7 @@ public static void LoadBarPlugin(IContext ctx, Schema.PluginsEntity plugins) ctx.PluginManager.AddPlugin(new BarPlugin(ctx, config)); } - private static List GetBarComponents(IContext ctx, Schema.SchemaRequiredEntries? componentsWrapper) + private static List GetBarComponents(IContext ctx, Schema.BarWidgetListEntity? componentsWrapper) { if (componentsWrapper is not { } components) { @@ -64,37 +64,37 @@ private static List GetBarComponents(IContext ctx, Schema.SchemaRe foreach (var entry in components.Entries) { entry.Match( - (in Schema.SchemaRequiredType4 widget) => + (in Schema.ActiveLayoutWidgetEntity widget) => { barComponents.Add(CreateActiveLayoutBarWidget(ctx, widget)); return null; }, - (in Schema.SchemaRequiredType5 widget) => + (in Schema.BatteryWidgetEntity widget) => { barComponents.Add(CreateBatteryBarWidget(ctx, widget)); return null; }, - (in Schema.SchemaRequiredType6 widget) => + (in Schema.DateTimeWidgetEntity widget) => { barComponents.Add(CreateDateTimeBarWidget(ctx, widget)); return null; }, - (in Schema.SchemaRequiredType7 widget) => + (in Schema.FocusedWindowWidgetEntity widget) => { barComponents.Add(CreateFocusedWindowBarWidget(ctx, widget)); return null; }, - (in Schema.SchemaRequiredType9 widget) => + (in Schema.WorkspaceWidgetEntity widget) => { barComponents.Add(CreateWorkspaceBarWidget(ctx, widget)); return null; }, - (in Schema.SchemaRequiredType8 widget) => + (in Schema.TreeLayoutEngineWidgetEntity widget) => { barComponents.Add(CreateTreeLayoutEngineBarWidget(ctx, widget)); return null; }, - (in Schema.SchemaRequiredType3 _) => + (in Schema.WidgetEntity _) => { return null; } @@ -104,17 +104,17 @@ private static List GetBarComponents(IContext ctx, Schema.SchemaRe return barComponents; } - private static BarComponent CreateActiveLayoutBarWidget(IContext ctx, Schema.SchemaRequiredType4 widget) + private static BarComponent CreateActiveLayoutBarWidget(IContext ctx, Schema.ActiveLayoutWidgetEntity widget) { return ActiveLayoutWidget.CreateComponent(); } - private static BarComponent CreateBatteryBarWidget(IContext ctx, Schema.SchemaRequiredType5 widget) + private static BarComponent CreateBatteryBarWidget(IContext ctx, Schema.BatteryWidgetEntity widget) { return BatteryWidget.CreateComponent(); } - private static BarComponent CreateDateTimeBarWidget(IContext ctx, Schema.SchemaRequiredType6 widget) + private static BarComponent CreateDateTimeBarWidget(IContext ctx, Schema.DateTimeWidgetEntity widget) { int interval = widget.Interval is { } i ? (int)i : 1000; string format = widget.Format is { } f ? (string)f : "yyyy-MM-dd HH:mm:ss"; @@ -122,7 +122,7 @@ private static BarComponent CreateDateTimeBarWidget(IContext ctx, Schema.SchemaR return DateTimeWidget.CreateComponent(interval, format); } - private static BarComponent CreateFocusedWindowBarWidget(IContext ctx, Schema.SchemaRequiredType7 widget) + private static BarComponent CreateFocusedWindowBarWidget(IContext ctx, Schema.FocusedWindowWidgetEntity widget) { bool shortenTitle = widget.ShortenTitle is { } st && st; Func getTitle = shortenTitle @@ -132,12 +132,15 @@ private static BarComponent CreateFocusedWindowBarWidget(IContext ctx, Schema.Sc return FocusedWindowWidget.CreateComponent(getTitle); } - private static BarComponent CreateWorkspaceBarWidget(IContext ctx, Schema.SchemaRequiredType9 widget) + private static BarComponent CreateWorkspaceBarWidget(IContext ctx, Schema.WorkspaceWidgetEntity widget) { return WorkspaceWidget.CreateComponent(); } - private static BarComponent CreateTreeLayoutEngineBarWidget(IContext ctx, Schema.SchemaRequiredType8 widget) + private static BarComponent CreateTreeLayoutEngineBarWidget( + IContext ctx, + Schema.TreeLayoutEngineWidgetEntity widget + ) { if ( ctx.PluginManager.LoadedPlugins.FirstOrDefault(p => p.Name == "whim.tree_layout") diff --git a/src/Whim.Yaml/YamlLayoutEngineLoader.cs b/src/Whim.Yaml/YamlLayoutEngineLoader.cs index a1545b77c..f0d03b768 100644 --- a/src/Whim.Yaml/YamlLayoutEngineLoader.cs +++ b/src/Whim.Yaml/YamlLayoutEngineLoader.cs @@ -24,7 +24,7 @@ public static void UpdateLayoutEngines(IContext ctx, Schema schema) public static CreateLeafLayoutEngine[]? GetCreateLeafLayoutEngines( IContext ctx, - Schema.RequiredEntries.RequiredTypeArray layoutEngines + Schema.LayoutEngineListEntity.EntriesArray layoutEngines ) { List leafLayoutEngineCreators = []; @@ -32,27 +32,27 @@ Schema.RequiredEntries.RequiredTypeArray layoutEngines foreach (var engine in layoutEngines) { engine.Match( - (in Schema.SchemaRequiredType floatingWindow) => + (in Schema.FloatingWindowEngineEntity floatingWindow) => { CreateFloatingLayoutEngineCreator(ctx, leafLayoutEngineCreators); return null; }, - (in Schema.SchemaRequiredType1 focusLayoutEngine) => + (in Schema.FocusLayoutEngineEntity focusLayoutEngine) => { CreateFocusLayoutEngineCreator(ctx, leafLayoutEngineCreators, focusLayoutEngine); return null; }, - (in Schema.RequiredTypeAndVariant sliceLayoutEngine) => + (in Schema.SliceLayoutEngineEntity sliceLayoutEngine) => { CreateSliceLayoutEngineCreator(ctx, leafLayoutEngineCreators, sliceLayoutEngine); return null; }, - (in Schema.SchemaRequiredType2 treeLayoutEngine) => + (in Schema.TreeLayoutEngineEntity treeLayoutEngine) => { CreateTreeLayoutEngineCreator(ctx, leafLayoutEngineCreators, treeLayoutEngine); return null; }, - (in Schema.RequiredType fallback) => null + (in Schema.LayoutEngineEntity fallback) => null ); } @@ -71,7 +71,7 @@ List leafLayoutEngineCreators private static void CreateFocusLayoutEngineCreator( IContext ctx, List leafLayoutEngineCreators, - Schema.SchemaRequiredType1 focusLayoutEngine + Schema.FocusLayoutEngineEntity focusLayoutEngine ) { bool maximize = focusLayoutEngine.Maximize is { } m && m; @@ -81,7 +81,7 @@ Schema.SchemaRequiredType1 focusLayoutEngine private static void CreateSliceLayoutEngineCreator( IContext ctx, List leafLayoutEngineCreators, - Schema.RequiredTypeAndVariant sliceLayoutEngine + Schema.SliceLayoutEngineEntity sliceLayoutEngine ) { if ( @@ -94,22 +94,22 @@ is not SliceLayoutPlugin plugin } sliceLayoutEngine.Variant.Match( - (in Schema.RequiredTypeAndVariant.VariantEntity.RequiredType _) => + (in Schema.SliceLayoutEngineEntity.VariantEntity.AnyOf0Entity _) => { leafLayoutEngineCreators.Add((id) => SliceLayouts.CreateColumnLayout(ctx, plugin, id)); return null; }, - (in Schema.RequiredTypeAndVariant.VariantEntity.VariantEntityRequiredType _) => + (in Schema.SliceLayoutEngineEntity.VariantEntity.AnyOf1Entity _) => { leafLayoutEngineCreators.Add((id) => SliceLayouts.CreateRowLayout(ctx, plugin, id)); return null; }, - (in Schema.RequiredTypeAndVariant.VariantEntity.VariantEntityRequiredType1 _) => + (in Schema.SliceLayoutEngineEntity.VariantEntity.AnyOf2Entity _) => { leafLayoutEngineCreators.Add((id) => SliceLayouts.CreatePrimaryStackLayout(ctx, plugin, id)); return null; }, - (in Schema.RequiredTypeAndVariant.VariantEntity.RequiredColumnsAndType multiColumnLayout) => + (in Schema.SliceLayoutEngineEntity.VariantEntity.AnyOf3Entity multiColumnLayout) => { var columns = multiColumnLayout.Columns; uint[] unsignedColumns = columns.Select(c => (uint)c).ToArray(); @@ -118,7 +118,7 @@ is not SliceLayoutPlugin plugin ); return null; }, - (in Schema.RequiredTypeAndVariant.VariantEntity.VariantEntityRequiredType2 secondaryPrimaryStack) => + (in Schema.SliceLayoutEngineEntity.VariantEntity.AnyOf4Entity secondaryPrimaryStack) => { uint primaryCapacity = secondaryPrimaryStack.PrimaryCapacity is { } pc ? (uint)pc : 1; uint secondaryCapacity = secondaryPrimaryStack.SecondaryCapacity is { } sc ? (uint)sc : 2; @@ -129,14 +129,14 @@ is not SliceLayoutPlugin plugin ); return null; }, - (in Schema.RequiredTypeAndVariant.VariantEntity _) => null + (in Schema.SliceLayoutEngineEntity.VariantEntity _) => null ); } private static void CreateTreeLayoutEngineCreator( IContext ctx, List leafLayoutEngineCreators, - Schema.SchemaRequiredType2 treeLayoutEngine + Schema.TreeLayoutEngineEntity treeLayoutEngine ) { if ( diff --git a/src/Whim/Native/NativeManager.cs b/src/Whim/Native/NativeManager.cs index dfb44538c..e17d67d0e 100644 --- a/src/Whim/Native/NativeManager.cs +++ b/src/Whim/Native/NativeManager.cs @@ -255,13 +255,12 @@ private static DispatcherQueueController InitializeCoreDispatcher() { // Ideally this would be replaced by the dispatcher from Microsoft.UI. // However, ICompositionSupportsSystemBackdrop.SystemBackdrop uses Windows.UI. - DispatcherQueueOptions options = - new() - { - apartmentType = DISPATCHERQUEUE_THREAD_APARTMENTTYPE.DQTAT_COM_STA, - threadType = DISPATCHERQUEUE_THREAD_TYPE.DQTYPE_THREAD_CURRENT, - dwSize = (uint)Marshal.SizeOf(typeof(DispatcherQueueOptions)), - }; + DispatcherQueueOptions options = new() + { + apartmentType = DISPATCHERQUEUE_THREAD_APARTMENTTYPE.DQTAT_COM_STA, + threadType = DISPATCHERQUEUE_THREAD_TYPE.DQTYPE_THREAD_CURRENT, + dwSize = (uint)Marshal.SizeOf(typeof(DispatcherQueueOptions)), + }; PInvoke.CreateDispatcherQueueController(options, out nint raw); diff --git a/src/Whim/Store/MonitorSector/Transforms/MonitorsChangedTransform.cs b/src/Whim/Store/MonitorSector/Transforms/MonitorsChangedTransform.cs index f51780685..546078867 100644 --- a/src/Whim/Store/MonitorSector/Transforms/MonitorsChangedTransform.cs +++ b/src/Whim/Store/MonitorSector/Transforms/MonitorsChangedTransform.cs @@ -52,13 +52,12 @@ MutableRootSector mutableRootSector } } - MonitorsChangedEventArgs args = - new() - { - UnchangedMonitors = unchangedMonitors, - RemovedMonitors = removedMonitors, - AddedMonitors = addedMonitors, - }; + MonitorsChangedEventArgs args = new() + { + UnchangedMonitors = unchangedMonitors, + RemovedMonitors = removedMonitors, + AddedMonitors = addedMonitors, + }; if (addedMonitors.Count != 0 || removedMonitors.Count != 0) { diff --git a/src/Whim/Store/WorkspaceSector/Transforms/AddWorkspaceTransform.cs b/src/Whim/Store/WorkspaceSector/Transforms/AddWorkspaceTransform.cs index bae78b814..2e1839f92 100644 --- a/src/Whim/Store/WorkspaceSector/Transforms/AddWorkspaceTransform.cs +++ b/src/Whim/Store/WorkspaceSector/Transforms/AddWorkspaceTransform.cs @@ -69,12 +69,11 @@ MutableRootSector mutableRootSector layoutEnginesBuilder.Add(currentEngine); } - Workspace workspace = - new(ctx, id) - { - BackingName = Name ?? $"Workspace {sector.Workspaces.Count + 1}", - LayoutEngines = layoutEnginesBuilder.ToImmutable(), - }; + Workspace workspace = new(ctx, id) + { + BackingName = Name ?? $"Workspace {sector.Workspaces.Count + 1}", + LayoutEngines = layoutEnginesBuilder.ToImmutable(), + }; sector.Workspaces = sector.Workspaces.Add(workspace.Id, workspace); sector.WorkspaceOrder = sector.WorkspaceOrder.Add(workspace.Id); sector.QueueEvent(new WorkspaceAddedEventArgs() { Workspace = workspace }); diff --git a/src/Whim/WindowMessage/WindowMessageMonitor.cs b/src/Whim/WindowMessage/WindowMessageMonitor.cs index a5c93df58..81fce0b58 100644 --- a/src/Whim/WindowMessage/WindowMessageMonitor.cs +++ b/src/Whim/WindowMessage/WindowMessageMonitor.cs @@ -66,17 +66,16 @@ nuint dwRefData private LRESULT WindowProc(HWND hWnd, uint uMsg, WPARAM wParam, LPARAM lParam, nuint uIdSubclass, nuint dwRefData) { - WindowMessageMonitorEventArgs eventArgs = - new() + WindowMessageMonitorEventArgs eventArgs = new() + { + MessagePayload = new() { - MessagePayload = new() - { - HWnd = hWnd, - UMsg = uMsg, - WParam = wParam, - LParam = lParam, - }, - }; + HWnd = hWnd, + UMsg = uMsg, + WParam = wParam, + LParam = lParam, + }, + }; switch (uMsg) {