diff --git a/QuickShell.Core.Tests/RunGlobalQueryTests.cs b/QuickShell.Core.Tests/RunGlobalQueryTests.cs index 7ae7e340..a161b698 100644 --- a/QuickShell.Core.Tests/RunGlobalQueryTests.cs +++ b/QuickShell.Core.Tests/RunGlobalQueryTests.cs @@ -27,7 +27,6 @@ public void TryActivate_PluginName_EntersBrowseMode(string query) Assert.True(RunGlobalQuery.TryActivate(query, rawQuery: null, out var remaining)); Assert.Equal(string.Empty, remaining); - } @@ -41,7 +40,6 @@ public void TryActivate_PluginNameWithFilter_StripsPrefix() Assert.True(RunGlobalQuery.TryActivate("quick shell api", rawQuery: null, out var remaining)); Assert.Equal("api", remaining); - } @@ -55,7 +53,6 @@ public void TryActivate_RawQueryFallback_ActivatesWhenSearchEmpty() Assert.True(RunGlobalQuery.TryActivate(string.Empty, "Quick Shell", out var remaining)); Assert.Equal(string.Empty, remaining); - } @@ -69,7 +66,6 @@ public void TryActivate_UnrelatedQuery_DoesNotActivate() Assert.False(RunGlobalQuery.TryActivate("my api project", rawQuery: null, out var remaining)); Assert.Equal("my api project", remaining); - } @@ -83,7 +79,6 @@ public void ShouldSuppressEmptyGlobalQuery_BlocksBareGlobalSearch() var context = new QueryActivationContext(HasActionKeyword: false, Search: string.Empty); Assert.True(RunGlobalQuery.ShouldSuppressEmptyGlobalQuery(context)); - } @@ -97,9 +92,7 @@ public void ShouldSuppressEmptyGlobalQuery_AllowsActionKeywordBrowse() var context = new QueryActivationContext(HasActionKeyword: true, Search: string.Empty); Assert.False(RunGlobalQuery.ShouldSuppressEmptyGlobalQuery(context)); - } - } diff --git a/QuickShell.Core.Tests/TestQuickShellServicesFactory.cs b/QuickShell.Core.Tests/TestQuickShellServicesFactory.cs index d9dcf9e0..63fe4299 100644 --- a/QuickShell.Core.Tests/TestQuickShellServicesFactory.cs +++ b/QuickShell.Core.Tests/TestQuickShellServicesFactory.cs @@ -187,5 +187,4 @@ private static (AppDataPaths appDataPaths, TerminalLaunchGlyphs glyphs, Terminal var prewarm = new TerminalCatalogPrewarm(bundle.Catalog); return (appDataPaths, glyphs, listIcons, prewarm); } - } diff --git a/QuickShell.Core/Models/TerminalShortcut.cs b/QuickShell.Core/Models/TerminalShortcut.cs index 3539314e..3946a737 100644 --- a/QuickShell.Core/Models/TerminalShortcut.cs +++ b/QuickShell.Core/Models/TerminalShortcut.cs @@ -103,7 +103,6 @@ internal sealed class TerminalShortcut /// for the workspace directory. Mirrored from the first entry. /// public string? CompanionAppArguments { get; set; } - } diff --git a/QuickShell.Core/Models/WorkspaceSecurityMetadata.cs b/QuickShell.Core/Models/WorkspaceSecurityMetadata.cs index 4aa06635..7f6dc3de 100644 --- a/QuickShell.Core/Models/WorkspaceSecurityMetadata.cs +++ b/QuickShell.Core/Models/WorkspaceSecurityMetadata.cs @@ -10,7 +10,6 @@ internal sealed record WorkspaceSecurityMetadata public bool IsTrusted { get; init; } = true; public long Revision { get; init; } = 1; - } internal sealed record StoredWorkspace( diff --git a/QuickShell.Core/Services/ShortcutLaunchFormJson.cs b/QuickShell.Core/Services/ShortcutLaunchFormJson.cs index e1596f14..243ecb09 100644 --- a/QuickShell.Core/Services/ShortcutLaunchFormJson.cs +++ b/QuickShell.Core/Services/ShortcutLaunchFormJson.cs @@ -37,7 +37,6 @@ public sealed class LaunchRowDraft public bool IsEnabled { get; set; } = true; - } @@ -122,7 +121,6 @@ public static string BuildCommandRowsJson( blocks.Add("""{ "type": "Container", "spacing": "Medium", "items": [] }"""); return string.Join(',', blocks); - } @@ -166,7 +164,6 @@ public static string BuildLaunchRowsJson(IReadOnlyList launches, { return string.Empty; - } @@ -518,13 +515,11 @@ public static string BuildLaunchRowsJson(IReadOnlyList launches, } """); - } return string.Join(',', blocks); - } @@ -538,5 +533,4 @@ public static string WrapLaunchRowsForTest(string launchRows) => private static string Escape(string? value) => (value ?? string.Empty).Replace("\\", "\\\\").Replace("\"", "\\\""); - } diff --git a/QuickShell.Core/Services/TerminalHostIds.cs b/QuickShell.Core/Services/TerminalHostIds.cs index 1859a3d2..8d79d623 100644 --- a/QuickShell.Core/Services/TerminalHostIds.cs +++ b/QuickShell.Core/Services/TerminalHostIds.cs @@ -16,11 +16,9 @@ public static string ResolveEffectiveApplication(string terminalApplicationId) { if (terminalApplicationId.Equals(LetWindowsChoose, StringComparison.OrdinalIgnoreCase)) { - return WindowsDefaultTerminalReader.ReadApplicationId(); - } + return WindowsDefaultTerminalReader.ReadApplicationId(); } - return terminalApplicationId; - } + return terminalApplicationId; } public static bool UsesWindowsTerminalProfiles(string terminalApplicationId) => !ResolveEffectiveApplication(terminalApplicationId) @@ -40,31 +38,25 @@ public static string HostExecutable(string terminalApplicationId) var effective = ResolveEffectiveApplication(terminalApplicationId); return effective.Equals(IntelligentTerminal, StringComparison.OrdinalIgnoreCase) ? "wtai.exe" - : "wt.exe"; - } + : "wt.exe"; } public static string ProfileIdPrefix(string terminalApplicationId) { var effective = ResolveEffectiveApplication(terminalApplicationId); return effective.Equals(IntelligentTerminal, StringComparison.OrdinalIgnoreCase) ? IntelligentTerminal - : WindowsTerminal; - } + : WindowsTerminal; } public static string SourceLabel(string terminalApplicationId) { if (terminalApplicationId.Equals(LetWindowsChoose, StringComparison.OrdinalIgnoreCase)) { - return "Let Windows choose"; - } + return "Let Windows choose"; } if (terminalApplicationId.Equals(WindowsConsoleHost, StringComparison.OrdinalIgnoreCase)) { - return "Windows Console Host"; - } + return "Windows Console Host"; } return ResolveEffectiveApplication(terminalApplicationId).Equals(IntelligentTerminal, StringComparison.OrdinalIgnoreCase) ? "Intelligent Terminal" - : "Windows Terminal"; - } -} + : "Windows Terminal"; } } diff --git a/QuickShell.Run/QuickShellRunSettingsWindow.cs b/QuickShell.Run/QuickShellRunSettingsWindow.cs index 4455a447..74c78b56 100644 --- a/QuickShell.Run/QuickShellRunSettingsWindow.cs +++ b/QuickShell.Run/QuickShellRunSettingsWindow.cs @@ -101,7 +101,6 @@ public QuickShellRunSettingsWindow( SelectedValuePath = "Id", Margin = new Thickness(0, 0, 0, 8), - }; root.Children.Add(_defaultProfileBox); @@ -117,7 +116,6 @@ public QuickShellRunSettingsWindow( Content = "Block launch when dirty and branch would change", Margin = new Thickness(0, 0, 0, 8), - }; root.Children.Add(_blockDirtyBranchBox); @@ -137,7 +135,6 @@ public QuickShellRunSettingsWindow( Content = "Show recent workspaces", Margin = new Thickness(0, 0, 0, 8), - }; root.Children.Add(_showRecentsBox); @@ -153,7 +150,6 @@ public QuickShellRunSettingsWindow( Content = "Open multiple commands in one Windows Terminal window", Margin = new Thickness(0, 0, 0, 8), - }; root.Children.Add(_singleWindowTabsBox); @@ -223,7 +219,6 @@ public QuickShellRunSettingsWindow( Margin = new Thickness(0, 12, 0, 12), Foreground = System.Windows.Media.Brushes.Gray, - }; root.Children.Add(_statusText); @@ -269,7 +264,6 @@ public QuickShellRunSettingsWindow( LoadCurrentValues(); _baseline = CaptureSnapshot(); - } @@ -289,7 +283,6 @@ private void LoadCurrentValues() _showRecentsBox.IsChecked = QuickShellRecentSettings.IsEnabled(_settings.ReadRecentWorkspaceCount()); _singleWindowTabsBox.IsChecked = !_settings.ReadSeparateWindowsForMultiLaunch(); - } @@ -305,7 +298,6 @@ private void RestoreBaseline() _settings.SaveRecentWorkspaceCount(_baseline.RecentCount); _settings.SaveMultiLaunchPresentation(_baseline.SingleWindowTabs); - } @@ -341,7 +333,6 @@ private void ReloadProfileChoices() { _defaultProfileBox.Items.Add(new { choice.Id, choice.Label }); - } @@ -353,7 +344,6 @@ private void ReloadProfileChoices() ? selected : TerminalHostIds.DefaultProfile; - } @@ -389,7 +379,6 @@ private bool Save() _baseline = CaptureSnapshot(); return true; - } @@ -403,9 +392,7 @@ private void ExportShortcuts() { SetStatus(message); - } - } @@ -421,9 +408,7 @@ private void ImportShortcuts(bool replace) { SetStatus(message); - } - } @@ -441,7 +426,6 @@ private void ImportShortcuts(bool replace) FontWeight = FontWeights.SemiBold, Margin = new Thickness(0, 12, 0, 8), - }; @@ -453,7 +437,6 @@ private void ImportShortcuts(bool replace) Text = text, Margin = new Thickness(0, 0, 0, 4), - }; @@ -471,7 +454,6 @@ private void ImportShortcuts(bool replace) Foreground = System.Windows.Media.Brushes.Gray, FontSize = 12, - }; @@ -489,7 +471,6 @@ private static ComboBox Combo(IReadOnlyList<(string Id, string Label)> choices) SelectedValuePath = "Id", Margin = new Thickness(0, 0, 0, 8), - }; foreach (var choice in choices) @@ -497,13 +478,11 @@ private static ComboBox Combo(IReadOnlyList<(string Id, string Label)> choices) { box.Items.Add(new { choice.Id, choice.Label }); - } return box; - } @@ -525,13 +504,11 @@ private static Button TooltipButton(string text, string tooltip, Action action) MinWidth = 220, ToolTip = tooltip, - }; button.Click += (_, _) => action(); return button; - } @@ -547,7 +524,6 @@ private readonly record struct SettingsSnapshot( int RecentCount, bool SingleWindowTabs); - } @@ -571,7 +547,6 @@ void ShowWindow() var window = new QuickShellRunSettingsWindow(settings, shortcuts, projectAnalysis, catalog); window.ShowDialog(); - } @@ -583,7 +558,6 @@ void ShowWindow() { ShowWindow(); - } else @@ -591,11 +565,8 @@ void ShowWindow() { app?.Dispatcher.Invoke(ShowWindow); - } - } - } diff --git a/QuickShell/Services/SectionListItems.cs b/QuickShell/Services/SectionListItems.cs index 2ba19ce2..b673dd1b 100644 --- a/QuickShell/Services/SectionListItems.cs +++ b/QuickShell/Services/SectionListItems.cs @@ -15,26 +15,20 @@ public static IEnumerable InSection(string sectionTitle, IEnumerable< var materialized = items.ToList(); if (materialized.Count == 0) { - return materialized; - } + return materialized; } if (string.IsNullOrWhiteSpace(sectionTitle)) { - return materialized; - } + return materialized; } - return PrependHeader(sectionTitle, materialized); - } + return PrependHeader(sectionTitle, materialized); } public static IEnumerable PrependHeader(string sectionTitle, IReadOnlyList items) { yield return CreateHeader(sectionTitle); foreach (var item in items) { - yield return item; - } - } + yield return item; } } - public static Separator CreateHeader(string sectionTitle) => new(sectionTitle); -} + public static Separator CreateHeader(string sectionTitle) => new(sectionTitle); } \ No newline at end of file