optimisations

Author: BRUNER Patrick

src/LogExpert.Core/Classes/Bookmark/BookmarkDataProvider.cs

@@ -107,14 +107,9 @@ public void RemoveAutoGeneratedBookmarks ()
 
         lock (_bookmarkListLock)
         {
-            List<int> keysToRemove = [];
-            foreach (var kvp in BookmarkList)
-            {
-                if (kvp.Value.IsAutoGenerated)
-                {
-                    keysToRemove.Add(kvp.Key);
-                }
-            }
+            List<int> keysToRemove = [.. BookmarkList
+                 .Where(kvp => kvp.Value.IsAutoGenerated)
+                 .Select(kvp => kvp.Key)];
 
             foreach (var key in keysToRemove)
             {

src/LogExpert.Core/Classes/Bookmark/HighlightBookmarkScanner.cs

@@ -1,3 +1,5 @@
+using System.Text;
+
 using ColumnizerLib;
 
 using LogExpert.Core.Classes.Highlight;
@@ -79,26 +81,21 @@ public static class HighlightBookmarkScanner
     private static (bool SetBookmark, string BookmarkComment, string SourceHighlightText) GetBookmarkAction (ITextValueMemory line, List<HighlightEntry> bookmarkEntries)
     {
         var setBookmark = false;
-        var bookmarkComment = string.Empty;
+        var bookmarkCommentBuilder = new StringBuilder();
         var sourceHighlightText = string.Empty;
 
-        foreach (var entry in bookmarkEntries)
+        foreach (var entry in bookmarkEntries.Where(entry => CheckHighlightEntryMatch(entry, line)))
         {
-            if (CheckHighlightEntryMatch(entry, line))
-            {
-                setBookmark = true;
-                sourceHighlightText = entry.SearchText;
+            setBookmark = true;
+            sourceHighlightText = entry.SearchText;
 
-                if (!string.IsNullOrEmpty(entry.BookmarkComment))
-                {
-                    bookmarkComment += entry.BookmarkComment + "\r\n";
-                }
+            if (!string.IsNullOrEmpty(entry.BookmarkComment))
+            {
+                _ = bookmarkCommentBuilder.Append(entry.BookmarkComment).Append("\r\n");
             }
         }
 
-        bookmarkComment = bookmarkComment.TrimEnd('\r', '\n');
-
-        return (setBookmark, bookmarkComment, sourceHighlightText);
+        return (setBookmark, bookmarkCommentBuilder.ToString().TrimEnd('\r', '\n'), sourceHighlightText);
     }
 
     /// <summary>

src/LogExpert.Tests/Bookmark/HighlightBookmarkScannerTests.cs

@@ -213,7 +213,8 @@ public void Scan_CancellationRequested_ThrowsOperationCanceled ()
         {
             new() { SearchText = "ERROR", IsSetBookmark = true }
         };
-        var cts = new CancellationTokenSource();
+
+        using var cts = new CancellationTokenSource();
         cts.Cancel();
 
         // Act & Assert

src/LogExpert.UI/Controls/BufferedDataGridView.cs

@@ -170,7 +170,7 @@ protected override void OnPaint (PaintEventArgs e)
             {
                 base.OnPaint(e);
             }
-            catch (Exception innerEx)
+            catch (InvalidOperationException innerEx)
             {
                 _logger.Error($"Base paint also failed. {innerEx}");
             }

src/LogExpert.UI/Controls/LogWindow/LogWindow.cs

@@ -7155,47 +7155,48 @@ private void RunHighlightBookmarkScan ()
 
     private void ExecuteHighlightBookmarkScan (int lineCount, List<HighlightEntry> entries, string fileName, IProgress<int> progress, CancellationTokenSource cts)
     {
-        try
+        using (cts)
         {
-            var bookmarks = HighlightBookmarkScanner.Scan(lineCount, _logFileReader.GetLogLineMemory, entries, fileName, PROGRESS_BAR_MODULO, progress, cts.Token);
-
-            // Marshal bookmark additions to UI thread
-            if (!cts.Token.IsCancellationRequested && IsHandleCreated && !IsDisposed)
+            try
             {
-                _ = BeginInvoke(() =>
+                var bookmarks = HighlightBookmarkScanner.Scan(lineCount, _logFileReader.GetLogLineMemory, entries, fileName, PROGRESS_BAR_MODULO, progress, cts.Token);
+
+                // Marshal bookmark additions to UI thread
+                if (!cts.Token.IsCancellationRequested && IsHandleCreated && !IsDisposed)
                 {
-                    _ = _bookmarkProvider.AddBookmarks(bookmarks);
+                    _ = BeginInvoke(() =>
+                    {
+                        _ = _bookmarkProvider.AddBookmarks(bookmarks);
 
-                    RefreshAllGrids();
+                        RefreshAllGrids();
 
-                    _progressEventArgs.Visible = false;
-                    SendProgressBarUpdate();
-                    StatusLineText(string.Empty);
-                });
+                        _progressEventArgs.Visible = false;
+                        SendProgressBarUpdate();
+                        StatusLineText(string.Empty);
+                    });
+                }
             }
-        }
-        catch (OperationCanceledException)
-        {
-            // Scan was cancelled — clean up on UI thread
-            if (IsHandleCreated && !IsDisposed)
+            catch (OperationCanceledException)
             {
-                _ = BeginInvoke(() =>
+                // Scan was cancelled — clean up on UI thread
+                if (IsHandleCreated && !IsDisposed)
                 {
-                    _progressEventArgs.Visible = false;
-                    SendProgressBarUpdate();
-                    StatusLineText(string.Empty);
-                });
+                    _ = BeginInvoke(() =>
+                    {
+                        _progressEventArgs.Visible = false;
+                        SendProgressBarUpdate();
+                        StatusLineText(string.Empty);
+                    });
+                }
             }
-        }
-        finally
-        {
-            // Only dispose if this is still the active CTS
-            if (_highlightBookmarkScanCts == cts)
+            finally
             {
-                _highlightBookmarkScanCts = null;
+                // Only dispose if this is still the active CTS
+                if (_highlightBookmarkScanCts == cts)
+                {
+                    _highlightBookmarkScanCts = null;
+                }
             }
-
-            cts.Dispose();
         }
     }