From 0cfeddbc970a2429e2e8a9933907cb8ce98ccd92 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Mon, 29 Jun 2026 23:31:37 +0200 Subject: [PATCH] Clean up bookmark nits: HandleExceptions, dead method, asset typo - Route the bookmarks pane's double-click and next/previous navigation through HandleExceptions() rather than discarding the Task with `_ =`, so an exception raised during navigation reaches the global handler instead of vanishing. - Drop the unused parameterless NextDefaultName() overload. - Rename the misspelled Boomark.Disable.svg asset (and its loader string) to Bookmark.Disable.svg. Assisted-by: Claude:claude-opus-4-8:Claude Code --- .../Icons/{Boomark.Disable.svg => Bookmark.Disable.svg} | 0 ILSpy/Bookmarks/BookmarkManager.cs | 2 -- ILSpy/Bookmarks/BookmarksPane.axaml.cs | 2 +- ILSpy/Bookmarks/BookmarksPaneModel.cs | 2 +- ILSpy/Images.cs | 5 ++--- 5 files changed, 4 insertions(+), 7 deletions(-) rename ILSpy/Assets/Icons/{Boomark.Disable.svg => Bookmark.Disable.svg} (100%) diff --git a/ILSpy/Assets/Icons/Boomark.Disable.svg b/ILSpy/Assets/Icons/Bookmark.Disable.svg similarity index 100% rename from ILSpy/Assets/Icons/Boomark.Disable.svg rename to ILSpy/Assets/Icons/Bookmark.Disable.svg diff --git a/ILSpy/Bookmarks/BookmarkManager.cs b/ILSpy/Bookmarks/BookmarkManager.cs index 296aab628..aff5d7558 100644 --- a/ILSpy/Bookmarks/BookmarkManager.cs +++ b/ILSpy/Bookmarks/BookmarkManager.cs @@ -204,8 +204,6 @@ namespace ICSharpCode.ILSpy.Bookmarks } } - string NextDefaultName() => NextDefaultName(Bookmarks); - static string NextDefaultName(IEnumerable bookmarks) { // Pick the lowest unused "Bookmark{n}" so names stay stable and unsurprising. diff --git a/ILSpy/Bookmarks/BookmarksPane.axaml.cs b/ILSpy/Bookmarks/BookmarksPane.axaml.cs index 1503a5af7..4e7220f01 100644 --- a/ILSpy/Bookmarks/BookmarksPane.axaml.cs +++ b/ILSpy/Bookmarks/BookmarksPane.axaml.cs @@ -35,7 +35,7 @@ namespace ICSharpCode.ILSpy.Bookmarks { if (DataContext is BookmarksPaneModel model && BookmarkGrid.SelectedItem is Bookmark bookmark) { - _ = model.ActivateAsync(bookmark); + model.ActivateAsync(bookmark).HandleExceptions(); e.Handled = true; } } diff --git a/ILSpy/Bookmarks/BookmarksPaneModel.cs b/ILSpy/Bookmarks/BookmarksPaneModel.cs index 53d15c80a..c226910ae 100644 --- a/ILSpy/Bookmarks/BookmarksPaneModel.cs +++ b/ILSpy/Bookmarks/BookmarksPaneModel.cs @@ -133,7 +133,7 @@ namespace ICSharpCode.ILSpy.Bookmarks { int index = SelectedBookmark != null ? Bookmarks.IndexOf(SelectedBookmark) : -1; if (NextEnabledIndex(Bookmarks.Select(b => b.Enabled).ToList(), index, delta) is { } next) - _ = ActivateAsync(Bookmarks[next]); + ActivateAsync(Bookmarks[next]).HandleExceptions(); } /// diff --git a/ILSpy/Images.cs b/ILSpy/Images.cs index e0bedebb4..b3508dc68 100644 --- a/ILSpy/Images.cs +++ b/ILSpy/Images.cs @@ -86,10 +86,9 @@ namespace ICSharpCode.ILSpy public static readonly IImage ShowPrivateInternal = LoadSvg(nameof(ShowPrivateInternal)); public static readonly IImage ShowAll = LoadSvg(nameof(ShowAll)); - // Bookmarks (file names carry dots, so they can't use nameof; "Boomark.Disable" is the - // asset's actual -- misspelled -- file name). + // Bookmarks (file names carry dots, so the dotted variants can't use nameof). public static readonly IImage Bookmark = LoadSvg(nameof(Bookmark)); - public static readonly IImage BookmarkDisable = LoadSvg("Boomark.Disable"); + public static readonly IImage BookmarkDisable = LoadSvg("Bookmark.Disable"); public static readonly IImage BookmarkNext = LoadSvg("Bookmark.Next"); public static readonly IImage BookmarkPrevious = LoadSvg("Bookmark.Previous"); public static readonly IImage BookmarkNextInFile = LoadSvg("Bookmark.Next.File");