Fix crash when searching for ^$ regular expression

columbusux · Mar 15, 2023 · 5ed1b5f · 5ed1b5f
1 parent 4f1314b
commit 5ed1b5f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Maccy/HistoryMenuItem.swift b/Maccy/HistoryMenuItem.swift
@@ -126,7 +126,9 @@ class HistoryMenuItem: NSMenuItem {
       let rangeLength = range.upperBound - range.lowerBound + 1
       let highlightRange = NSRange(location: range.lowerBound, length: rangeLength)
 
-      attributedTitle.addAttribute(.font, value: highlightFont, range: highlightRange)
+      if Range(highlightRange, in: title) != nil {
+        attributedTitle.addAttribute(.font, value: highlightFont, range: highlightRange)
+      }
     }
 
     self.attributedTitle = attributedTitle

diff --git a/Maccy/Preview/Preview.swift b/Maccy/Preview/Preview.swift
@@ -49,7 +49,7 @@ class Preview: NSViewController {
       applicationValueLabel.removeFromSuperview()
     }
 
-    if textView.stringValue.count > maxTextSize  {
+    if textView.stringValue.count > maxTextSize {
       textView.stringValue = textView.stringValue.shortened(to: maxTextSize)
     }
 

diff --git a/MaccyTests/HistoryMenuItemTests.swift b/MaccyTests/HistoryMenuItemTests.swift
@@ -130,6 +130,12 @@ class HistoryMenuItemTests: XCTestCase {
     XCTAssertEqual(menuItem.attributedTitle, nil)
   }
 
+  func testHighlightInvalidRange() {
+    let menuItem = historyMenuItem("")
+    menuItem.highlight([0...0])
+    XCTAssertEqual(menuItem.attributedTitle?.string, "")
+  }
+
   private func historyMenuItem(_ value: String?, application: String? = "com.apple.finder") -> HistoryMenuItem {
     let content = HistoryItemContent(type: NSPasteboard.PasteboardType.string.rawValue,
                                      value: value?.data(using: .utf8))