Merge branch 'main' into feat/editor-restoration

Author: thecoolwinter

CodeEdit.xcodeproj/project.pbxproj

@@ -1765,8 +1765,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.14.0;
+				kind = exactVersion;
+				version = 0.14.0;
 			};
 		};
 		6C85BB3E2C2105ED00EB5DEF /* XCRemoteSwiftPackageReference "CodeEditKit" */ = {

CodeEdit/Features/Editor/Views/CodeFileView.swift

@@ -46,8 +46,12 @@ struct CodeFileView: View {
     var bracketEmphasis
     @AppSettings(\.textEditing.useSystemCursor)
     var useSystemCursor
+    @AppSettings(\.textEditing.showGutter)
+    var showGutter
     @AppSettings(\.textEditing.showMinimap)
     var showMinimap
+    @AppSettings(\.textEditing.showFoldingRibbon)
+    var showFoldingRibbon
     @AppSettings(\.textEditing.reformatAtColumn)
     var reformatAtColumn
     @AppSettings(\.textEditing.showReformattingGuide)
@@ -133,10 +137,10 @@ struct CodeFileView: View {
                     additionalTextInsets: NSEdgeInsets(top: 2, left: 0, bottom: 0, right: 0)
                 ),
                 peripherals: .init(
-                    showGutter: true,
+                    showGutter: showGutter,
                     showMinimap: showMinimap,
                     showReformattingGuide: showReformattingGuide,
-                    showFoldingRibbon: false,
+                    showFoldingRibbon: showFoldingRibbon,
                     invisibleCharactersConfiguration: .empty,
                     warningCharacters: []
                 )

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

@@ -74,9 +74,15 @@ extension SettingsData {
         /// Use the system cursor for the source editor.
         var useSystemCursor: Bool = true
 
+        /// Toggle the gutter in the editor.
+        var showGutter: Bool = true
+
         /// Toggle the minimap in the editor.
         var showMinimap: Bool = true
 
+        /// Toggle the code folding ribbon.
+        var showFoldingRibbon: Bool = true
+
         /// The column at which to reformat text
         var reformatAtColumn: Int = 80
 
@@ -131,7 +137,9 @@ extension SettingsData {
                 self.useSystemCursor = false
             }
 
+            self.showGutter = try container.decodeIfPresent(Bool.self, forKey: .showGutter) ?? true
             self.showMinimap = try container.decodeIfPresent(Bool.self, forKey: .showMinimap) ?? true
+            self.showFoldingRibbon = try container.decodeIfPresent(Bool.self, forKey: .showFoldingRibbon) ?? true
             self.reformatAtColumn = try container.decodeIfPresent(Int.self, forKey: .reformatAtColumn) ?? 80
             self.showReformattingGuide = try container.decodeIfPresent(
                 Bool.self,
@@ -172,12 +180,20 @@ extension SettingsData {
                 }
             )
 
+            mgr.addCommand(name: "Toggle Minimap", title: "Toggle Minimap", id: "prefs.text_editing.toggle_minimap") {
+                Settings[\.textEditing].showMinimap.toggle()
+            }
+
+            mgr.addCommand(name: "Toggle Gutter", title: "Toggle Gutter", id: "prefs.text_editing.toggle_gutter") {
+                Settings[\.textEditing].showGutter.toggle()
+            }
+
             mgr.addCommand(
-                name: "Toggle Minimap",
-                title: "Toggle Minimap",
-                id: "prefs.text_editing.toggle_minimap"
+                name: "Toggle Folding Ribbon",
+                title: "Toggle Folding Ribbon",
+                id: "prefs.text_editing.toggle_folding_ribbon"
             ) {
-                Settings[\.textEditing].showMinimap.toggle()
+                Settings[\.textEditing].showFoldingRibbon.toggle()
             }
         }
 

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

@@ -20,7 +20,11 @@ struct TextEditingSettingsView: View {
                 wrapLinesToEditorWidth
                 useSystemCursor
                 overscroll
+            }
+            Section {
+                showGutter
                 showMinimap
+                showFoldingRibbon
                 reformatSettings
             }
             Section {
@@ -202,13 +206,28 @@ private extension TextEditingSettingsView {
         }
     }
 
+    @ViewBuilder private var showGutter: some View {
+        Toggle("Show Gutter", isOn: $textEditing.showGutter)
+            .help("The gutter displays line numbers and code folding regions.")
+    }
+
     @ViewBuilder private var showMinimap: some View {
         Toggle("Show Minimap", isOn: $textEditing.showMinimap)
             // swiftlint:disable:next line_length
             .help("The minimap gives you a high-level summary of your source code, with controls to quickly navigate your document.")
     }
 
+    @ViewBuilder private var showFoldingRibbon: some View {
+        Toggle("Show Code Folding Ribbon", isOn: $textEditing.showFoldingRibbon)
+            .disabled(!textEditing.showGutter) // Disabled when the gutter is disabled
+            // swiftlint:disable:next line_length
+            .help("The code folding ribbon lets you fold regions of code. When the gutter is disabled, the folding ribbon is disabled.")
+    }
+
     @ViewBuilder private var reformatSettings: some View {
+        Toggle("Show Reformatting Guide", isOn: $textEditing.showReformattingGuide)
+            .help("Shows a vertical guide at the reformat column.")
+
         Stepper(
             "Reformat at Column",
             value: Binding<Double>(
@@ -219,9 +238,6 @@ private extension TextEditingSettingsView {
             step: 1,
             format: .number
         )
-        .help("The column at which text should be reformatted")
-
-        Toggle("Show Reformatting Guide", isOn: $textEditing.showReformattingGuide)
-            .help("Shows a vertical guide at the reformat column")
+        .help("The column at which text should be reformatted.")
     }
 }

CodeEdit/Features/SplitView/Views/SplitViewControllerView.swift

@@ -131,10 +131,6 @@ final class SplitViewController: NSSplitViewController {
         }
     }
 
-    override func splitView(_ splitView: NSSplitView, canCollapseSubview subview: NSView) -> Bool {
-        false
-    }
-
     override func splitView(_ splitView: NSSplitView, shouldHideDividerAt dividerIndex: Int) -> Bool {
         // For some reason, AppKit _really_ wants to hide dividers when there's only one item (and no dividers)
         // so we do this check for them.