Create new EditorConfig struct

Author: thecoolwinter

Sources/CodeEditSourceEditor/CodeEditSourceEditor/CodeEditSourceEditor.swift

@@ -135,88 +135,18 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
             return
         }
 
-        updateControllerParams(controller: controller, coordinator: context.coordinator)
+        controller.config = config
+        updateHighlighting(controller, coordinator: context.coordinator)
 
         controller.reloadUI()
         return
     }
 
-    /// Update the parameters of the controller.
-    /// - Parameter controller: The controller to update.
-    func updateControllerParams(controller: TextViewController, coordinator: Coordinator) {
-//        updateTextProperties(controller)
-//        updateEditorProperties(controller)
-//        updateThemeAndLanguage(controller)
-//        updateHighlighting(controller, coordinator: coordinator)
-//
-//        if controller.reformatAtColumn != reformatAtColumn {
-//            controller.reformatAtColumn = reformatAtColumn
-//        }
-//
-//        if controller.showReformattingGuide != showReformattingGuide {
-//            controller.showReformattingGuide = showReformattingGuide
-//        }
+    private func updateHighlighting(_ controller: TextViewController, coordinator: Coordinator) {
+        if !areHighlightProvidersEqual(controller: controller, coordinator: coordinator) {
+            controller.setHighlightProviders(coordinator.highlightProviders)
+        }
     }
-//
-//    private func updateTextProperties(_ controller: TextViewController) {
-//        if controller.font != font {
-//            controller.font = font
-//        }
-//
-//        if controller.isEditable != isEditable {
-//            controller.isEditable = isEditable
-//        }
-//
-//        if controller.isSelectable != isSelectable {
-//            controller.isSelectable = isSelectable
-//        }
-//    }
-//
-//    private func updateEditorProperties(_ controller: TextViewController) {
-//        controller.wrapLines = wrapLines
-//        controller.useThemeBackground = useThemeBackground
-//        controller.lineHeightMultiple = lineHeight
-//        controller.editorOverscroll = editorOverscroll
-//        controller.contentInsets = contentInsets
-//        controller.additionalTextInsets = additionalTextInsets
-//        controller.showMinimap = showMinimap
-//
-//        if controller.indentOption != indentOption {
-//            controller.indentOption = indentOption
-//        }
-//
-//        if controller.tabWidth != tabWidth {
-//            controller.tabWidth = tabWidth
-//        }
-//
-//        if controller.letterSpacing != letterSpacing {
-//            controller.letterSpacing = letterSpacing
-//        }
-//
-//        if controller.useSystemCursor != useSystemCursor {
-//            controller.useSystemCursor = useSystemCursor
-//        }
-//    }
-//
-//    private func updateThemeAndLanguage(_ controller: TextViewController) {
-//        if controller.language.id != language.id {
-//            controller.language = language
-//        }
-//
-//        if controller.theme != theme {
-//            controller.theme = theme
-//        }
-//    }
-//
-//    private func updateHighlighting(_ controller: TextViewController, coordinator: Coordinator) {
-//        if !areHighlightProvidersEqual(controller: controller, coordinator: coordinator) {
-//            controller.setHighlightProviders(coordinator.highlightProviders)
-//        }
-//
-//        if controller.bracketPairEmphasis != bracketPairEmphasis {
-//            controller.bracketPairEmphasis = bracketPairEmphasis
-//        }
-//    }
 
     /// Checks if the controller needs updating.
     /// - Parameter controller: The controller to check.

Sources/CodeEditSourceEditor/Controller/TextViewController+Highlighter.swift

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

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -23,10 +23,8 @@ extension TextViewController {
         gutterView.updateWidthIfNeeded()
         scrollView.addFloatingSubview(gutterView, for: .horizontal)
 
-        guideView = ReformattingGuideView(config: config)
-        guideView.wantsLayer = true
-        scrollView.addFloatingSubview(guideView, for: .vertical)
-        guideView.updatePosition(in: textView)
+        reformattingGuideView = ReformattingGuideView(config: config)
+        scrollView.addFloatingSubview(reformattingGuideView, for: .vertical)
 
         minimapView = MinimapView(textView: textView, theme: config.appearance.theme)
         scrollView.addFloatingSubview(minimapView, for: .vertical)
@@ -130,7 +128,7 @@ extension TextViewController {
             - (self?.scrollView.contentInsets.top ?? 0)
 
             self?.gutterView.needsDisplay = true
-            self?.guideView?.updatePosition(in: textView)
+            self?.reformattingGuideView?.updatePosition(in: textView)
             self?.scrollView.needsLayout = true
         }
     }

Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift

@@ -13,32 +13,33 @@ extension TextViewController {
         // swiftlint:disable:next force_cast
         let paragraph = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         paragraph.tabStops.removeAll()
-        paragraph.defaultTabInterval = CGFloat(config.appearance.tabWidth) * fontCharWidth
+        paragraph.defaultTabInterval = CGFloat(tabWidth) * fontCharWidth
         return paragraph
     }
 
     /// Style the text view.
     package func styleTextView() {
         textView.postsFrameChangedNotifications = true
         textView.translatesAutoresizingMaskIntoConstraints = false
-        textView.selectionManager.selectionBackgroundColor = config.appearance.theme.selection
+        textView.selectionManager.selectionBackgroundColor = theme.selection
         textView.selectionManager.selectedLineBackgroundColor = getThemeBackground()
         textView.selectionManager.highlightSelectedLine = config.behavior.isEditable
-        textView.selectionManager.insertionPointColor = config.appearance.theme.insertionPoint
-        textView.enclosingScrollView?.backgroundColor = if config.appearance.useThemeBackground {
-            config.appearance.theme.background
+        textView.selectionManager.insertionPointColor = theme.insertionPoint
+        textView.enclosingScrollView?.backgroundColor = if useThemeBackground {
+            theme.background
         } else {
             .clear
         }
+        textView.overscrollAmount = editorOverscroll
         paragraphStyle = generateParagraphStyle()
         textView.typingAttributes = attributesFor(nil)
     }
 
     /// Finds the preferred use theme background.
     /// - Returns: The background color to use.
     private func getThemeBackground() -> NSColor {
-        if config.appearance.useThemeBackground {
-            return config.appearance.theme.lineHighlight
+        if useThemeBackground {
+            return theme.lineHighlight
         }
 
         if systemAppearance == .darkAqua {
@@ -50,38 +51,44 @@ extension TextViewController {
 
     /// Style the gutter view.
     package func styleGutterView() {
-        gutterView.selectedLineColor = if config.appearance.useThemeBackground {
-            config.appearance.theme.lineHighlight
+        gutterView.selectedLineColor = if useThemeBackground {
+            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
+        gutterView.font = font.rulerFont
+        gutterView.backgroundColor = if useThemeBackground {
+            theme.background
         } else {
             .windowBackgroundColor
         }
         if config.behavior.isEditable == false {
             gutterView.selectedLineTextColor = nil
             gutterView.selectedLineColor = .clear
         }
+        gutterView.isHidden = !showGutter
     }
 
     /// Style the scroll view.
     package func styleScrollView() {
         scrollView.translatesAutoresizingMaskIntoConstraints = false
         scrollView.contentView.postsFrameChangedNotifications = true
         scrollView.hasVerticalScroller = true
-        scrollView.hasHorizontalScroller = !config.appearance.wrapLines
+        scrollView.hasHorizontalScroller = !wrapLines
         scrollView.scrollerStyle = .overlay
     }
 
     package func styleMinimapView() {
         minimapView.postsFrameChangedNotifications = true
-        minimapView.isHidden = !config.peripherals.showMinimap
+        minimapView.isHidden = !showMinimap
+    }
+
+    package func styleReformattingGuideView() {
+        reformattingGuideView.updatePosition(in: textView)
+        reformattingGuideView.isHidden = !showReformattingGuide
     }
 
     /// Updates all relevant content insets including the find panel, scroll view, minimap and gutter position.