Addressing features/bugs with the terminal (#1117)

* Implementing changing cursor style for terminal along with adding in the setting.

* renaming to Cursor, fixing a bug in the case statement

* Fix formatting error

* Update SwiftTerm to reflect main

* small fix for update NSView

* Fix lint error

* Setting SwiftTerm to 1.2.0 target and changing preferences view.

Author: bombardier200

.swiftlint.yml

@@ -15,7 +15,7 @@ identifier_name:
 # paths to ignore during linting.
 excluded:
   - CodeEditModules/.build # Where Swift Package Manager checks out dependency sources
-  
+  - DerivedData  
 opt_in_rules:
   - empty_count
   - closure_spacing

CodeEdit.xcodeproj/project.pbxproj

@@ -3748,7 +3748,7 @@
 			repositoryURL = "https://github.com/migueldeicaza/SwiftTerm.git";
 			requirement = {
 				kind = exactVersion;
-				version = 1.0.7;
+				version = 1.2.0;
 			};
 		};
 		58F2EB15292FB74D004A9BDE /* XCRemoteSwiftPackageReference "CodeEditTextView" */ = {

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

@@ -27,6 +27,12 @@ extension AppPreferences {
         /// The font to use in terminal.
         var font: TerminalFont = .init()
 
+        // The cursor style to use in terminal
+        var cursorStyle: TerminalCursorStyle = .block
+
+        // Toggle for blinking cursor or not
+        var cursorBlink: Bool = false
+
         /// Default initializer
         init() {}
 
@@ -37,6 +43,11 @@ extension AppPreferences {
             self.optionAsMeta = try container.decodeIfPresent(Bool.self, forKey: .optionAsMeta) ?? false
             self.shell = try container.decodeIfPresent(TerminalShell.self, forKey: .shell) ?? .system
             self.font = try container.decodeIfPresent(TerminalFont.self, forKey: .font) ?? .init()
+            self.cursorStyle = try container.decodeIfPresent(
+                TerminalCursorStyle.self,
+                forKey: .cursorStyle
+            ) ?? .block
+            self.cursorBlink = try container.decodeIfPresent(Bool.self, forKey: .cursorBlink) ?? false
         }
     }
 
@@ -50,6 +61,12 @@ extension AppPreferences {
         case system
     }
 
+    enum TerminalCursorStyle: String, Codable {
+        case block
+        case underline
+        case bar
+    }
+
     struct TerminalFont: Codable {
         /// Indicates whether or not to use a custom font
         var customFont: Bool = false

CodeEdit/Features/AppPreferences/Model/Terminal/TerminalPreferences.swift

@@ -26,6 +26,10 @@ struct TerminalPreferencesView: View {
             PreferencesSection("Font") {
                 fontSelector
             }
+            PreferencesSection("Cursor") {
+                cursorStyle
+                cursorBlink
+            }
         }
     }
 
@@ -41,6 +45,24 @@ struct TerminalPreferencesView: View {
         }
         .frame(width: inputWidth)
     }
+    private var cursorStyle: some View {
+        Picker("Terminal Cursor Style: ", selection: $prefs.preferences.terminal.cursorStyle) {
+            Text("Block")
+                .tag(AppPreferences.TerminalCursorStyle.block)
+            Text("Underline")
+                .tag(AppPreferences.TerminalCursorStyle.underline)
+            Text("Bar")
+                .tag(AppPreferences.TerminalCursorStyle.bar)
+        }
+        .frame(width: inputWidth)
+    }
+
+    private var cursorBlink: some View {
+        HStack {
+            Toggle("Cursor Blink", isOn: $prefs.preferences.terminal.cursorBlink)
+            Text("Blink cursor")
+        }
+    }
 
     private var optionAsMetaToggle: some View {
         HStack {

CodeEdit/Features/AppPreferences/Sections/TerminalPreferences/TerminalPreferencesView.swift

@@ -73,6 +73,18 @@ struct TerminalEmulatorView: NSViewRepresentable {
         }
     }
 
+    private func getTerminalCursor() -> CursorStyle {
+            let blink = prefs.preferences.terminal.cursorBlink
+            switch prefs.preferences.terminal.cursorStyle {
+            case .block:
+                return blink ? .blinkBlock : .steadyBlock
+            case .underline:
+                return blink ? .blinkUnderline : .steadyUnderline
+            case .bar:
+                return blink ? .blinkBar : .steadyBar
+            }
+    }
+
     /// Gets the default shell from the current user and returns the string of the shell path.
     private func autoDetectDefaultShell() -> String {
         let bufsize = sysconf(_SC_GETPW_R_SIZE_MAX)
@@ -176,6 +188,7 @@ struct TerminalEmulatorView: NSViewRepresentable {
             terminal.selectedTextBackgroundColor = selectionColor
             terminal.nativeForegroundColor = textColor
             terminal.nativeBackgroundColor = prefs.preferences.terminal.useThemeBackground ? backgroundColor : .clear
+            terminal.cursorStyleChanged(source: terminal.getTerminal(), newStyle: getTerminalCursor())
             terminal.layer?.backgroundColor = .clear
             terminal.optionAsMetaKey = optionAsMeta
         }
@@ -205,6 +218,7 @@ struct TerminalEmulatorView: NSViewRepresentable {
         view.nativeBackgroundColor = prefs.preferences.terminal.useThemeBackground ? backgroundColor : .clear
         view.layer?.backgroundColor = .clear
         view.optionAsMetaKey = optionAsMeta
+        view.cursorStyleChanged(source: view.getTerminal(), newStyle: getTerminalCursor())
         view.appearance = colorAppearance
         if TerminalEmulatorView.lastTerminal[url.path] != nil {
             TerminalEmulatorView.lastTerminal[url.path] = view