Merge pull request #948 from ben-p-commits/ben/text-wrapping-preference

Add preference for text wrapping in editor, add command palette options for text editing prefs

Author: lukepistrol

CodeEdit.xcodeproj/project.pbxproj

@@ -3292,7 +3292,7 @@
 			repositoryURL = "https://github.com/CodeEditApp/CodeEditTextView.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.2.2;
+				version = 0.3.0;
 			};
 		};
 		58F2EB18292FB91C004A9BDE /* XCRemoteSwiftPackageReference "Preferences" */ = {

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,8 +21,13 @@ extension AppPreferences {
 
         var autocompleteBraces: Bool = true
 
+        // A flag indicating whether to wrap lines to editor width
+        var wrapLinesToEditorWidth: Bool = true
+
         /// Default initializer
-        init() {}
+        init() {
+            self.populateCommands()
+        }
 
         /// Explicit decoder init for setting default values when key is not present in `JSON`
         init(from decoder: Decoder) throws {
@@ -33,6 +38,38 @@ extension AppPreferences {
                 Bool.self, forKey: .enableTypeOverCompletion) ?? true
             self.autocompleteBraces = try container.decodeIfPresent(Bool.self,
                                                                     forKey: .autocompleteBraces) ?? true
+            self.wrapLinesToEditorWidth = try container.decodeIfPresent(Bool.self,
+                                                                    forKey: .wrapLinesToEditorWidth) ?? true
+            self.populateCommands()
+        }
+
+        /// Adds toggle-able preferences to the command palette via shared `CommandManager`
+        private func populateCommands() {
+            let mgr = CommandManager.shared
+
+            mgr.addCommand(
+                name: "Toggle Type-Over Completion",
+                title: "Toggle Type-Over Completion",
+                id: "prefs.text_editing.type_over_completion",
+                command: CommandClosureWrapper {
+                    AppPreferencesModel.shared.preferences.textEditing.enableTypeOverCompletion.toggle()
+            })
+
+            mgr.addCommand(
+                name: "Toggle Autocomplete Braces",
+                title: "Toggle Autocomplete Braces",
+                id: "prefs.text_editing.autocomplete_braces",
+                command: CommandClosureWrapper {
+                    AppPreferencesModel.shared.preferences.textEditing.autocompleteBraces.toggle()
+            })
+
+            mgr.addCommand(
+                name: "Toggle Word Wrap",
+                title: "Toggle Word Wrap",
+                id: "prefs.text_editing.wrap_lines_to_editor_width",
+                command: CommandClosureWrapper {
+                    AppPreferencesModel.shared.preferences.textEditing.wrapLinesToEditorWidth.toggle()
+            })
         }
     }
 

CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditingPreferences.swift

@@ -42,6 +42,9 @@ struct TextEditingPreferencesView: View {
                 autocompleteBraces
                 enableTypeOverCompletion
             }
+            PreferencesSection("Line Wrapping") {
+                wrapLinesToEditorWidth
+            }
         }
     }
 
@@ -75,4 +78,12 @@ struct TextEditingPreferencesView: View {
             Text("Enable type-over completion")
         }
     }
+
+    private var wrapLinesToEditorWidth: some View {
+        HStack {
+            Toggle("Wrap lines to editor width", isOn: $prefs.preferences.textEditing.wrapLinesToEditorWidth)
+            Text("Wrap lines to editor width")
+        }
+    }
+
 }

CodeEdit/Features/AppPreferences/Sections/TextEditingPreferences/TextEditingPreferencesView.swift

@@ -70,6 +70,7 @@ struct CodeFileView: View {
             font: $font,
             tabWidth: $prefs.preferences.textEditing.defaultTabWidth,
             lineHeight: .constant(1.2), // TODO: Add to preferences
+            wrapLines: $prefs.preferences.textEditing.wrapLinesToEditorWidth,
             cursorPosition: codeFile.$cursorPosition
         )
         .id(codeFile.fileURL)