Add Editor Options Accessory, Minimap Setting

thecoolwinter · thecoolwinter · commit 68abe9e971f0 · 2025-04-18T12:25:39.000-05:00
diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
@@ -419,7 +419,7 @@
 				303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
 				6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
 				6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
-				6CFE18222DA59C9F00A7B796 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
+				6C7638E22DB1665800BA6353 /* XCLocalSwiftPackageReference "../CodeEditSourceEditor" */,
 			);
 			preferredProjectObjectVersion = 55;
 			productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -1616,6 +1616,13 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		6C7638E22DB1665800BA6353 /* XCLocalSwiftPackageReference "../CodeEditSourceEditor" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ../CodeEditSourceEditor;
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCRemoteSwiftPackageReference section */
 		2816F592280CF50500DD548B /* XCRemoteSwiftPackageReference "CodeEditSymbols" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -1745,14 +1752,6 @@
 				version = 1.0.1;
 			};
 		};
-		6CFE18222DA59C9F00A7B796 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.11.0;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
diff --git a/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/CodeEdit/Features/Editor/TabBar/Views/EditorTabBarTrailingAccessories.swift b/CodeEdit/Features/Editor/TabBar/Views/EditorTabBarTrailingAccessories.swift
@@ -8,6 +8,11 @@
 import SwiftUI
 
 struct EditorTabBarTrailingAccessories: View {
+    @AppSettings(\.textEditing.wrapLinesToEditorWidth)
+    var wrapLinesToEditorWidth
+    @AppSettings(\.textEditing.showMinimap)
+    var showMinimap
+
     @Environment(\.splitEditor)
     var splitEditor
 
@@ -21,15 +26,56 @@ struct EditorTabBarTrailingAccessories: View {
 
     @EnvironmentObject private var editor: Editor
 
+    /// Because this view isn't invalidated with the `editor.selectedTab?.file.fileDocument` changes, this allows us
+    /// to refresh relevant views when settings change.
+    @State private var refreshToggleBool: Bool = false
+
     var body: some View {
-        HStack(spacing: 0) {
+        HStack(spacing: 6) {
+            // Once more options are implemented that are available for non-code documents, remove this if statement
+            if let codeFile = editor.selectedTab?.file.fileDocument {
+                editorOptionsMenu(codeFile: codeFile)
+                Divider()
+                    .padding(.vertical, 10)
+            }
             splitviewButton
         }
+        .buttonStyle(.icon)
+        .disabled(editorManager.isFocusingActiveEditor)
+        .opacity(editorManager.isFocusingActiveEditor ? 0.5 : 1)
         .padding(.horizontal, 7)
         .opacity(activeState != .inactive ? 1.0 : 0.5)
         .frame(maxHeight: .infinity) // Fill out vertical spaces.
     }
 
+    func editorOptionsMenu(codeFile: CodeFileDocument) -> some View {
+        // This is a button so it gets the same styling from the Group in `body`.
+        Button(action: {}, label: { Image(systemName: "slider.horizontal.3") })
+            .overlay {
+                Menu {
+                    Toggle("Show Minimap", isOn: $showMinimap)
+                        .keyboardShortcut("M", modifiers: [.command, .shift, .control])
+                    Divider()
+                    Toggle(
+                        "Wrap Lines",
+                        isOn: Binding(
+                            get: { codeFile.wrapLines ?? wrapLinesToEditorWidth },
+                            set: {
+                                codeFile.wrapLines = $0
+                                refreshToggleBool.toggle()
+                            }
+                        )
+                    )
+                    .tag(refreshToggleBool)
+                } label: {}
+                    .menuStyle(.borderlessButton)
+                    .menuIndicator(.hidden)
+            }
+            .onReceive(codeFile.$wrapLines) { _ in // This is annoying but it works
+                refreshToggleBool.toggle()
+            }
+    }
+
     var splitviewButton: some View {
         Group {
             switch (editor.parent?.axis, modifierKeys.contains(.option)) {
@@ -53,9 +99,6 @@ struct EditorTabBarTrailingAccessories: View {
                 EmptyView()
             }
         }
-        .buttonStyle(.icon)
-        .disabled(editorManager.isFocusingActiveEditor)
-        .opacity(editorManager.isFocusingActiveEditor ? 0.5 : 1)
     }
 
     func split(edge: Edge) {
diff --git a/CodeEdit/Features/Editor/Views/CodeFileView.swift b/CodeEdit/Features/Editor/Views/CodeFileView.swift
@@ -44,6 +44,8 @@ struct CodeFileView: View {
     var bracketEmphasis
     @AppSettings(\.textEditing.useSystemCursor)
     var useSystemCursor
+    @AppSettings(\.textEditing.showMinimap)
+    var showMinimap
 
     @Environment(\.colorScheme)
     private var colorScheme
@@ -125,7 +127,8 @@ struct CodeFileView: View {
             bracketPairEmphasis: getBracketPairEmphasis(),
             useSystemCursor: useSystemCursor,
             undoManager: undoManager,
-            coordinators: textViewCoordinators
+            coordinators: textViewCoordinators,
+            showMinimap: showMinimap
         )
         .id(codeFile.fileURL)
         .background {
diff --git a/CodeEdit/Features/Settings/Pages/TextEditingSettings/Models/TextEditingSettings.swift b/CodeEdit/Features/Settings/Pages/TextEditingSettings/Models/TextEditingSettings.swift
@@ -27,7 +27,8 @@ extension SettingsData {
                 "Autocomplete braces",
                 "Enable type-over completion",
                 "Bracket Pair Emphasis",
-                "Bracket Pair Highlight"
+                "Bracket Pair Highlight",
+                "Show Minimap",
             ]
             if #available(macOS 14.0, *) {
                 keys.append("System Cursor")
@@ -70,6 +71,9 @@ extension SettingsData {
         /// Use the system cursor for the source editor.
         var useSystemCursor: Bool = true
 
+        /// Toggle the minimap in the editor.
+        var showMinimap: Bool = true
+
         /// Default initializer
         init() {
             self.populateCommands()
@@ -118,6 +122,8 @@ extension SettingsData {
                 self.useSystemCursor = false
             }
 
+            self.showMinimap = try container.decodeIfPresent(Bool.self, forKey: .showMinimap) ?? true
+
             self.populateCommands()
         }
 
@@ -130,7 +136,7 @@ extension SettingsData {
                 title: "Toggle Type-Over Completion",
                 id: "prefs.text_editing.type_over_completion",
                 command: {
-                    Settings.shared.preferences.textEditing.enableTypeOverCompletion.toggle()
+                    Settings[\.textEditing].enableTypeOverCompletion.toggle()
                 }
             )
 
@@ -139,7 +145,7 @@ extension SettingsData {
                 title: "Toggle Autocomplete Braces",
                 id: "prefs.text_editing.autocomplete_braces",
                 command: {
-                    Settings.shared.preferences.textEditing.autocompleteBraces.toggle()
+                    Settings[\.textEditing].autocompleteBraces.toggle()
                 }
             )
 
@@ -151,6 +157,14 @@ extension SettingsData {
                     Settings[\.textEditing].wrapLinesToEditorWidth.toggle()
                 }
             )
+
+            mgr.addCommand(
+                name: "Toggle Minimap",
+                title: "Toggle Minimap",
+                id: "prefs.text_editing.toggle_minimap"
+            ) {
+                Settings[\.textEditing].showMinimap.toggle()
+            }
         }
 
         struct IndentOption: Codable, Hashable {
diff --git a/CodeEdit/Features/Settings/Pages/TextEditingSettings/TextEditingSettingsView.swift b/CodeEdit/Features/Settings/Pages/TextEditingSettings/TextEditingSettingsView.swift
@@ -20,6 +20,7 @@ struct TextEditingSettingsView: View {
                 wrapLinesToEditorWidth
                 useSystemCursor
                 overscroll
+                showMinimap
             }
             Section {
                 fontSelector
@@ -199,4 +200,10 @@ private extension TextEditingSettingsView {
             }
         }
     }
+
+    @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.")
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ extension SettingsData {`
`27`	`27`	`"Autocomplete braces",`
`28`	`28`	`"Enable type-over completion",`
`29`	`29`	`"Bracket Pair Emphasis",`
`30`		`- "Bracket Pair Highlight"`
	`30`	`+ "Bracket Pair Highlight",`
	`31`	`+ "Show Minimap",`
`31`	`32`	`]`
`32`	`33`	`if #available(macOS 14.0, *) {`
`33`	`34`	`keys.append("System Cursor")`
`@@ -70,6 +71,9 @@ extension SettingsData {`
`70`	`71`	`/// Use the system cursor for the source editor.`
`71`	`72`	`var useSystemCursor: Bool = true`
`72`	`73`
	`74`	`+ /// Toggle the minimap in the editor.`
	`75`	`+ var showMinimap: Bool = true`
	`76`	`+`
`73`	`77`	`/// Default initializer`
`74`	`78`	`init() {`
`75`	`79`	`self.populateCommands()`
`@@ -118,6 +122,8 @@ extension SettingsData {`
`118`	`122`	`self.useSystemCursor = false`
`119`	`123`	`}`
`120`	`124`
	`125`	`+ self.showMinimap = try container.decodeIfPresent(Bool.self, forKey: .showMinimap) ?? true`
	`126`	`+`
`121`	`127`	`self.populateCommands()`
`122`	`128`	`}`
`123`	`129`
`@@ -130,7 +136,7 @@ extension SettingsData {`
`130`	`136`	`title: "Toggle Type-Over Completion",`
`131`	`137`	`id: "prefs.text_editing.type_over_completion",`
`132`	`138`	`command: {`
`133`		`- Settings.shared.preferences.textEditing.enableTypeOverCompletion.toggle()`
	`139`	`+ Settings[\.textEditing].enableTypeOverCompletion.toggle()`
`134`	`140`	`}`
`135`	`141`	`)`
`136`	`142`
`@@ -139,7 +145,7 @@ extension SettingsData {`
`139`	`145`	`title: "Toggle Autocomplete Braces",`
`140`	`146`	`id: "prefs.text_editing.autocomplete_braces",`
`141`	`147`	`command: {`
`142`		`- Settings.shared.preferences.textEditing.autocompleteBraces.toggle()`
	`148`	`+ Settings[\.textEditing].autocompleteBraces.toggle()`
`143`	`149`	`}`
`144`	`150`	`)`
`145`	`151`
`@@ -151,6 +157,14 @@ extension SettingsData {`
`151`	`157`	`Settings[\.textEditing].wrapLinesToEditorWidth.toggle()`
`152`	`158`	`}`
`153`	`159`	`)`
	`160`	`+`
	`161`	`+ mgr.addCommand(`
	`162`	`+ name: "Toggle Minimap",`
	`163`	`+ title: "Toggle Minimap",`
	`164`	`+ id: "prefs.text_editing.toggle_minimap"`
	`165`	`+ ) {`
	`166`	`+ Settings[\.textEditing].showMinimap.toggle()`
	`167`	`+ }`
`154`	`168`	`}`
`155`	`169`
`156`	`170`	`struct IndentOption: Codable, Hashable {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ struct TextEditingSettingsView: View {`
`20`	`20`	`wrapLinesToEditorWidth`
`21`	`21`	`useSystemCursor`
`22`	`22`	`overscroll`
	`23`	`+ showMinimap`
`23`	`24`	`}`
`24`	`25`	`Section {`
`25`	`26`	`fontSelector`
`@@ -199,4 +200,10 @@ private extension TextEditingSettingsView {`
`199`	`200`	`}`
`200`	`201`	`}`
`201`	`202`	`}`
	`203`	`+`
	`204`	`+ @ViewBuilder private var showMinimap: some View {`
	`205`	`+ Toggle("Show Minimap", isOn: $textEditing.showMinimap)`
	`206`	`+ // swiftlint:disable:next line_length`
	`207`	`+ .help("The minimap gives you a high-level summary of your source code, with controls to quickly navigate your document.")`
	`208`	`+ }`
`202`	`209`	`}`