Lint errors, project item location fixes

Author: FastestMolasses

CodeEdit.xcodeproj/project.pbxproj

@@ -1,5 +1,5 @@
 {
-  "originHash" : "3f6921a5ec30d1ecb6d6b205cf27a816c318246bb00f0ea367b997cc66527d32",
+  "originHash" : "9c699d730017e749c2b945e8435c6edd8169fe23742cc8fd8a58078ae48764ac",
   "pins" : [
     {
       "identity" : "anycodable",
@@ -31,7 +31,7 @@
     {
       "identity" : "codeeditsourceeditor",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/CodeEditApp/CodeEditSourceEditor",
+      "location" : "https://github.com/CodeEditApp/CodeEditSourceEditor.git",
       "state" : {
         "revision" : "7360f00bf7ec8e93b4833357bd254bef7e5c943d",
         "version" : "0.7.2"
@@ -51,8 +51,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/CodeEditApp/CodeEditTextView.git",
       "state" : {
-        "revision" : "86b980464bcb67693e2053283c7a99bdc6f358bc",
-        "version" : "0.7.3"
+        "revision" : "80911be6bcdae5e35ef5ed351adf6dda9b57e555",
+        "version" : "0.7.4"
       }
     },
     {
@@ -73,6 +73,24 @@
         "version" : "0.4.2"
       }
     },
+    {
+      "identity" : "fseventswrapper",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Frizlab/FSEventsWrapper",
+      "state" : {
+        "revision" : "70bbea4b108221fcabfce8dbced8502831c0ae04",
+        "version" : "2.1.0"
+      }
+    },
+    {
+      "identity" : "globpattern",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ChimeHQ/GlobPattern",
+      "state" : {
+        "revision" : "4ebb9e89e07cc475efa74f87dc6d21f4a9e060f8",
+        "version" : "0.1.1"
+      }
+    },
     {
       "identity" : "grdb.swift",
       "kind" : "remoteSourceControl",
@@ -82,10 +100,37 @@
         "version" : "5.26.1"
       }
     },
+    {
+      "identity" : "jsonrpc",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ChimeHQ/JSONRPC",
+      "state" : {
+        "revision" : "c6ec759d41a76ac88fe7327c41a77d9033943374",
+        "version" : "0.9.0"
+      }
+    },
+    {
+      "identity" : "languageclient",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ChimeHQ/LanguageClient",
+      "state" : {
+        "revision" : "f8fdeaed850fbc3e542cd038e952758887f6be5d",
+        "version" : "0.8.0"
+      }
+    },
+    {
+      "identity" : "languageserverprotocol",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ChimeHQ/LanguageServerProtocol",
+      "state" : {
+        "revision" : "ac76fccf0e981c8e30c5ee4de1b15adc1decd697",
+        "version" : "0.13.2"
+      }
+    },
     {
       "identity" : "logstream",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/CodeEditApp/LogStream",
+      "location" : "https://github.com/Wouter01/LogStream",
       "state" : {
         "revision" : "6f83694b2675dcf3b1cea0a52546ff4469c18282",
         "version" : "1.3.0"
@@ -100,6 +145,24 @@
         "version" : "0.2.1"
       }
     },
+    {
+      "identity" : "processenv",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ChimeHQ/ProcessEnv",
+      "state" : {
+        "revision" : "83f1ebc9dd6fb1db0bd89a3fcae00488a0f3fdd9",
+        "version" : "1.0.0"
+      }
+    },
+    {
+      "identity" : "queue",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattmassicotte/Queue",
+      "state" : {
+        "revision" : "8d6f936097888f97011610ced40313655dc5948d",
+        "version" : "0.1.4"
+      }
+    },
     {
       "identity" : "rearrange",
       "kind" : "remoteSourceControl",
@@ -109,6 +172,15 @@
         "version" : "1.8.1"
       }
     },
+    {
+      "identity" : "semaphore",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/groue/Semaphore",
+      "state" : {
+        "revision" : "f1c4a0acabeb591068dea6cffdd39660b86dec28",
+        "version" : "0.0.8"
+      }
+    },
     {
       "identity" : "sparkle",
       "kind" : "remoteSourceControl",
@@ -150,8 +222,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/lukepistrol/SwiftLintPlugin",
       "state" : {
-        "revision" : "ea6d3ca895b49910f790e98e4b4ca658e0fe490e",
-        "version" : "0.54.0"
+        "revision" : "a0f7b12c7be228592d924f29f654ebbd924ac9c5",
+        "version" : "0.55.1"
       }
     },
     {

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

@@ -44,16 +44,13 @@ public struct AboutView: View {
         // if anyone knows of a better way to do this feel free to refactor
         .background(.regularMaterial.opacity(0))
         .background(EffectView(.popover, blendingMode: .behindWindow).ignoresSafeArea())
-//        .background {
-//            Button("") {
-//                dismiss()
-//            }
-//            .keyboardShortcut(.escape, modifiers: [])
-//            .hidden()
-//        }
-        .onExitCommand(perform: {
-            dismiss()
-        })
+        .background {
+            Button("") {
+                dismiss()
+            }
+            .keyboardShortcut(.escape, modifiers: [])
+            .hidden()
+        }
         .task {
             if let window = NSApp.findWindow(.about) {
                 window.styleMask = [.closable, .fullSizeContentView, .titled, .nonactivatingPanel]

CodeEdit/Features/About/Views/AboutView.swift

@@ -144,19 +144,16 @@ final class Editor: ObservableObject, Identifiable {
     ///   - file: the file to open.
     ///   - asTemporary: indicates whether the tab should be opened as a temporary tab or a permanent tab.
     func openTab(file: CEWorkspaceFile, asTemporary: Bool) {
-        print("Attempting to open file: \(file.url)")
         let item = EditorInstance(file: file)
         // Item is already opened in a tab.
         guard !tabs.contains(item) || !asTemporary else {
             selectedTab = item
             history.prepend(item)
-            print("File already opened!")
             return
         }
 
         switch (temporaryTab, asTemporary) {
         case (.some(let tab), true):
-            print("Temporary tab 1")
             if let index = tabs.firstIndex(of: tab) {
                 history.removeFirst(historyOffset)
                 history.prepend(item)
@@ -168,16 +165,13 @@ final class Editor: ObservableObject, Identifiable {
             }
 
         case (.some(let tab), false) where tab == item:
-            print("2")
             temporaryTab = nil
 
         case (.none, true):
-            print("3")
             openTab(file: item.file)
             temporaryTab = item
 
         case (.none, false):
-            print("4")
             openTab(file: item.file)
 
         default:
@@ -192,7 +186,6 @@ final class Editor: ObservableObject, Identifiable {
     ///   - fromHistory: Indicates whether the tab has been opened from going back in history.
     func openTab(file: CEWorkspaceFile, at index: Int? = nil, fromHistory: Bool = false) {
         let item = Tab(file: file)
-        print("Tabs before update: \(tabs)")
         if let index {
             tabs.insert(item, at: index)
         } else {
@@ -203,9 +196,6 @@ final class Editor: ObservableObject, Identifiable {
             }
         }
 
-        print("Updated tabs: \(tabs)")
-        print("New item: \(item.file.url)")
-
         selectedTab = item
         if !fromHistory {
             history.removeFirst(historyOffset)
@@ -215,14 +205,12 @@ final class Editor: ObservableObject, Identifiable {
         do {
             try openFile(item: item)
         } catch {
-            print("openFile error")
             print(error)
         }
     }
 
     private func openFile(item: Tab) throws {
         guard item.file.fileDocument == nil else {
-            print("File document is nil, returning!")
             return
         }
 
@@ -235,7 +223,6 @@ final class Editor: ObservableObject, Identifiable {
         )
         item.file.fileDocument = codeFile
         CodeEditDocumentController.shared.addDocument(codeFile)
-        print("Successfully opened file")
     }
 
     func goBackInHistory() {

CodeEdit/Features/Editor/Models/Editor.swift

@@ -9,7 +9,11 @@ import Foundation
 import LanguageServerProtocol
 
 extension LanguageServer {
-    func requestColorPresentation(document documentURI: String, _ color: Color, _ range: LSPRange) async -> ColorPresentationResponse {
+    func requestColorPresentation(
+        document documentURI: String,
+        _ color: Color,
+        _ range: LSPRange
+    ) async -> ColorPresentationResponse {
         let params = ColorPresentationParams(
             workDoneToken: nil,
             partialResultToken: nil,

CodeEdit/Features/LSP/LanguageClient+ColorPresentation.swift

@@ -14,9 +14,14 @@ extension LanguageServer {
         if let cachedResponse: CompletionResponse = lspCache.get(key: cacheKey) {
             return cachedResponse
         }
-        let completionParams = CompletionParams(uri: documentURI, position: position, triggerKind: .invoked, triggerCharacter: nil)
+        let completionParams = CompletionParams(
+            uri: documentURI,
+            position: position,
+            triggerKind: .invoked,
+            triggerCharacter: nil
+        )
         let response = try await lspInstance.completion(completionParams)
-        
+
         lspCache.set(key: cacheKey, value: response)
         return response
     }

CodeEdit/Features/LSP/LanguageClient+Completion.swift

@@ -19,7 +19,7 @@ extension LanguageServer {
         } catch {
             print("requestGoToDeclaration Error \(error)")
         }
-        
+
         return nil
     }
 }

CodeEdit/Features/LSP/LanguageClient+Declaration.swift

@@ -9,7 +9,8 @@ import Foundation
 import LanguageServerProtocol
 
 extension LanguageServer {
-    /// The document color request is sent from the client to the server to list all color references found in a given text document. Along with the range, a color value in RGB is returned.
+    /// The document color request is sent from the client to the server to list all color
+    /// references found in a given text document. Along with the range, a color value in RGB is returned.
     /// Clients can use the result to decorate color references in an editor. For example:
     ///     1. Color boxes showing the actual color next to the reference
     ///     2. Show a color picker when a color reference is edited

CodeEdit/Features/LSP/LanguageClient+DocumentColor.swift

@@ -9,9 +9,13 @@ import Foundation
 import LanguageServerProtocol
 
 extension LanguageServer {
-    /// The document highlight request is sent from the client to the server to resolve document highlights for a given text document position.
-    /// For programming languages this usually highlights all references to the symbol scoped to this file.
-    func requestDocumentHighlight(document documentURI: String, _ position: Position) async -> DocumentHighlightResponse {
+    /// The document highlight request is sent from the client to the server to resolve document
+    /// highlights for a given text document position. For programming languages this usually
+    /// highlights all references to the symbol scoped to this file.
+    func requestDocumentHighlight(
+        document documentURI: String,
+        _ position: Position
+    ) async -> DocumentHighlightResponse {
         do {
             let params = DocumentHighlightParams(
                 textDocument: TextDocumentIdentifier(uri: documentURI),

CodeEdit/Features/LSP/LanguageClient+DocumentHighlight.swift

@@ -18,7 +18,7 @@ extension LanguageServer {
         }
         return []
     }
-    
+
     func requestDocumentLinkResolve(_ documentLink: DocumentLink) async -> DocumentLink? {
         do {
             return try await lspInstance.documentLinkResolve(documentLink)

CodeEdit/Features/LSP/LanguageClient+DocumentLink.swift

@@ -9,12 +9,15 @@ import Foundation
 import LanguageServerProtocol
 
 extension LanguageServer {
-    func requestDocumentSymbols(for languageId: LanguageIdentifier, document documentURI: String) async throws -> DocumentSymbolResponse {
+    func requestDocumentSymbols(
+        for languageId: LanguageIdentifier,
+        document documentURI: String
+    ) async throws -> DocumentSymbolResponse {
 //        let cacheKey = CacheKey(uri: documentURI, requestType: "documentSymbols")
 //        if let cachedResponse: DocumentSymbolResponse = lspCache.get(key: cacheKey) {
 //            return cachedResponse
 //        }
-        
+
         let textDocumentIdentifier = TextDocumentIdentifier(uri: documentURI)
         let documentSymbolParams = DocumentSymbolParams(textDocument: textDocumentIdentifier)
         let response = try await lspInstance.documentSymbol(documentSymbolParams)