Use New BracketPairEmphasis Type

Author: thecoolwinter

CodeEdit/Features/Editor/Views/CodeFileView.swift

@@ -40,8 +40,8 @@ struct CodeFileView: View {
     var matchAppearance
     @AppSettings(\.textEditing.letterSpacing)
     var letterSpacing
-    @AppSettings(\.textEditing.bracketHighlight)
-    var bracketHighlight
+    @AppSettings(\.textEditing.bracketEmphasis)
+    var bracketEmphasis
     @AppSettings(\.textEditing.useSystemCursor)
     var useSystemCursor
 
@@ -99,23 +99,6 @@ struct CodeFileView: View {
 
     @State private var font: NSFont = Settings[\.textEditing].font.current
 
-    @State private var bracketPairHighlight: BracketPairHighlight? = {
-        let theme = ThemeModel.shared.selectedTheme ?? ThemeModel.shared.themes.first!
-        let color = Settings[\.textEditing].bracketHighlight.useCustomColor
-        ? Settings[\.textEditing].bracketHighlight.color.nsColor
-        : theme.editor.text.nsColor.withAlphaComponent(0.8)
-        switch Settings[\.textEditing].bracketHighlight.highlightType {
-        case .disabled:
-            return nil
-        case .flash:
-            return .flash
-        case .bordered:
-            return .bordered(color: color)
-        case .underline:
-            return .underline(color: color)
-        }
-    }()
-
     @Environment(\.edgeInsets)
     private var edgeInsets
 
@@ -135,7 +118,7 @@ struct CodeFileView: View {
             contentInsets: edgeInsets.nsEdgeInsets,
             isEditable: isEditable,
             letterSpacing: letterSpacing,
-            bracketPairHighlight: bracketPairHighlight,
+            bracketPairEmphasis: getBracketPairEmphasis(),
             useSystemCursor: useSystemCursor,
             undoManager: undoManager,
             coordinators: textViewCoordinators
@@ -154,19 +137,18 @@ struct CodeFileView: View {
         .onChange(of: settingsFont) { newFontSetting in
             font = newFontSetting.current
         }
-        .onChange(of: bracketHighlight) { _ in
-            bracketPairHighlight = getBracketPairHighlight()
-        }
     }
 
-    private func getBracketPairHighlight() -> BracketPairHighlight? {
-        let color = if Settings[\.textEditing].bracketHighlight.useCustomColor {
-            Settings[\.textEditing].bracketHighlight.color.nsColor
+    /// Determines the style of bracket emphasis based on the `bracketEmphasis` setting and the current theme.
+    /// - Returns: The emphasis style to use for bracket pair emphasis.
+    private func getBracketPairEmphasis() -> BracketPairEmphasis? {
+        let color = if Settings[\.textEditing].bracketEmphasis.useCustomColor {
+            Settings[\.textEditing].bracketEmphasis.color.nsColor
         } else {
             currentTheme.editor.text.nsColor.withAlphaComponent(0.8)
         }
 
-        switch Settings[\.textEditing].bracketHighlight.highlightType {
+        switch Settings[\.textEditing].bracketEmphasis.highlightType {
         case .disabled:
             return nil
         case .flash:

CodeEdit/Features/Settings/Pages/TextEditingSettings/Models/TextEditingSettings.swift

@@ -26,6 +26,7 @@ extension SettingsData {
                 "Letter Spacing",
                 "Autocomplete braces",
                 "Enable type-over completion",
+                "Bracket Pair Emphasis",
                 "Bracket Pair Highlight"
             ]
             if #available(macOS 14.0, *) {
@@ -64,7 +65,7 @@ extension SettingsData {
         var letterSpacing: Double = 1.0
 
         /// The behavior of bracket pair highlights.
-        var bracketHighlight: BracketPairHighlight = BracketPairHighlight()
+        var bracketEmphasis: BracketPairEmphasis = BracketPairEmphasis()
 
         /// Use the system cursor for the source editor.
         var useSystemCursor: Bool = true
@@ -107,10 +108,10 @@ extension SettingsData {
                 Double.self,
                 forKey: .letterSpacing
             ) ?? 1
-            self.bracketHighlight = try container.decodeIfPresent(
-                BracketPairHighlight.self,
-                forKey: .bracketHighlight
-            ) ?? BracketPairHighlight()
+            self.bracketEmphasis = try container.decodeIfPresent(
+                BracketPairEmphasis.self,
+                forKey: .bracketEmphasis
+            ) ?? BracketPairEmphasis()
             if #available(macOS 14, *) {
                 self.useSystemCursor = try container.decodeIfPresent(Bool.self, forKey: .useSystemCursor) ?? true
             } else {
@@ -164,7 +165,7 @@ extension SettingsData {
             }
         }
 
-        struct BracketPairHighlight: Codable, Hashable {
+        struct BracketPairEmphasis: Codable, Hashable {
             /// The type of highlight to use
             var highlightType: HighlightType = .flash
             var useCustomColor: Bool = false

CodeEdit/Features/Settings/Pages/TextEditingSettings/TextEditingSettingsView.swift

@@ -176,26 +176,26 @@ private extension TextEditingSettingsView {
         Group {
             Picker(
                 "Bracket Pair Highlight",
-                selection: $textEditing.bracketHighlight.highlightType
+                selection: $textEditing.bracketEmphasis.highlightType
             ) {
-                Text("Disabled").tag(SettingsData.TextEditingSettings.BracketPairHighlight.HighlightType.disabled)
+                Text("Disabled").tag(SettingsData.TextEditingSettings.BracketPairEmphasis.HighlightType.disabled)
                 Divider()
-                Text("Bordered").tag(SettingsData.TextEditingSettings.BracketPairHighlight.HighlightType.bordered)
-                Text("Flash").tag(SettingsData.TextEditingSettings.BracketPairHighlight.HighlightType.flash)
-                Text("Underline").tag(SettingsData.TextEditingSettings.BracketPairHighlight.HighlightType.underline)
+                Text("Bordered").tag(SettingsData.TextEditingSettings.BracketPairEmphasis.HighlightType.bordered)
+                Text("Flash").tag(SettingsData.TextEditingSettings.BracketPairEmphasis.HighlightType.flash)
+                Text("Underline").tag(SettingsData.TextEditingSettings.BracketPairEmphasis.HighlightType.underline)
             }
-            if [.bordered, .underline].contains(textEditing.bracketHighlight.highlightType) {
-                Toggle("Use Custom Color", isOn: $textEditing.bracketHighlight.useCustomColor)
+            if [.bordered, .underline].contains(textEditing.bracketEmphasis.highlightType) {
+                Toggle("Use Custom Color", isOn: $textEditing.bracketEmphasis.useCustomColor)
                 SettingsColorPicker(
                     "Bracket Pair Highlight Color",
-                    color: $textEditing.bracketHighlight.color.swiftColor
+                    color: $textEditing.bracketEmphasis.color.swiftColor
                 )
                 .foregroundColor(
-                    textEditing.bracketHighlight.useCustomColor
+                    textEditing.bracketEmphasis.useCustomColor
                         ? Color(.labelColor)
                         : Color(.secondaryLabelColor)
                 )
-                .disabled(!textEditing.bracketHighlight.useCustomColor)
+                .disabled(!textEditing.bracketEmphasis.useCustomColor)
             }
         }
     }