Merge branch 'main' into itembox

Author: thecoolwinter

.github/scripts/test_app.sh

@@ -14,8 +14,13 @@ echo "SwiftLint Version: $(swiftlint --version)"
 
 export LC_CTYPE=en_US.UTF-8
 
+# xcbeautify flags: 
+# - renderer: render to gh actions
+# - q: quiet output
+# - is-ci: include test results in output
+
 set -o pipefail && arch -"${ARCH}" xcodebuild \
            -scheme CodeEdit \
            -destination "platform=OS X,arch=${ARCH}" \
            -skipPackagePluginValidation \
-           clean test | xcbeautify --renderer github-actions
+           clean test | xcbeautify --renderer github-actions -q --is-ci

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

@@ -143,6 +143,21 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
         }
     }
 
+    /// Opens the search navigator and focuses the search field
+    @IBAction func openSearchNavigator(_ sender: Any? = nil) {
+        if navigatorCollapsed {
+            toggleFirstPanel()
+        }
+
+        if let navigatorViewModel = navigatorSidebarViewModel,
+           let searchTab = navigatorViewModel.tabItems.first(where: { $0 == .search }) {
+            DispatchQueue.main.async {
+                self.workspace?.searchState?.shouldFocusSearchField = true
+                navigatorViewModel.setNavigatorTab(tab: searchTab)
+            }
+        }
+    }
+
     @IBAction func openQuickly(_ sender: Any?) {
         if let workspace, let state = workspace.openQuicklyViewModel {
             if let quickOpenPanel {

CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceDocument+SearchState.swift

@@ -35,6 +35,8 @@ extension WorkspaceDocument {
 
         @Published var findNavigatorStatus: FindNavigatorStatus = .none
 
+        @Published var shouldFocusSearchField: Bool = false
+
         unowned var workspace: WorkspaceDocument
         var tempSearchResults = [SearchResultModel]()
         var caseSensitive: Bool = false

CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenHighlightProvider.swift

@@ -166,7 +166,20 @@ final class SemanticTokenHighlightProvider<
         let rawTokens = storage.getTokensFor(range: lspRange)
         let highlights = tokenMap
             .decode(tokens: rawTokens, using: textView)
-            .filter({ $0.capture != nil || !$0.modifiers.isEmpty })
+            .compactMap { highlightRange -> HighlightRange? in
+                // Filter out empty ranges
+                guard highlightRange.capture != nil || !highlightRange.modifiers.isEmpty,
+                      // Clamp the highlight range to the queried range.
+                      let intersection = highlightRange.range.intersection(range),
+                      intersection.isEmpty == false else {
+                    return nil
+                }
+                return HighlightRange(
+                    range: intersection,
+                    capture: highlightRange.capture,
+                    modifiers: highlightRange.modifiers
+                )
+            }
         completion(.success(highlights))
     }
 }

CodeEdit/Features/NavigatorArea/FindNavigator/FindNavigatorForm.swift

@@ -25,63 +25,13 @@ struct FindNavigatorForm: View {
     @State private var preserveCase: Bool = false
     @State private var scopedToOpenEditors: Bool = false
     @State private var excludeSettings: Bool = true
+    @FocusState private var isSearchFieldFocused: Bool
 
     init(state: WorkspaceDocument.SearchState) {
         self.state = state
         selectedMode = state.selectedMode
     }
 
-    private func getMenuList(_ index: Int) -> [SearchModeModel] {
-        index == 0 ? SearchModeModel.SearchModes : selectedMode[index - 1].children
-    }
-
-    private func onSelectMenuItem(_ index: Int, searchMode: SearchModeModel) {
-        var newSelectedMode: [SearchModeModel] = []
-
-        switch index {
-        case 0:
-                newSelectedMode.append(searchMode)
-                self.updateSelectedMode(searchMode, searchModel: &newSelectedMode)
-                self.selectedMode = newSelectedMode
-        case 1:
-            if let firstMode = selectedMode.first {
-                newSelectedMode.append(contentsOf: [firstMode, searchMode])
-                if let thirdMode = searchMode.children.first {
-                    if let selectedThirdMode = selectedMode.third, searchMode.children.contains(selectedThirdMode) {
-                        newSelectedMode.append(selectedThirdMode)
-                    } else {
-                        newSelectedMode.append(thirdMode)
-                    }
-                }
-            }
-            self.selectedMode = newSelectedMode
-        case 2:
-            if let firstMode = selectedMode.first, let secondMode = selectedMode.second {
-                newSelectedMode.append(contentsOf: [firstMode, secondMode, searchMode])
-            }
-            self.selectedMode = newSelectedMode
-        default:
-            return
-        }
-    }
-
-    private func updateSelectedMode(_ searchMode: SearchModeModel, searchModel: inout [SearchModeModel]) {
-        if let secondMode = searchMode.children.first {
-            if let selectedSecondMode = selectedMode.second, searchMode.children.contains(selectedSecondMode) {
-                searchModel.append(contentsOf: selectedMode.dropFirst())
-            } else {
-                searchModel.append(secondMode)
-                if let thirdMode = secondMode.children.first, let selectedThirdMode = selectedMode.third {
-                    if secondMode.children.contains(selectedThirdMode) {
-                        searchModel.append(selectedThirdMode)
-                    } else {
-                        searchModel.append(thirdMode)
-                    }
-                }
-            }
-        }
-    }
-
     private var chevron: some View {
         Image(systemName: "chevron.compact.right")
             .foregroundStyle(.tertiary)
@@ -152,6 +102,7 @@ struct FindNavigatorForm: View {
                 },
                 hasValue: caseSensitive
             )
+            .focused($isSearchFieldFocused)
             .onSubmit {
                 if !state.searchQuery.isEmpty {
                     Task {
@@ -262,16 +213,65 @@ struct FindNavigatorForm: View {
                 }
             }
         }
+        .onReceive(state.$shouldFocusSearchField) { shouldFocus in
+            if shouldFocus {
+                isSearchFieldFocused = true
+                state.shouldFocusSearchField = false
+            }
+        }
         .lineLimit(1...5)
     }
 }
 
-extension Array {
-    var second: Element? {
-        self.count > 1 ? self[1] : nil
+extension FindNavigatorForm {
+    private func getMenuList(_ index: Int) -> [SearchModeModel] {
+        index == 0 ? SearchModeModel.SearchModes : selectedMode[index - 1].children
+    }
+
+    private func onSelectMenuItem(_ index: Int, searchMode: SearchModeModel) {
+        var newSelectedMode: [SearchModeModel] = []
+
+        switch index {
+        case 0:
+                newSelectedMode.append(searchMode)
+                self.updateSelectedMode(searchMode, searchModel: &newSelectedMode)
+                self.selectedMode = newSelectedMode
+        case 1:
+            if let firstMode = selectedMode.first {
+                newSelectedMode.append(contentsOf: [firstMode, searchMode])
+                if let thirdMode = searchMode.children.first {
+                    if let selectedThirdMode = selectedMode.third, searchMode.children.contains(selectedThirdMode) {
+                        newSelectedMode.append(selectedThirdMode)
+                    } else {
+                        newSelectedMode.append(thirdMode)
+                    }
+                }
+            }
+            self.selectedMode = newSelectedMode
+        case 2:
+            if let firstMode = selectedMode.first, let secondMode = selectedMode.second {
+                newSelectedMode.append(contentsOf: [firstMode, secondMode, searchMode])
+            }
+            self.selectedMode = newSelectedMode
+        default:
+            return
+        }
     }
 
-    var third: Element? {
-        self.count > 2 ? self[2] : nil
+    private func updateSelectedMode(_ searchMode: SearchModeModel, searchModel: inout [SearchModeModel]) {
+        if let secondMode = searchMode.children.first {
+            if let selectedSecondMode = selectedMode.second, searchMode.children.contains(selectedSecondMode) {
+                searchModel.append(contentsOf: selectedMode.dropFirst())
+            } else {
+                searchModel.append(secondMode)
+                if let thirdMode = secondMode.children.first, let selectedThirdMode = selectedMode.third {
+                    if secondMode.children.contains(selectedThirdMode) {
+                        searchModel.append(selectedThirdMode)
+                    } else {
+                        searchModel.append(thirdMode)
+                    }
+                }
+            }
+        }
     }
 }

CodeEdit/Features/TerminalEmulator/Model/ShellIntegration.swift

@@ -65,21 +65,21 @@ enum ShellIntegration {
             // Enable injection in our scripts.
             environment.append("\(Variables.ceInjection)=1")
 
-            if let execArgs = shell.execArguments(interactive: interactive, login: useLogin) {
-                args.append(execArgs)
-            }
-
             switch shell {
             case .bash:
                 try bash(&args)
             case .zsh:
-                try zsh(&args, &environment)
+                try zsh(&environment)
             }
 
             if useLogin {
                 environment.append("\(Variables.shellLogin)=1")
             }
 
+            if let execArgs = shell.execArguments(interactive: interactive, login: useLogin) {
+                args.append(execArgs)
+            }
+
             return args
         } catch {
             // catch so we can log this here
@@ -125,7 +125,6 @@ enum ShellIntegration {
     ///   - useLogin: Whether to use a login shell.
     ///   - interactive: Whether to use an interactive shell.
     private static func zsh(
-        _ args: inout [String],
         _ environment: inout [String]
     ) throws {
         // All injection script URLs

CodeEdit/Features/TerminalEmulator/Views/CETerminalView.swift

@@ -17,6 +17,17 @@ class CETerminalView: TerminalView {
         }
     }
 
+    override open var frame: CGRect {
+        get {
+            super.frame
+        }
+        set {
+            if newValue.size != .zero {
+                super.frame = newValue
+            }
+        }
+    }
+
     @objc
     override open func copy(_ sender: Any) {
         let range = selectedPositions()
@@ -25,4 +36,34 @@ class CETerminalView: TerminalView {
         pasteboard.clearContents()
         pasteboard.setString(text, forType: .string)
     }
+
+    override open func isAccessibilityElement() -> Bool {
+        true
+    }
+
+    override open func isAccessibilityEnabled() -> Bool {
+        true
+    }
+
+    override open func accessibilityLabel() -> String? {
+        "Terminal Emulator"
+    }
+
+    override open func accessibilityRole() -> NSAccessibility.Role? {
+        .textArea
+    }
+
+    override open func accessibilityValue() -> Any? {
+        terminal.getText(
+            start: Position(col: 0, row: 0),
+            end: Position(col: terminal.buffer.x, row: terminal.getTopVisibleRow() + terminal.rows)
+        )
+    }
+
+    override open func accessibilitySelectedText() -> String? {
+        let range = selectedPositions()
+        let text = terminal.getText(start: range.start, end: range.end)
+        return text
+    }
+
 }

CodeEdit/Features/UtilityArea/TerminalUtility/UtilityAreaTerminalSidebar.swift

@@ -72,6 +72,7 @@ struct UtilityAreaTerminalSidebar: View {
         }
         .accessibilityElement(children: .contain)
         .accessibilityLabel("Terminals")
+        .accessibilityIdentifier("terminalsList")
     }
 }
 

CodeEdit/Features/UtilityArea/TerminalUtility/UtilityAreaTerminalTab.swift

@@ -46,7 +46,6 @@ struct UtilityAreaTerminalTab: View {
             }
         } icon: {
             Image(systemName: "terminal")
-                .accessibilityHidden(true)
         }
         .contextMenu {
             Button("Rename...") {
@@ -63,5 +62,8 @@ struct UtilityAreaTerminalTab: View {
                 }
             }
         }
+        .accessibilityElement(children: .contain)
+        .accessibilityLabel(terminalTitle.wrappedValue)
+        .accessibilityIdentifier("terminalTab")
     }
 }

CodeEdit/Features/UtilityArea/TerminalUtility/UtilityAreaTerminalView.swift

@@ -117,6 +117,7 @@ struct UtilityAreaTerminalView: View {
                             )
                             .frame(height: max(0, constrainedHeight - 1))
                             .id(selectedTerminal.id)
+                            .accessibilityIdentifier("terminal")
                         }
                     }
                 } else {
@@ -167,6 +168,7 @@ struct UtilityAreaTerminalView: View {
             }
             utilityAreaViewModel.initializeTerminals(workspaceURL: workspaceURL)
         }
+        .accessibilityIdentifier("terminal-area")
     }
 
     @ViewBuilder var backgroundEffectView: some View {