Indent wrapped lines (CodeEditTextView #18): settings, UI, tests; git…

CodeEdit/Features/Editor/Views/CodeFileView.swift

@@ -31,6 +31,8 @@
     var lineHeightMultiple
     @AppSettings(\.textEditing.wrapLinesToEditorWidth)
     var wrapLinesToEditorWidth
+    @AppSettings(\.textEditing.wrappedLineIndent)
+    var wrappedLineIndent
     @AppSettings(\.textEditing.overscroll)
     var overscroll
     @AppSettings(\.textEditing.font)
@@ -125,6 +127,7 @@
                     lineHeightMultiple: lineHeightMultiple,
                     letterSpacing: letterSpacing,
                     wrapLines: wrapLinesToEditorWidth,
+                    wrappedLineIndent: wrappedLineIndent,
                     useSystemCursor: useSystemCursor,
                     tabWidth: defaultTabWidth,
                     bracketPairEmphasis: getBracketPairEmphasis()

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

@@ -18,6 +18,7 @@ extension SettingsData {
                 "Prefer Indent Using",
                 "Tab Width",
                 "Wrap lines to editor width",
+                "Indent wrapped lines",
                 "Editor Overscroll",
                 "Font",
                 "Font Size",
@@ -60,6 +61,11 @@ extension SettingsData {
         /// A flag indicating whether to wrap lines to editor width
         var wrapLinesToEditorWidth: Bool = true
 
+        /// Spaces to indent continuation lines when line wrapping 
+        /// is on (e.g. 4 or 12). See:
+        /// https://github.com/CodeEditApp/CodeEditTextView/issues/18
+        var wrappedLineIndent: Int = 4
+
         /// The percentage of overscroll to apply to the text view
         var overscroll: OverscrollOption = .medium
 
@@ -122,6 +128,10 @@ extension SettingsData {
                 Bool.self,
                 forKey: .wrapLinesToEditorWidth
             ) ?? true
+            self.wrappedLineIndent = try container.decodeIfPresent(
+                Int.self,
+                forKey: .wrappedLineIndent
+            ) ?? 4
             self.overscroll = try container.decodeIfPresent(
                 OverscrollOption.self,
                 forKey: .overscroll

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

@@ -21,6 +21,7 @@ struct TextEditingSettingsView: View {
                 indentOption
                 defaultTabWidth
                 wrapLinesToEditorWidth
+                wrappedLineIndent
                 useSystemCursor
                 overscroll
             }
@@ -86,6 +87,25 @@ private extension TextEditingSettingsView {
         Toggle("Wrap lines to editor width", isOn: $textEditing.wrapLinesToEditorWidth)
     }
 
+    @ViewBuilder private var wrappedLineIndent: some View {
+        HStack(alignment: .top) {
+            Stepper(
+                "Indent wrapped lines",
+                value: Binding<Double>(
+                    get: { Double(textEditing.wrappedLineIndent) },
+                    set: { textEditing.wrappedLineIndent = Int($0) }
+                ),
+                in: 0...24,
+                step: 1,
+                format: .number
+            )
+            Text("spaces")
+                .foregroundColor(.secondary)
+        }
+        .disabled(!textEditing.wrapLinesToEditorWidth)
+        .help("Number of spaces to indent continuation lines when line wrapping is on (e.g. like Xcode).")
+    }
+
     @ViewBuilder private var useSystemCursor: some View {
         if #available(macOS 14, *) {
             Toggle("Use System Cursor", isOn: $textEditing.useSystemCursor)

CodeEdit/Features/SourceControl/Client/GitClient+Status.swift

@@ -75,7 +75,8 @@ extension GitClient {
             case "!", "#": // Ignored files or Header
                 try substringToNextNull(from: &index, output: output) // move the index to the next line.
             default:
-                throw GitClientError.statusInvalidChangeType(output[typeIndex])
+                // Skip unknown entry types (e.g. future porcelain v2 types or unexpected output)
+                try substringToNextNull(from: &index, output: output)
             }
         }
 

CodeEdit/WorkspaceView.swift

@@ -87,7 +87,6 @@ struct WorkspaceView: View {
                     .task {
                         // Only refresh git data if source control is enabled
                         guard sourceControlIsEnabled else { return }
-
                         do {
                             try await sourceControlManager.refreshRemotes()
                             try await sourceControlManager.refreshStashEntries()

CodeEditTests/Features/Settings/TextEditingSettingsTests.swift

@@ -0,0 +1,61 @@
+//
+//  TextEditingSettingsTests.swift
+//  CodeEditTests
+//
+//  Tests for Text Editing settings, including wrapped line indent (CodeEditTextView #18).
+//
+
+import Foundation
+import Testing
+@testable import CodeEdit
+
+@Suite("Text Editing Settings")
+struct TextEditingSettingsTests {
+
+    // MARK: - Wrapped line indent (indent wrapped lines - CodeEditTextView #18)
+
+    @Test("Default wrapped line indent is 4 spaces")
+    func defaultWrappedLineIndentIsFour() {
+        let settings = SettingsData.TextEditingSettings()
+        #expect(settings.wrappedLineIndent == 4)
+    }
+
+    @Test("Wrapped line indent round-trips through Codable")
+    func wrappedLineIndentRoundTrips() throws {
+        var settings = SettingsData.TextEditingSettings()
+        settings.wrappedLineIndent = 12
+
+        let encoded = try JSONEncoder().encode(settings)
+        let decoded = try JSONDecoder().decode(SettingsData.TextEditingSettings.self, from: encoded)
+        #expect(decoded.wrappedLineIndent == 12)
+    }
+
+    @Test("Decode with missing wrappedLineIndent uses default 4")
+    func decodeMissingWrappedLineIndentUsesDefault() throws {
+        // JSON without wrappedLineIndent key (e.g. existing user preferences)
+        let json = """
+        {"wrapLinesToEditorWidth": true}
+        """
+        let data = json.data(using: .utf8)!
+        // Decode a minimal object; TextEditingSettings init(from:) decodes each key with default
+        let decoded = try JSONDecoder().decode(SettingsData.TextEditingSettings.self, from: data)
+        #expect(decoded.wrappedLineIndent == 4)
+    }
+
+    @Test("Wrapped line indent accepts valid range 0–24")
+    func wrappedLineIndentValidRange() throws {
+        for value in [0, 4, 8, 12, 24] {
+            var settings = SettingsData.TextEditingSettings()
+            settings.wrappedLineIndent = value
+            let encoded = try JSONEncoder().encode(settings)
+            let decoded = try JSONDecoder().decode(SettingsData.TextEditingSettings.self, from: encoded)
+            #expect(decoded.wrappedLineIndent == value)
+        }
+    }
+
+    @Test("Wrap lines to editor width default is true")
+    func wrapLinesToEditorWidthDefault() {
+        let settings = SettingsData.TextEditingSettings()
+        #expect(settings.wrapLinesToEditorWidth == true)
+    }
+}