Merge branch 'main' into feat/find-replace

Author: thecoolwinter

.github/workflows/swiftlint.yml

@@ -8,4 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: GitHub Action for SwiftLint with --strict
-        run: swiftlint --strict
+        run: swiftlint --reporter github-actions-logging --strict

Sources/CodeEditSourceEditor/Controller/TextViewController+Highlighter.swift

@@ -17,6 +17,7 @@ extension TextViewController {
 
         let highlighter = Highlighter(
             textView: textView,
+            minimapView: minimapView,
             providers: highlightProviders,
             attributeProvider: self,
             language: language

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -23,10 +23,7 @@ extension TextViewController {
             delegate: self
         )
         gutterView.updateWidthIfNeeded()
-        scrollView.addFloatingSubview(
-            gutterView,
-            for: .horizontal
-        )
+        scrollView.addFloatingSubview(gutterView, for: .horizontal)
 
         minimapView = MinimapView(textView: textView, theme: theme)
         scrollView.addFloatingSubview(minimapView, for: .vertical)
@@ -89,7 +86,7 @@ extension TextViewController {
             minimapView.bottomAnchor.constraint(equalTo: scrollView.contentView.bottomAnchor),
             minimapXConstraint,
             maxWidthConstraint,
-            relativeWidthConstraint,
+            relativeWidthConstraint
         ])
     }
 
@@ -124,7 +121,11 @@ extension TextViewController {
             queue: .main
         ) { [weak self] _ in
             self?.gutterView.frame.size.height = (self?.textView.frame.height ?? 0) + 10
+            self?.gutterView.frame.origin.y = (self?.textView.frame.origin.y ?? 0.0)
+            - (self?.scrollView.contentInsets.top ?? 0)
+
             self?.gutterView.needsDisplay = true
+            self?.scrollView.needsLayout = true
         }
 
         NotificationCenter.default.addObserver(
@@ -146,7 +147,7 @@ extension TextViewController {
 
                     // Reset content insets and gutter position when appearance changes
                     self.styleScrollView()
-                    self.gutterView.frame.origin.y = -self.scrollView.contentInsets.top
+                    self.gutterView.frame.origin.y = self.textView.frame.origin.y - self.scrollView.contentInsets.top
                 }
             }
             .store(in: &cancellables)

Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift

@@ -106,7 +106,7 @@ extension TextViewController {
 
         findViewController?.topPadding = contentInsets?.top
 
-        gutterView.frame.origin.y = -scrollView.contentInsets.top
+        gutterView.frame.origin.y = textView.frame.origin.y - scrollView.contentInsets.top
 
         // Update scrollview tiling
         scrollView.reflectScrolledClipView(scrollView.contentView)

Sources/CodeEditSourceEditor/Gutter/GutterView.swift

@@ -45,7 +45,11 @@ public class GutterView: NSView {
     var textColor: NSColor = .secondaryLabelColor
 
     @Invalidating(.display)
-    var font: NSFont = .systemFont(ofSize: 13)
+    var font: NSFont = .systemFont(ofSize: 13) {
+        didSet {
+            updateFontLineHeight()
+        }
+    }
 
     @Invalidating(.display)
     var edgeInsets: EdgeInsets = EdgeInsets(leading: 20, trailing: 12)
@@ -74,6 +78,19 @@ public class GutterView: NSView {
     /// The maximum number of digits found for a line number.
     private var maxLineLength: Int = 0
 
+    private var fontLineHeight = 1.0
+
+    private func updateFontLineHeight() {
+        let string = NSAttributedString(string: "0", attributes: [.font: font])
+        let typesetter = CTTypesetterCreateWithAttributedString(string)
+        let ctLine = CTTypesetterCreateLine(typesetter, CFRangeMake(0, 1))
+        var ascent: CGFloat = 0
+        var descent: CGFloat = 0
+        var leading: CGFloat = 0
+        CTLineGetTypographicBounds(ctLine, &ascent, &descent, &leading)
+        fontLineHeight = (ascent + descent + leading)
+    }
+
     override public var isFlipped: Bool {
         true
     }
@@ -181,7 +198,7 @@ public class GutterView: NSView {
                     y: line.yPos,
                     width: width,
                     height: line.height
-                )
+                ).pixelAligned
             )
         }
 
