Add Config Object - Still need to react to changes

Author: thecoolwinter

Sources/CodeEditSourceEditor/CodeEditSourceEditor/CodeEditSourceEditor.swift

@@ -11,7 +11,7 @@ import CodeEditTextView
 extension TextViewController {
     /// Emphasizes bracket pairs using the current selection.
     internal func emphasizeSelectionPairs() {
-        guard let bracketPairEmphasis else { return }
+        guard let bracketPairEmphasis = config.appearance.bracketPairEmphasis else { return }
         textView.emphasisManager?.removeEmphases(for: EmphasisGroup.brackets)
         for range in textView.selectionManager.textSelections.map({ $0.range }) {
             if range.isEmpty,
@@ -119,7 +119,7 @@ extension TextViewController {
     ///   - location: The location of the character to emphasize
     ///   - scrollToRange: Set to true to scroll to the given range when emphasizing. Defaults to `false`.
     private func emphasizeCharacter(_ location: Int, scrollToRange: Bool = false) {
-        guard let bracketPairEmphasis = bracketPairEmphasis else {
+        guard let bracketPairEmphasis = config.appearance.bracketPairEmphasis else {
             return
         }
 

Sources/CodeEditSourceEditor/Controller/TextViewController+EmphasizeBracket.swift

@@ -41,8 +41,8 @@ extension TextViewController {
 extension TextViewController: ThemeAttributesProviding {
     public func attributesFor(_ capture: CaptureName?) -> [NSAttributedString.Key: Any] {
         [
-            .font: theme.fontFor(for: capture, from: font),
-            .foregroundColor: theme.colorFor(capture),
+            .font: config.appearance.theme.fontFor(for: capture, from: config.appearance.font),
+            .foregroundColor: config.appearance.theme.colorFor(capture),
             .kern: textView.kern
         ]
     }

Sources/CodeEditSourceEditor/Controller/TextViewController+Highlighter.swift

@@ -97,7 +97,7 @@ extension TextViewController {
             lineCount: lineCount
         )
 
-        let charCount = indentOption.charCount
+        let charCount = config.behavior.indentOption.charCount
 
         selection.range.location += inwards ? -charCount * sectionModifier : charCount * sectionModifier
         if lineCount > 1 {
@@ -169,7 +169,7 @@ extension TextViewController {
     }
 
     private func adjustIndentation(lineIndexes: ClosedRange<Int>, inwards: Bool) {
-        let indentationChars: String = indentOption.stringValue
+        let indentationChars: String = config.behavior.indentOption.stringValue
         for lineIndex in lineIndexes {
             adjustIndentation(
                 lineIndex: lineIndex,
@@ -183,7 +183,7 @@ extension TextViewController {
         guard let lineInfo = textView.layoutManager.textLineForIndex(lineIndex) else { return }
 
         if inwards {
-            if indentOption != .tab {
+            if config.behavior.indentOption != .tab {
                 removeLeadingSpaces(lineInfo: lineInfo, spaceCount: indentationChars.count)
             } else {
                 removeLeadingTab(lineInfo: lineInfo)

Sources/CodeEditSourceEditor/Controller/TextViewController+IndentLines.swift

@@ -16,25 +16,19 @@ extension TextViewController {
         scrollView.documentView = textView
 
         gutterView = GutterView(
-            font: font.rulerFont,
-            textColor: theme.text.color.withAlphaComponent(0.35),
-            selectedTextColor: theme.text.color,
+            config: config,
             textView: textView,
             delegate: self
         )
         gutterView.updateWidthIfNeeded()
         scrollView.addFloatingSubview(gutterView, for: .horizontal)
 
-        guideView = ReformattingGuideView(
-            column: self.reformatAtColumn,
-            isVisible: self.showReformattingGuide,
-            theme: theme
-        )
+        guideView = ReformattingGuideView(config: config)
         guideView.wantsLayer = true
         scrollView.addFloatingSubview(guideView, for: .vertical)
         guideView.updatePosition(in: textView)
 
-        minimapView = MinimapView(textView: textView, theme: theme)
+        minimapView = MinimapView(textView: textView, theme: config.appearance.theme)
         scrollView.addFloatingSubview(minimapView, for: .vertical)
 
         let findViewController = FindViewController(target: self, childView: scrollView)

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -9,8 +9,8 @@ import AppKit
 
 extension TextViewController {
     func reloadUI() {
-        textView.isEditable = isEditable
-        textView.isSelectable = isSelectable
+        textView.isEditable = config.behavior.isEditable
+        textView.isSelectable = config.behavior.isSelectable
 
         styleScrollView()
         styleTextView()

Sources/CodeEditSourceEditor/Controller/TextViewController+ReloadUI.swift

@@ -13,28 +13,32 @@ extension TextViewController {
         // swiftlint:disable:next force_cast
         let paragraph = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         paragraph.tabStops.removeAll()
-        paragraph.defaultTabInterval = CGFloat(tabWidth) * fontCharWidth
+        paragraph.defaultTabInterval = CGFloat(config.appearance.tabWidth) * fontCharWidth
         return paragraph
     }
 
     /// Style the text view.
     package func styleTextView() {
         textView.postsFrameChangedNotifications = true
         textView.translatesAutoresizingMaskIntoConstraints = false
-        textView.selectionManager.selectionBackgroundColor = theme.selection
+        textView.selectionManager.selectionBackgroundColor = config.appearance.theme.selection
         textView.selectionManager.selectedLineBackgroundColor = getThemeBackground()
-        textView.selectionManager.highlightSelectedLine = isEditable
-        textView.selectionManager.insertionPointColor = theme.insertionPoint
-        textView.enclosingScrollView?.backgroundColor = useThemeBackground ? theme.background : .clear
+        textView.selectionManager.highlightSelectedLine = config.behavior.isEditable
+        textView.selectionManager.insertionPointColor = config.appearance.theme.insertionPoint
+        textView.enclosingScrollView?.backgroundColor = if config.appearance.useThemeBackground {
+            config.appearance.theme.background
+        } else {
+            .clear
+        }
         paragraphStyle = generateParagraphStyle()
         textView.typingAttributes = attributesFor(nil)
     }
 
     /// Finds the preferred use theme background.
     /// - Returns: The background color to use.
     private func getThemeBackground() -> NSColor {
-        if useThemeBackground {
-            return theme.lineHighlight
+        if config.appearance.useThemeBackground {
+            return config.appearance.theme.lineHighlight
         }
 
         if systemAppearance == .darkAqua {
@@ -46,13 +50,21 @@ extension TextViewController {
 
     /// Style the gutter view.
     package func styleGutterView() {
-        gutterView.selectedLineColor = useThemeBackground ? theme.lineHighlight : systemAppearance == .darkAqua
-        ? NSColor.quaternaryLabelColor
-        : NSColor.selectedTextBackgroundColor.withSystemEffect(.disabled)
-        gutterView.highlightSelectedLines = isEditable
-        gutterView.font = font.rulerFont
-        gutterView.backgroundColor = useThemeBackground ? theme.background : .windowBackgroundColor
-        if self.isEditable == false {
+        gutterView.selectedLineColor = if config.appearance.useThemeBackground {
+            config.appearance.theme.lineHighlight
+        } else if systemAppearance == .darkAqua {
+            NSColor.quaternaryLabelColor
+        } else {
+            NSColor.selectedTextBackgroundColor.withSystemEffect(.disabled)
+        }
+        gutterView.highlightSelectedLines = config.behavior.isEditable
+        gutterView.font = config.appearance.font.rulerFont
+        gutterView.backgroundColor = if config.appearance.useThemeBackground {
+            config.appearance.theme.background
+        } else {
+            .windowBackgroundColor
+        }
+        if config.behavior.isEditable == false {
             gutterView.selectedLineTextColor = nil
             gutterView.selectedLineColor = .clear
         }
@@ -63,21 +75,21 @@ extension TextViewController {
         scrollView.translatesAutoresizingMaskIntoConstraints = false
         scrollView.contentView.postsFrameChangedNotifications = true
         scrollView.hasVerticalScroller = true
-        scrollView.hasHorizontalScroller = !wrapLines
+        scrollView.hasHorizontalScroller = !config.appearance.wrapLines
         scrollView.scrollerStyle = .overlay
     }
 
     package func styleMinimapView() {
         minimapView.postsFrameChangedNotifications = true
-        minimapView.isHidden = !showMinimap
+        minimapView.isHidden = !config.peripherals.showMinimap
     }
 
     /// Updates all relevant content insets including the find panel, scroll view, minimap and gutter position.
     package func updateContentInsets() {
         updateTextInsets()
 
         scrollView.contentView.postsBoundsChangedNotifications = true
-        if let contentInsets {
+        if let contentInsets = config.layout.contentInsets {
             scrollView.automaticallyAdjustsContentInsets = false
             scrollView.contentInsets = contentInsets
 
@@ -90,6 +102,7 @@ extension TextViewController {
         }
 
         // `additionalTextInsets` only effects text content.
+        let additionalTextInsets = config.layout.additionalTextInsets
         scrollView.contentInsets.top += additionalTextInsets?.top ?? 0
         scrollView.contentInsets.bottom += additionalTextInsets?.bottom ?? 0
         minimapView.scrollView.contentInsets.top += additionalTextInsets?.top ?? 0
@@ -104,7 +117,7 @@ extension TextViewController {
         scrollView.contentInsets.top += findInset
         minimapView.scrollView.contentInsets.top += findInset
 
-        findViewController?.topPadding = contentInsets?.top
+        findViewController?.topPadding = config.layout.contentInsets?.top
 
         gutterView.frame.origin.y = textView.frame.origin.y - scrollView.contentInsets.top
 

Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift

@@ -38,9 +38,9 @@ extension TextViewController {
 
         setUpOpenPairFilters(pairs: BracketPairs.allValues)
         setUpTagFilter()
-        setUpNewlineTabFilters(indentOption: indentOption)
+        setUpNewlineTabFilters(indentOption: config.behavior.indentOption)
         setUpDeletePairFilters(pairs: BracketPairs.allValues)
-        setUpDeleteWhitespaceFilter(indentOption: indentOption)
+        setUpDeleteWhitespaceFilter(indentOption: config.behavior.indentOption)
     }
 
     /// Returns a `TextualIndenter` based on available language configuration.
@@ -95,7 +95,7 @@ extension TextViewController {
         guard let treeSitterClient, language.id.shouldProcessTags() else { return }
         textFilters.append(TagFilter(
             language: self.language,
-            indentOption: indentOption,
+            indentOption: config.behavior.indentOption,
             lineEnding: textView.layoutManager.detectedLineEnding,
             treeSitterClient: treeSitterClient
         ))
@@ -112,12 +112,15 @@ extension TextViewController {
             return true
         }
 
-        let indentationUnit = indentOption.stringValue
+        let indentationUnit = config.behavior.indentOption.stringValue
         let indenter: TextualIndenter = getTextIndenter()
         let whitespaceProvider = WhitespaceProviders(
-            leadingWhitespace: indenter.substitionProvider(indentationUnit: indentationUnit,
-                                                           width: tabWidth),
-            trailingWhitespace: { _, _ in "" }
+            leadingWhitespace: indenter.substitionProvider(
+                indentationUnit: indentationUnit,
+                width: config.appearance.tabWidth
+            ),
+            trailingWhitespace: { _, _ in ""
+            }
         )
 
         for filter in textFilters {