Merge branch 'main' into feat/lsp-semantic-highlighter

Author: thecoolwinter

.github/scripts/test_app.sh

@@ -8,6 +8,7 @@ elif [ $1 = "arm" ]; then
     ARCH="arm64"
 fi
 
+echo "Building with Xcode: $(xcodebuild -version)"
 echo "Building with arch: ${ARCH}"
 echo "SwiftLint Version: $(swiftlint --version)"
 

CodeEdit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -9,12 +9,18 @@ import SwiftUI
 
 extension ButtonStyle where Self == BlurButtonStyle {
     static var blur: BlurButtonStyle { BlurButtonStyle() }
+    static var secondaryBlur: BlurButtonStyle { BlurButtonStyle(isSecondary: true) }
 }
 
 struct BlurButtonStyle: ButtonStyle {
+    var isSecondary: Bool = false
+
     @Environment(\.controlSize)
     var controlSize
 
+    @Environment(\.colorScheme)
+    var colorScheme
+
     var height: CGFloat {
         switch controlSize {
         case .large:
@@ -24,32 +30,40 @@ struct BlurButtonStyle: ButtonStyle {
         }
     }
 
-    @Environment(\.colorScheme)
-    var colorScheme
-
     func makeBody(configuration: Configuration) -> some View {
         configuration.label
+            .padding(.horizontal, 8)
             .frame(height: height)
-            .buttonStyle(.bordered)
             .background {
                 switch colorScheme {
                 case .dark:
-                    Color
-                        .gray
-                        .opacity(0.001)
-                        .overlay(.regularMaterial.blendMode(.plusLighter))
-                        .overlay(Color.gray.opacity(0.30))
-                        .overlay(Color.white.opacity(configuration.isPressed ? 0.20 : 0.00))
+                    ZStack {
+                        Color.gray.opacity(0.001)
+                        if isSecondary {
+                            Rectangle()
+                                .fill(.regularMaterial)
+                        } else {
+                            Rectangle()
+                                .fill(.regularMaterial)
+                                .blendMode(.plusLighter)
+                        }
+                        Color.gray.opacity(isSecondary ? 0.10 : 0.30)
+                        Color.white.opacity(configuration.isPressed ? 0.10 : 0.00)
+                    }
                 case .light:
-                    Color
-                        .gray
-                        .opacity(0.001)
-                        .overlay(.regularMaterial.blendMode(.darken))
-                        .overlay(Color.gray.opacity(0.15).blendMode(.plusDarker))
+                    ZStack {
+                        Color.gray.opacity(0.001)
+                        Rectangle()
+                            .fill(.regularMaterial)
+                            .blendMode(.darken)
+                        Color.gray.opacity(isSecondary ? 0.05 : 0.15)
+                            .blendMode(.plusDarker)
+                        Color.gray.opacity(configuration.isPressed ? 0.10 : 0.00)
+                    }
                 @unknown default:
                     Color.black
                 }
             }
-            .clipShape(RoundedRectangle(cornerRadius: 6))
+            .clipShape(RoundedRectangle(cornerRadius: controlSize == .large ? 6 : 5))
     }
 }

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -76,7 +76,7 @@ import Combine
 ///         "id": "uniqueTaskID",
 ///         "action": "update",
 ///         "title": "Updated Task Title",
-///         "message": "Updated Task Message"
+///         "message": "Updated Task Message",
 ///         "percentage": 0.5,
 ///         "isLoading": true
 ///     ]

CodeEdit.xcodeproj/xcshareddata/xcschemes/CodeEdit.xcscheme

@@ -258,7 +258,7 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
                 !newName.isEmpty &&
                 newName.isValidFilename &&
                 !FileManager.default.fileExists(
-                    atPath: self.url.deletingLastPathComponent().appendingPathComponent(newName).path
+                    atPath: self.url.deletingLastPathComponent().appending(path: newName).path
                 ) else {
             return false
         }

CodeEdit/Features/About/Views/BlurButtonStyle.swift

@@ -18,15 +18,15 @@ extension CEWorkspaceFileManager {
     func addFolder(folderName: String, toFile file: CEWorkspaceFile) throws -> CEWorkspaceFile {
         // Check if folder, if it is create folder under self, else create on same level.
         var folderUrl = (
-            file.isFolder ? file.url.appendingPathComponent(folderName)
-            : file.url.deletingLastPathComponent().appendingPathComponent(folderName)
+            file.isFolder ? file.url.appending(path: folderName)
+            : file.url.deletingLastPathComponent().appending(path: folderName)
         )
 
         // If a file/folder with the same name exists, add a number to the end.
         var fileNumber = 0
         while fileManager.fileExists(atPath: folderUrl.path) {
             fileNumber += 1
-            folderUrl = folderUrl.deletingLastPathComponent().appendingPathComponent("\(folderName)\(fileNumber)")
+            folderUrl = folderUrl.deletingLastPathComponent().appending(path: "\(folderName)\(fileNumber)")
         }
 
         // Create the folder
@@ -79,13 +79,13 @@ extension CEWorkspaceFileManager {
                 }
             }
 
-            var fileUrl = file.nearestFolder.appendingPathComponent("\(fileName)\(fileExtension)")
+            var fileUrl = file.nearestFolder.appending(path: "\(fileName)\(fileExtension)")
             // If a file/folder with the same name exists, add a number to the end.
             var fileNumber = 0
             while fileManager.fileExists(atPath: fileUrl.path) {
                 fileNumber += 1
                 fileUrl = fileUrl.deletingLastPathComponent()
-                    .appendingPathComponent("\(fileName)\(fileNumber)\(fileExtension)")
+                    .appending(path: "\(fileName)\(fileNumber)\(fileExtension)")
             }
 
             guard fileUrl.fileName.isValidFilename else {
@@ -227,7 +227,7 @@ extension CEWorkspaceFileManager {
             let fileExtension = fileUrl.pathExtension.isEmpty ? "" : ".\(fileUrl.pathExtension)"
             let fileName = fileExtension.isEmpty ? previousName :
             previousName.replacingOccurrences(of: fileExtension, with: "")
-            fileUrl = fileUrl.deletingLastPathComponent().appendingPathComponent("\(fileName) copy\(fileExtension)")
+            fileUrl = fileUrl.deletingLastPathComponent().appending(path: "\(fileName) copy\(fileExtension)")
         }
 
         if fileManager.fileExists(atPath: file.url.path) {

CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationHandler.swift

@@ -198,7 +198,7 @@ final class CEWorkspaceFileManager {
     /// - Parameter file: The parent element.
     /// - Returns: A child element with an associated parent.
     func createChild(_ url: URL, forParent file: CEWorkspaceFile) -> CEWorkspaceFile {
-        let relativeURL = URL(filePath: file.id).appendingPathComponent(url.lastPathComponent)
+        let relativeURL = URL(filePath: file.id).appending(path: url.lastPathComponent)
         let childId = relativeURL.relativePath
         let newFileItem = CEWorkspaceFile(id: childId, url: relativeURL)
         newFileItem.parent = file