@@ -217,12 +234,16 @@ public class GutterView: NSView {
             let fragment: LineFragment? = linePosition.data.lineFragments.first?.data
             var ascent: CGFloat = 0
             let lineNumberWidth = CTLineGetTypographicBounds(ctLine, &ascent, nil, nil)
+            let fontHeightDifference = ((fragment?.height ?? 0) - fontLineHeight) / 4
 
-            let yPos = linePosition.yPos + ascent + (fragment?.heightDifference ?? 0)/2
+            let yPos = linePosition.yPos + ascent + (fragment?.heightDifference ?? 0)/2 + fontHeightDifference
             // Leading padding + (width - linewidth)
             let xPos = edgeInsets.leading + (maxWidth - lineNumberWidth)
 
-            context.textPosition = CGPoint(x: xPos, y: yPos).pixelAligned
+            ContextSetHiddenSmoothingStyle(context, 16)
+
+            context.textPosition = CGPoint(x: xPos, y: yPos)
+
             CTLineDraw(ctLine, context)
         }
         context.restoreGState()

Sources/CodeEditSourceEditor/Highlighting/Highlighter.swift

@@ -85,6 +85,7 @@ class Highlighter: NSObject {
 
     init(
         textView: TextView,
+        minimapView: MinimapView?,
         providers: [HighlightProviding],
         attributeProvider: ThemeAttributesProviding,
         language: CodeLanguage
@@ -93,7 +94,7 @@ class Highlighter: NSObject {
         self.textView = textView
         self.attributeProvider = attributeProvider
 
-        self.visibleRangeProvider = VisibleRangeProvider(textView: textView)
+        self.visibleRangeProvider = VisibleRangeProvider(textView: textView, minimapView: minimapView)
 
         let providerIds = providers.indices.map({ $0 })
         self.styleContainer = StyledRangeContainer(documentLength: textView.length, providers: providerIds)
@@ -244,7 +245,7 @@ extension Highlighter: NSTextStorageDelegate {
             visibleRangeProvider.visibleSet.insert(range: editedRange)
         }
 
-        visibleRangeProvider.updateVisibleSet(textView: textView)
+        visibleRangeProvider.visibleTextChanged()
 
         let providerRange = NSRange(location: editedRange.location, length: editedRange.length - delta)
         highlightProviders.forEach { $0.storageDidUpdate(range: providerRange, delta: delta) }

Sources/CodeEditSourceEditor/Highlighting/VisibleRangeProvider.swift

@@ -18,6 +18,7 @@ protocol VisibleRangeProviderDelegate: AnyObject {
 @MainActor
 class VisibleRangeProvider {
     private weak var textView: TextView?
+    private weak var minimapView: MinimapView?
     weak var delegate: VisibleRangeProviderDelegate?
 
     var documentRange: NSRange {
@@ -29,56 +30,44 @@ class VisibleRangeProvider {
         return IndexSet(integersIn: textView?.visibleTextRange ?? NSRange())
     }()
 
-    init(textView: TextView) {
+    init(textView: TextView, minimapView: MinimapView?) {
         self.textView = textView
+        self.minimapView = minimapView
 
         if let scrollView = textView.enclosingScrollView {
             NotificationCenter.default.addObserver(
                 self,
-                selector: #selector(visibleTextChanged(_:)),
+                selector: #selector(visibleTextChanged),
                 name: NSView.frameDidChangeNotification,
                 object: scrollView
             )
 
             NotificationCenter.default.addObserver(
                 self,
-                selector: #selector(visibleTextChanged(_:)),
+                selector: #selector(visibleTextChanged),
                 name: NSView.boundsDidChangeNotification,
                 object: scrollView.contentView
             )
-        } else {
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(visibleTextChanged(_:)),
-                name: NSView.frameDidChangeNotification,
-                object: textView
-            )
         }
-    }
 
-    func updateVisibleSet(textView: TextView) {
-        if let newVisibleRange = textView.visibleTextRange {
-            visibleSet = IndexSet(integersIn: newVisibleRange)
-        }
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(visibleTextChanged),
+            name: NSView.frameDidChangeNotification,
+            object: textView
+        )
     }
 
     /// Updates the view to highlight newly visible text when the textview is scrolled or bounds change.
-    @objc func visibleTextChanged(_ notification: Notification) {
-        let textView: TextView
-        if let clipView = notification.object as? NSClipView,
-           let documentView = clipView.enclosingScrollView?.documentView as? TextView {
-            textView = documentView
-        } else if let scrollView = notification.object as? NSScrollView,
-                  let documentView = scrollView.documentView as? TextView {
-            textView = documentView
-        } else if let documentView = notification.object as? TextView {
-            textView = documentView
-        } else {
+    @objc func visibleTextChanged() {
+        guard let textViewVisibleRange = textView?.visibleTextRange else {
             return
         }
-
-        updateVisibleSet(textView: textView)
-
+        var visibleSet = IndexSet(integersIn: textViewVisibleRange)
+        if !(minimapView?.isHidden ?? true), let minimapVisibleRange = minimapView?.visibleTextRange {
+            visibleSet.formUnion(IndexSet(integersIn: minimapVisibleRange))
+        }
+        self.visibleSet = visibleSet
         delegate?.visibleSetDidUpdate(visibleSet)
     }
 

Tests/CodeEditSourceEditorTests/Highlighting/HighlightProviderStateTest.swift

@@ -30,7 +30,7 @@ final class HighlightProviderStateTest: XCTestCase {
     override func setUp() async throws {
         try await super.setUp()
         textView = Mock.textView()
-        rangeProvider = MockVisibleRangeProvider(textView: textView)
+        rangeProvider = MockVisibleRangeProvider(textView: textView, minimapView: nil)
         delegate = EmptyHighlightProviderStateDelegate()
     }
 

Tests/CodeEditSourceEditorTests/Highlighting/VisibleRangeProviderTests.swift

@@ -8,7 +8,7 @@ final class VisibleRangeProviderTests: XCTestCase {
         textView.string = Array(repeating: "\n", count: 400).joined()
         textView.layout()
 
-        let rangeProvider = VisibleRangeProvider(textView: textView)
+        let rangeProvider = VisibleRangeProvider(textView: textView, minimapView: nil)
         let originalSet = rangeProvider.visibleSet
 
         scrollView.contentView.scroll(to: NSPoint(x: 0, y: 250))
@@ -25,7 +25,7 @@ final class VisibleRangeProviderTests: XCTestCase {
         textView.string = Array(repeating: "\n", count: 400).joined()
         textView.layout()
 
-        let rangeProvider = VisibleRangeProvider(textView: textView)
+        let rangeProvider = VisibleRangeProvider(textView: textView, minimapView: nil)
         let originalSet = rangeProvider.visibleSet
 
         scrollView.setFrameSize(NSSize(width: 250, height: 450))
@@ -46,7 +46,7 @@ final class VisibleRangeProviderTests: XCTestCase {
         textView.string = Array(repeating: "\n", count: 400).joined()
         textView.layout()
 
-        let rangeProvider = VisibleRangeProvider(textView: textView)
+        let rangeProvider = VisibleRangeProvider(textView: textView, minimapView: nil)
         let originalSet = rangeProvider.visibleSet
 
         textView.setFrameSize(NSSize(width: 350, height: 450))

Tests/CodeEditSourceEditorTests/Mock.swift

@@ -129,6 +129,7 @@ enum Mock {
     ) -> Highlighter {
         Highlighter(
             textView: textView,
+            minimapView: nil,
             providers: highlightProviders,
             attributeProvider: attributeProvider,
             language: language