Clean Up Code (#1737)

* Cleaning up code

* Removed unnecessary line

* Update SettingsView.swift

* Update Package.resolved

* Remove commented line

* Optimize .map

* Naming fixes

* Move Acknowledgements and Contributors folder under the About folder

* Fix comment

* Updated fileManager variable to a normal variable instead of a computed one

* Rearranged files in the Git folder

* Fix All Warnings, Use Non-Optional String

* Revert One String Decode

* Upgrade Introspect Dependency, Remove Final Warnings

* Fix Introspect Error

* Reordered some files in the Editor feature folder

* Removed extensions folder in CEWorkspace feature folder

* Longer Autosave Debounce

---------

Co-authored-by: Matthijs Eikelenboom <matthijs697@live.nl>
Co-authored-by: Khan Winter <35942988+thecoolwinter@users.noreply.github.com>

Author: 3 people

.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  
+  - DerivedData
 
 opt_in_rules:
   - attributes

CodeEdit.xcodeproj/project.pbxproj

@@ -1,5 +1,5 @@
 {
-  "originHash" : "41fcbec1ecbb7853d9ead798bba9d46f35f28767f4d41a009c8eeee022e99a84",
+  "originHash" : "f3dd40f19b32a2b522dee7a1e94ceb60afbdb1a028938883adffc7328ef9d804",
   "pins" : [
     {
       "identity" : "anycodable",
@@ -15,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/CodeEditApp/CodeEditKit",
       "state" : {
-        "revision" : "bf76c0240589a38b504a703363ab85fcedfbc732",
-        "version" : "0.1.1"
+        "revision" : "ad28213a968586abb0cb21a8a56a3587227895f1",
+        "version" : "0.1.2"
       }
     },
     {
@@ -123,8 +123,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
-        "version" : "1.1.0"
+        "revision" : "ee97538f5b81ae89698fd95938896dec5217b148",
+        "version" : "1.1.1"
       }
     },
     {
@@ -150,8 +150,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/lukepistrol/SwiftLintPlugin",
       "state" : {
-        "revision" : "ea6d3ca895b49910f790e98e4b4ca658e0fe490e",
-        "version" : "0.54.0"
+        "revision" : "a0f7b12c7be228592d924f29f654ebbd924ac9c5",
+        "version" : "0.55.1"
       }
     },
     {
@@ -175,10 +175,10 @@
     {
       "identity" : "swiftui-introspect",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/siteline/SwiftUI-Introspect",
+      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
       "state" : {
-        "revision" : "121c146fe591b1320238d054ae35c81ffa45f45a",
-        "version" : "0.12.0"
+        "revision" : "668a65735751432b640260c56dfa621cec568368",
+        "version" : "1.2.0"
       }
     },
     {

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

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

CodeEdit.xcodeproj/xcshareddata/xcschemes/CodeEdit.xcscheme

@@ -117,11 +117,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
 
     func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {
         let projects: [String] = CodeEditDocumentController.shared.documents
-            .map { doc in
-                (doc as? WorkspaceDocument)?.fileURL?.path
-            }
-            .filter { $0 != nil }
-            .map { $0! }
+            .compactMap { ($0 as? WorkspaceDocument)?.fileURL?.path }
 
         UserDefaults.standard.set(projects, forKey: AppDelegate.recoverWorkspacesKey)
 

CodeEdit/AppDelegate.swift

@@ -12,9 +12,6 @@ struct CodeEditApp: App {
     @NSApplicationDelegateAdaptor var appdelegate: AppDelegate
     @ObservedObject var settings = Settings.shared
 
-    @Environment(\.openWindow)
-    var openWindow
-
     let updater: SoftwareUpdater = SoftwareUpdater()
 
     init() {

CodeEdit/CodeEditApp.swift

@@ -1,5 +1,5 @@
 //
-//  BlurView.swift
+//  EffectView.swift
 //  CodeEditModules/CodeEditUI
 //
 //  Created by Rehatbir Singh on 15/03/2022.

CodeEdit/Features/Acknowledgements/ViewModels/AcknowledgementsViewModel.swift renamed to CodeEdit/Features/About/Acknowledgements/ViewModels/AcknowledgementsViewModel.swift

@@ -75,7 +75,6 @@ private struct NewListTableItemView: View {
                 .disabled(key.isEmpty || value.isEmpty)
             }
             .padding(.horizontal, 20)
-//            .padding(.top, 2)
             .padding(.bottom, 20)
         }
         .frame(maxWidth: 480)

CodeEdit/Features/Acknowledgements/Views/AcknowledgementRowView.swift renamed to CodeEdit/Features/About/Acknowledgements/Views/AcknowledgementRowView.swift

@@ -7,7 +7,6 @@
 
 import SwiftUI
 import Combine
-import Introspect
 
 struct PaneTextField<LeadingAccessories: View, TrailingAccessories: View>: View {
     @Environment(\.colorScheme)

CodeEdit/Features/Acknowledgements/Views/AcknowledgementsView.swift renamed to CodeEdit/Features/About/Acknowledgements/Views/AcknowledgementsView.swift

@@ -1,5 +1,5 @@
 //
-//  OverlayPanel.swift
+//  SearchPanel.swift
 //  CodeEditModules/CodeEditUI
 //
 //  Created by Pavel Kasila on 20.03.22.

CodeEdit/Features/Acknowledgements/Views/AcknowledgementsWindowController.swift renamed to CodeEdit/Features/About/Acknowledgements/Views/AcknowledgementsWindowController.swift

@@ -1,5 +1,5 @@
 //
-//  OverlayWindow.swift
+//  SearchPanelView.swift
 //  CodeEdit
 //
 //  Created by Khan Winter on 3/17/23.

CodeEdit/Features/Acknowledgements/Views/ParsePackagesResolved.swift renamed to CodeEdit/Features/About/Acknowledgements/Views/ParsePackagesResolved.swift

@@ -80,7 +80,7 @@ struct XcodeButtonStyle: ButtonStyle {
             return (3, 8)
         case .large:
             return (6, 12)
-        @unknown default:
+        default:
             return (4, 8)
         }
     }

CodeEdit/Features/Contributors/ContributorRowView.swift renamed to CodeEdit/Features/About/Contributors/ContributorRowView.swift

@@ -34,6 +34,5 @@ final class QuickActionsViewModel: ObservableObject {
         }
         self.filteredCommands = CommandManager.shared.commands.filter { $0.title.localizedCaseInsensitiveContains(val) }
         self.selected = self.filteredCommands.first
-
     }
 }

CodeEdit/Features/Contributors/ContributorsView.swift renamed to CodeEdit/Features/About/Contributors/ContributorsView.swift

@@ -96,7 +96,7 @@ final class CodeFileDocument: NSDocument, ObservableObject {
 
     // MARK: - NSDocument
 
-    override class var autosavesInPlace: Bool {
+    override static var autosavesInPlace: Bool {
         Settings.shared.preferences.general.isAutoSaveOn
     }
 

CodeEdit/Features/Contributors/Model/Contributor.swift renamed to CodeEdit/Features/About/Contributors/Model/Contributor.swift

@@ -12,9 +12,7 @@ final class CodeEditDocumentController: NSDocumentController {
     @Environment(\.openWindow)
     private var openWindow
 
-    lazy var fileManager: FileManager = {
-        FileManager.default
-    }()
+    private let fileManager = FileManager.default
 
     override func newDocument(_ sender: Any?) {
         guard let newDocumentUrl = self.newDocumentUrl else { return }

CodeEdit/Features/CEWorkspace/Extensions/CEWorkspaceSettingsData+ProjectSettings.swift renamed to CodeEdit/Features/CEWorkspace/Models/CEWorkspaceSettingsData+ProjectSettings.swift

@@ -22,20 +22,13 @@ class LazyStringLoader {
         if fileHandle == nil {
             do {
                 fileHandle = try FileHandle(forReadingFrom: fileURL)
+                guard let data = try fileHandle?.read(upToCount: chunkSize) else {
+                    return nil
+                }
+                return String(decoding: data, as: UTF8.self)
             } catch {
-
-            }
-
-            var data = Data()
-            let semaphore = DispatchSemaphore(value: 0)
-
-            do {
-                data = try fileHandle?.read(upToCount: chunkSize) ?? Data()
-            } catch {
-
+                return nil
             }
-
-            return String(data: data, encoding: .utf8)
         }
         return nil
     }

CodeEdit/Features/CEWorkspace/Extensions/CEWorkspaceSettingsData+TasksSettings.swift renamed to CodeEdit/Features/CEWorkspace/Models/CEWorkspaceSettingsData+TasksSettings.swift

@@ -180,10 +180,10 @@ extension WorkspaceDocument.SearchState {
     /// await evaluateFile(query: "example", searchResult: &resultModel)
     /// ```
     private func evaluateFile(query: String, searchResult: inout SearchResultModel) async {
-        guard let data = try? Data(contentsOf: searchResult.file.url),
-              let fileContent = String(data: data, encoding: .utf8) else {
+        guard let data = try? Data(contentsOf: searchResult.file.url) else {
             return
         }
+        let fileContent = String(decoding: data, as: UTF8.self)
 
         // Attempt to create a regular expression from the provided query
         guard let regex = try? NSRegularExpression(

CodeEdit/Features/CodeEditUI/Views/EffectView.swift

@@ -63,7 +63,7 @@ final class WorkspaceDocument: NSDocument, ObservableObject, NSToolbarDelegate {
         ".DS_Store"
     ]
 
-    override class var autosavesInPlace: Bool {
+    override static var autosavesInPlace: Bool {
         false
     }
 

CodeEdit/Features/CodeEditUI/Views/KeyValueTable.swift

@@ -8,7 +8,6 @@
 import Combine
 import Foundation
 import DequeModule
-import OrderedCollections
 import os
 
 class EditorManager: ObservableObject {
@@ -30,8 +29,6 @@ class EditorManager: ObservableObject {
     /// History of last-used editors.
     var activeEditorHistory: Deque<() -> Editor?> = []
 
-    var fileDocuments: [CEWorkspaceFile: CodeFileDocument] = [:]
-
     /// notify listeners whenever tab selection changes on the active editor.
     var tabBarTabIdSubject = PassthroughSubject<String?, Never>()
     var cancellable: AnyCancellable?

CodeEdit/Features/CodeEditUI/Views/PaneTextField.swift

@@ -69,8 +69,6 @@ final class PathBarMenuItem: NSMenuItem {
         self.fileItem = fileItem
         self.tappedOpenFile = tappedOpenFile
         super.init(title: fileItem.name, action: #selector(openFile), keyEquivalent: "")
-
-        let icon = fileItem.systemImage
         var color = NSColor(fileItem.iconColor)
         isEnabled = true
         target = self

CodeEdit/Features/CodeEditUI/Views/SearchPanel.swift

@@ -19,7 +19,7 @@ struct EditorTabBarLeadingAccessories: View {
 
     var body: some View {
         HStack(spacing: 0) {
-            if let otherEditor {
+            if otherEditor != nil {
                 EditorTabBarAccessoryIcon(
                     icon: .init(systemName: "multiply"),
                     action: { [weak editor] in

CodeEdit/Features/CodeEditUI/Views/SearchPanelView.swift

@@ -67,7 +67,7 @@ struct CodeFileView: View {
         codeFile
             .contentCoordinator
             .textUpdatePublisher
-            .debounce(for: 0.25, scheduler: DispatchQueue.main)
+            .debounce(for: 1.0, scheduler: DispatchQueue.main)
             .sink { _ in
                 codeFile.updateChangeCount(.changeDone)
                 codeFile.autosave(withImplicitCancellability: false) { _ in }

CodeEdit/Features/CodeEditUI/Views/SegmentedControlImproved.swift

@@ -57,26 +57,25 @@ struct ExtensionSceneView: NSViewControllerRepresentable {
         var connection: NSXPCConnection?
 
         func publishEnvironment(data: Data) {
-            @Decoded<Callbacks> var data = data
-            guard let $data else { return }
-            switch $data {
+            guard let decodedCallbacks = try? JSONDecoder().decode(Callbacks.self, from: data) else { return }
+            switch decodedCallbacks {
             case .openWindow(let id):
                 openWindow(id)
             }
         }
 
-        func updateEnvironment(@Encoded _ value: _CEEnvironment) {
-            guard let $value else { return }
+        func updateEnvironment(_ value: _CEEnvironment) {
+            guard let newEnvironmentData = try? JSONEncoder().encode(value) else { return }
 
             guard isOnline else {
-                toPublish = $value
+                toPublish = newEnvironmentData
                 return
             }
 
             Task {
                 do {
                     try await connection!.withService { (service: EnvironmentPublisherObjc) in
-                        service.publishEnvironment(data: $value)
+                        service.publishEnvironment(data: newEnvironmentData)
                     }
                 } catch {
                     print(error)

CodeEdit/Features/Commands/ViewModels/QuickActionsViewModel.swift

@@ -89,7 +89,8 @@ struct GitHubOAuthConfiguration: GitRouterConfiguration {
                     if response.statusCode != 200 {
                         return
                     } else {
-                        if let data, let string = String(data: data, encoding: .utf8) {
+                        if let data {
+                            let string = String(decoding: data, as: UTF8.self)
                             let accessToken = self.accessTokenFromResponse(string)
                             if let accessToken {
                                 let config = GitHubTokenConfiguration(accessToken, url: self.apiEndpoint ?? "")

CodeEdit/Features/Documents/CodeFileDocument.swift

@@ -69,11 +69,9 @@ extension GitJSONPostRouter {
                         with: data,
                         options: .mutableContainers
                     ) as? [String: Any] {
-
                         userInfo[gitErrorKey] = json as Any?
-
-                    } else if let data,
-                              let string = String(data: data, encoding: .utf8) {
+                        // swiftlint:disable:next non_optional_string_data_conversion
+                    } else if let data, let string = String(data: data, encoding: .utf8) {
                         userInfo[gitErrorKey] = string as Any?
                     }
 
@@ -125,10 +123,9 @@ extension GitJSONPostRouter {
                     with: responseTuple.0,
                     options: .mutableContainers
                 ) as? [String: Any] {
-
                     userInfo[gitErrorKey] = json as Any?
-
-                } else if let string = String(data: responseTuple.0, encoding: String.Encoding.utf8) {
+                // swiftlint:disable:next non_optional_string_data_conversion
+                } else if let string = String(data: responseTuple.0, encoding: .utf8) {
                     userInfo[gitErrorKey] = string as Any?
                 }
                 throw NSError(domain: configuration?.errorDomain ?? "", code: response.statusCode, userInfo: userInfo)
@@ -165,9 +162,8 @@ extension GitJSONPostRouter {
                     with: data,
                     options: .mutableContainers
                 ) as? [String: Any] {
-
                     userInfo[gitErrorKey] = json as Any?
-
+                    // swiftlint:disable:next non_optional_string_data_conversion
                 } else if let data, let string = String(data: data, encoding: String.Encoding.utf8) {
                     userInfo[gitErrorKey] = string as Any?
                 }
@@ -219,8 +215,8 @@ extension GitJSONPostRouter {
                 with: responseTuple.0,
                 options: .mutableContainers
             ) as? [String: Any] {
-
                 userInfo[gitErrorKey] = json as Any?
+                // swiftlint:disable:next non_optional_string_data_conversion
             } else if let string = String(data: responseTuple.0, encoding: String.Encoding.utf8) {
                 userInfo[gitErrorKey] = string as Any?
             }

CodeEdit/Features/Documents/Controllers/CodeEditDocumentController.swift

@@ -206,8 +206,8 @@ final class SourceControlManager: ObservableObject {
     }
 
     /// Apply stash entry
-    func applyStashEntry(stashEntry: GitStashEntry?) async throws {
-        try await gitClient.applyStashEntry(stashEntry?.index)
+    func applyStashEntry(stashEntry: GitStashEntry) async throws {
+        try await gitClient.applyStashEntry(stashEntry.index)
         try await refreshStashEntries()
         await refreshAllChangedFiles()
     }

CodeEdit/Features/Documents/LazyStringLoader.swift

@@ -94,7 +94,7 @@ struct SourceControlNavigatorRepositoryView: View {
                 Button("Apply") {
                     if let stashEntry = stashEntryToApply {
                         Task {
-                            try await sourceControlManager.applyStashEntry(stashEntry: stashEntryToApply)
+                            try await sourceControlManager.applyStashEntry(stashEntry: stashEntry)
                             applyStashedChangesIsPresented = false
                             stashEntryToApply = nil
                         }

CodeEdit/Features/Documents/WorkspaceDocument+Find.swift

@@ -59,11 +59,11 @@ struct NSTableViewWrapper<Content: View, Item: Identifiable & Hashable>: NSViewR
         }
     }
 
-    func makeCoordinator() -> Coordinator<Content> {
+    func makeCoordinator() -> Coordinator {
         Coordinator(parent: self)
     }
 
-    class Coordinator<Content: View>: NSObject, NSTableViewDelegate, NSTableViewDataSource {
+    class Coordinator: NSObject, NSTableViewDelegate, NSTableViewDataSource {
 
         var parent: NSTableViewWrapper
 

CodeEdit/Features/Documents/WorkspaceDocument.swift

@@ -1,5 +1,5 @@
 //
-//  SettingsModel.swift
+//  Settings.swift
 //  CodeEditModules/Settings
 //
 //  Created by Lukas Pistrol on 01.04.22.

CodeEdit/Features/Editor/Models/EditorTabSwitchExtension.swift renamed to CodeEdit/Features/Editor/Models/Editor+TabSwitch.swift

@@ -5,7 +5,6 @@
 //  Created by Wouter Hennen on 13/04/2023.
 //
 
-import Foundation
 import AppKit
 
 extension NSSplitViewItem {