Merge branch 'main' into lsp-install

Author: thecoolwinter

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

@@ -5,8 +5,8 @@
 //  Created by Khan Winter on 6/4/22.
 //
 
-import Foundation
 import SwiftUI
+import Foundation
 
 extension View {
     func tabBarContextMenu(item: CEWorkspaceFile, isTemporary: Bool) -> some View {
@@ -149,24 +149,21 @@ struct EditorTabBarContextMenu: ViewModifier {
         guard let rootPath = workspace.workspaceFileManager?.folderUrl else {
             return
         }
-        // Calculate the relative path
-        var rootComponents = rootPath.standardizedFileURL.pathComponents
-        var destinationComponents = item.url.standardizedFileURL.pathComponents
-
-        // Remove any same path components
-        while !rootComponents.isEmpty && !destinationComponents.isEmpty
-                && rootComponents.first == destinationComponents.first {
-            rootComponents.remove(at: 0)
-            destinationComponents.remove(at: 0)
+        let destinationComponents = item.url.standardizedFileURL.pathComponents
+        let baseComponents = rootPath.standardizedFileURL.pathComponents
+
+        // Find common prefix length
+        var prefixCount = 0
+        while prefixCount < min(destinationComponents.count, baseComponents.count)
+                && destinationComponents[prefixCount] == baseComponents[prefixCount] {
+            prefixCount += 1
         }
-
-        // Make a "../" for each remaining component in the root URL
-        var relativePath: String = String(repeating: "../", count: rootComponents.count)
-        // Add the remaining components for the destination url.
-        relativePath += destinationComponents.joined(separator: "/")
+        // Build the relative path
+        let upPath = String(repeating: "../", count: baseComponents.count - prefixCount)
+        let downPath = destinationComponents[prefixCount...].joined(separator: "/")
 
         // Copy it to the clipboard
         NSPasteboard.general.clearContents()
-        NSPasteboard.general.setString(relativePath, forType: .string)
+        NSPasteboard.general.setString(upPath + downPath, forType: .string)
     }
 }

CodeEdit/Features/Editor/TabBar/Views/EditorTabBarContextMenu.swift

@@ -30,6 +30,8 @@ struct CodeFileView: View {
     var lineHeightMultiple
     @AppSettings(\.textEditing.wrapLinesToEditorWidth)
     var wrapLinesToEditorWidth
+    @AppSettings(\.textEditing.overscroll)
+    var overscroll
     @AppSettings(\.textEditing.font)
     var settingsFont
     @AppSettings(\.theme.useThemeBackground)
@@ -38,8 +40,8 @@ struct CodeFileView: View {
     var matchAppearance
     @AppSettings(\.textEditing.letterSpacing)
     var letterSpacing
-    @AppSettings(\.textEditing.bracketHighlight)
-    var bracketHighlight
+    @AppSettings(\.textEditing.bracketEmphasis)
+    var bracketEmphasis
     @AppSettings(\.textEditing.useSystemCursor)
     var useSystemCursor
 
@@ -48,6 +50,8 @@ struct CodeFileView: View {
 
     @ObservedObject private var themeModel: ThemeModel = .shared
 
+    @State private var treeSitter = TreeSitterClient()
+
     private var cancellables = Set<AnyCancellable>()
 
     private let isEditable: Bool
@@ -97,23 +101,6 @@ struct CodeFileView: View {
 
     @State private var font: NSFont = Settings[\.textEditing].font.current
 
-    @State private var bracketPairHighlight: BracketPairHighlight? = {
-        let theme = ThemeModel.shared.selectedTheme ?? ThemeModel.shared.themes.first!
-        let color = Settings[\.textEditing].bracketHighlight.useCustomColor
-        ? Settings[\.textEditing].bracketHighlight.color.nsColor
-        : theme.editor.text.nsColor.withAlphaComponent(0.8)
-        switch Settings[\.textEditing].bracketHighlight.highlightType {
-        case .disabled:
-            return nil
-        case .flash:
-            return .flash
-        case .bordered:
-            return .bordered(color: color)
-        case .underline:
-            return .underline(color: color)
-        }
-    }()
-
     @Environment(\.edgeInsets)
     private var edgeInsets
 
@@ -127,12 +114,15 @@ struct CodeFileView: View {
             indentOption: (codeFile.indentOption ?? indentOption).textViewOption(),
             lineHeight: lineHeightMultiple,
             wrapLines: codeFile.wrapLines ?? wrapLinesToEditorWidth,
+            editorOverscroll: overscroll.overscrollPercentage,
             cursorPositions: $cursorPositions,
             useThemeBackground: useThemeBackground,
+            highlightProviders: [treeSitter],
             contentInsets: edgeInsets.nsEdgeInsets,
+            additionalTextInsets: NSEdgeInsets(top: 2, left: 0, bottom: 0, right: 0),
             isEditable: isEditable,
             letterSpacing: letterSpacing,
-            bracketPairHighlight: bracketPairHighlight,
+            bracketPairEmphasis: getBracketPairEmphasis(),
             useSystemCursor: useSystemCursor,
             undoManager: undoManager,
             coordinators: textViewCoordinators
@@ -151,19 +141,18 @@ struct CodeFileView: View {
         .onChange(of: settingsFont) { newFontSetting in
             font = newFontSetting.current
         }
-        .onChange(of: bracketHighlight) { _ in
-            bracketPairHighlight = getBracketPairHighlight()
-        }
     }
 
-    private func getBracketPairHighlight() -> BracketPairHighlight? {
-        let color = if Settings[\.textEditing].bracketHighlight.useCustomColor {
-            Settings[\.textEditing].bracketHighlight.color.nsColor
+    /// Determines the style of bracket emphasis based on the `bracketEmphasis` setting and the current theme.
+    /// - Returns: The emphasis style to use for bracket pair emphasis.
+    private func getBracketPairEmphasis() -> BracketPairEmphasis? {
+        let color = if Settings[\.textEditing].bracketEmphasis.useCustomColor {
+            Settings[\.textEditing].bracketEmphasis.color.nsColor
         } else {
             currentTheme.editor.text.nsColor.withAlphaComponent(0.8)
         }
 
-        switch Settings[\.textEditing].bracketHighlight.highlightType {
+        switch Settings[\.textEditing].bracketEmphasis.highlightType {
         case .disabled:
             return nil
         case .flash:

CodeEdit/Features/Editor/Views/CodeFileView.swift

@@ -46,8 +46,8 @@ struct EditorAreaView: View {
         }
 
         var editorInsetAmount: Double {
-            let tabBarHeight = shouldShowTabBar ? (EditorTabBarView.height + 1) : 0
-            let jumpBarHeight = showEditorJumpBar ? (EditorJumpBarView.height + 1) : 0
+            let tabBarHeight = shouldShowTabBar ? (EditorTabBarView.height) : 0
+            let jumpBarHeight = showEditorJumpBar ? (EditorJumpBarView.height) : 0
             return tabBarHeight + jumpBarHeight
         }
 

CodeEdit/Features/Editor/Views/EditorAreaView.swift

@@ -55,6 +55,9 @@ final class ProjectNavigatorMenu: NSMenu {
         let openExternalEditor = menuItem("Open with External Editor", action: #selector(openWithExternalEditor))
         let openAs = menuItem("Open As", action: nil)
 
+        let copyPath = menuItem("Copy Path", action: #selector(copyPath))
+        let copyRelativePath = menuItem("Copy Relative Path", action: #selector(copyRelativePath))
+
         let showFileInspector = menuItem("Show File Inspector", action: nil)
 
         let newFile = menuItem("New File...", action: #selector(newFile))
@@ -91,6 +94,9 @@ final class ProjectNavigatorMenu: NSMenu {
             openExternalEditor,
             openAs,
             NSMenuItem.separator(),
+            copyPath,
+            copyRelativePath,
+            NSMenuItem.separator(),
             showFileInspector,
             NSMenuItem.separator(),
             newFile,

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorMenu.swift

@@ -222,6 +222,42 @@ extension ProjectNavigatorMenu {
         }
     }
 
+    /// Copies the absolute path of the selected files
+    @objc
+    func copyPath() {
+        let paths = selectedItems().map {
+            $0.url.standardizedFileURL.path
+        }.sorted().joined(separator: "\n")
+        NSPasteboard.general.clearContents()
+        NSPasteboard.general.setString(paths, forType: .string)
+    }
+
+    /// Copies the relative path of the selected files
+    @objc
+    func copyRelativePath() {
+        guard let rootPath = workspace?.workspaceFileManager?.folderUrl else {
+            return
+        }
+        let paths = selectedItems().map {
+            let destinationComponents = $0.url.standardizedFileURL.pathComponents
+            let baseComponents = rootPath.standardizedFileURL.pathComponents
+
+            // Find common prefix length
+            var prefixCount = 0
+            while prefixCount < min(destinationComponents.count, baseComponents.count)
+                    && destinationComponents[prefixCount] == baseComponents[prefixCount] {
+                prefixCount += 1
+            }
+            // Build the relative path
+            let upPath = String(repeating: "../", count: baseComponents.count - prefixCount)
+            let downPath = destinationComponents[prefixCount...].joined(separator: "/")
+            return upPath + downPath
+        }.sorted().joined(separator: "\n")
+
+        NSPasteboard.general.clearContents()
+        NSPasteboard.general.setString(paths, forType: .string)
+    }
+
     private func reloadData() {
         sender.outlineView.reloadData()
         sender.filteredContentChildren.removeAll()

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorMenuActions.swift

@@ -14,20 +14,25 @@ extension SettingsData {
     struct TextEditingSettings: Codable, Hashable, SearchableSettingsPage {
 
         var searchKeys: [String] {
-            [
+            var keys = [
                 "Prefer Indent Using",
                 "Tab Width",
                 "Wrap lines to editor width",
+                "Editor Overscroll",
                 "Font",
                 "Font Size",
                 "Font Weight",
                 "Line Height",
                 "Letter Spacing",
                 "Autocomplete braces",
                 "Enable type-over completion",
+                "Bracket Pair Emphasis",
                 "Bracket Pair Highlight"
             ]
-            .map { NSLocalizedString($0, comment: "") }
+            if #available(macOS 14.0, *) {
+                keys.append("System Cursor")
+            }
+            return keys.map { NSLocalizedString($0, comment: "") }
         }
 
         /// An integer indicating how many spaces a `tab` will appear as visually.
@@ -49,6 +54,9 @@ extension SettingsData {
         /// A flag indicating whether to wrap lines to editor width
         var wrapLinesToEditorWidth: Bool = true
 
+        /// The percentage of overscroll to apply to the text view
+        var overscroll: OverscrollOption = .medium
+
         /// A multiplier for setting the line height. Defaults to `1.2`
         var lineHeightMultiple: Double = 1.2
 
@@ -57,7 +65,7 @@ extension SettingsData {
         var letterSpacing: Double = 1.0
 
         /// The behavior of bracket pair highlights.
-        var bracketHighlight: BracketPairHighlight = BracketPairHighlight()
+        var bracketEmphasis: BracketPairEmphasis = BracketPairEmphasis()
 
         /// Use the system cursor for the source editor.
         var useSystemCursor: Bool = true
@@ -88,6 +96,10 @@ extension SettingsData {
                 Bool.self,
                 forKey: .wrapLinesToEditorWidth
             ) ?? true
+            self.overscroll = try container.decodeIfPresent(
+                OverscrollOption.self,
+                forKey: .overscroll
+            ) ?? .medium
             self.lineHeightMultiple = try container.decodeIfPresent(
                 Double.self,
                 forKey: .lineHeightMultiple
@@ -96,10 +108,10 @@ extension SettingsData {
                 Double.self,
                 forKey: .letterSpacing
             ) ?? 1
-            self.bracketHighlight = try container.decodeIfPresent(
-                BracketPairHighlight.self,
-                forKey: .bracketHighlight
-            ) ?? BracketPairHighlight()
+            self.bracketEmphasis = try container.decodeIfPresent(
+                BracketPairEmphasis.self,
+                forKey: .bracketEmphasis
+            ) ?? BracketPairEmphasis()
             if #available(macOS 14, *) {
                 self.useSystemCursor = try container.decodeIfPresent(Bool.self, forKey: .useSystemCursor) ?? true
             } else {
@@ -153,7 +165,7 @@ extension SettingsData {
             }
         }
 
-        struct BracketPairHighlight: Codable, Hashable {
+        struct BracketPairEmphasis: Codable, Hashable {
             /// The type of highlight to use
             var highlightType: HighlightType = .flash
             var useCustomColor: Bool = false
@@ -167,6 +179,22 @@ extension SettingsData {
                 case underline
             }
         }
+
+        enum OverscrollOption: String, Codable {
+            case none
+            case small
+            case medium
+            case large
+
+            var overscrollPercentage: CGFloat {
+                switch self {
+                case .none: return 0
+                case .small: return 0.25
+                case .medium: return 0.5
+                case .large: return 0.75
+                }
+            }
+        }
     }
 
     struct EditorFont: Codable, Hashable {