Merge pull request #559 from bummoblizard/linting-test

Use linting
thebaselab · Aug 30, 2022 · 711b335 · 711b335
2 parents 1bef70a + 35e0f36
commit 711b335
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 29 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
       - "!gitbook"
 
 jobs:
-  test:
+  Linting:
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3

diff --git a/Code.xcodeproj/project.pbxproj b/Code.xcodeproj/project.pbxproj
@@ -2760,7 +2760,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export PATH=$PATH:/opt/homebrew/bin\nif command -v swift-format > /dev/null\nthen\n    swift-format format -i -r ${PROJECT_DIR}/CodeApp\nelse\n    echo \"warning: swift-format not installed, install it by running brew install swift-format\"\nfi\n\n";
+			shellScript = "export PATH=$PATH:/opt/homebrew/bin\nif command -v swift-format > /dev/null\nthen\n    swift-format format -i -r ${PROJECT_DIR}/CodeApp\n    swift-format lint -r -s ${PROJECT_DIR}/CodeApp\nelse\n    echo \"warning: swift-format not installed, install it by running brew install swift-format\"\nfi\n\n";
 		};
 		9455423B27FC410F00DAF941 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2779,7 +2779,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export PATH=$PATH:/opt/homebrew/bin\nif command -v swift-format > /dev/null\nthen\n    swift-format format -i -r ${PROJECT_DIR}/CodeApp\nelse\n    echo \"warning: swift-format not installed, install it by running brew install swift-format\"\nfi\n\n";
+			shellScript = "export PATH=$PATH:/opt/homebrew/bin\nif command -v swift-format > /dev/null\nthen\n    swift-format format -i -r ${PROJECT_DIR}/CodeApp\n    swift-format lint -r -s ${PROJECT_DIR}/CodeApp\nelse\n    echo \"warning: swift-format not installed, install it by running brew install swift-format\"\nfi\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/CodeApp/CodeApp.swift b/CodeApp/CodeApp.swift
@@ -128,7 +128,7 @@ struct CodeApp: App {
                 appropriateFor: nil,
                 create: true)
             // usr/lib/wasm32-wasi
-            var localURL = libraryURL.appendingPathComponent("usr/lib/wasm32-wasi")  // $HOME/Library/usr/lib/wasm32-wasi
+            var localURL = libraryURL.appendingPathComponent("usr/lib/wasm32-wasi")
             do {
                 if FileManager().fileExists(atPath: localURL.path) && !localURL.isDirectory {
                     try FileManager().removeItem(at: localURL)
@@ -142,7 +142,7 @@ struct CodeApp: App {
                 return
             }
             // usr/lib/clang/14.0.0/lib/wasi/
-            localURL = libraryURL.appendingPathComponent("usr/lib/clang/14.0.0/lib/wasi/")  // $HOME/Library/usr/lib/clang/14.0.0/lib/wasi/
+            localURL = libraryURL.appendingPathComponent("usr/lib/clang/14.0.0/lib/wasi/")
             do {
                 if FileManager().fileExists(atPath: localURL.path) && !localURL.isDirectory {
                     try FileManager().removeItem(at: localURL)
@@ -288,19 +288,17 @@ struct CodeApp: App {
             "PYTHONPYCACHEPREFIX",
             (libraryURL.appendingPathComponent("__pycache__")).path.toCString(), 1)
         setenv("PYTHONUSERBASE", libraryURL.path.toCString(), 1)
-
-        //        setenv("REQUESTS_CA_BUNDLE", pemUrl.path.toCString(), 1)
         setenv("SSL_CERT_FILE", pemUrl.path.toCString(), 1)
 
         // Help aiohttp install itself:
         setenv("YARL_NO_EXTENSIONS", "1", 1)
         setenv("MULTIDICT_NO_EXTENSIONS", "1", 1)
 
         // clang options:
-        setenv("SYSROOT", libraryURL.path + "/usr", 1)  // sysroot for clang compiler
+        setenv("SYSROOT", libraryURL.path + "/usr", 1)
         setenv(
             "CCC_OVERRIDE_OPTIONS",
-            "#^--target=wasm32-wasi +-fno-exceptions +-lc-printscan-long-double", 1)  // silently add "--target=wasm32-wasi" at the beginning of arguments
+            "#^--target=wasm32-wasi +-fno-exceptions +-lc-printscan-long-double", 1)
         setenv("MAKESYSPATH", Bundle.main.resourcePath! + "ClangLib/usr/share/mk", 1)
 
         // PHP config

diff --git a/CodeApp/HelperFunctions/KeychainWrapper/KeychainWrapper.swift b/CodeApp/HelperFunctions/KeychainWrapper/KeychainWrapper.swift
@@ -40,14 +40,6 @@ private let SecReturnAttributes: String = kSecReturnAttributes as String
 
 /// KeychainWrapper is a class to help make Keychain access in Swift more straightforward. It is designed to make accessing the Keychain services more like using NSUserDefaults, which is much more familiar to people.
 open class KeychainWrapper {
-
-    @available(
-        *, deprecated,
-        message:
-            "KeychainWrapper.defaultKeychainWrapper is deprecated, use KeychainWrapper.standard instead"
-    )
-    public static let defaultKeychainWrapper = KeychainWrapper.standard
-
     /// Default keychain wrapper access
     public static let standard = KeychainWrapper()
 

diff --git a/CodeApp/HelperFunctions/node.swift b/CodeApp/HelperFunctions/node.swift
@@ -241,7 +241,7 @@ public func npm(argc: Int32, argv: UnsafeMutablePointer<UnsafeMutablePointer<Int
 
     let npmPath = npmURL.path
 
-    args = ["node", "--max-old-space-size=180", "--optimize-for-size", npmPath] + args  // + ["--prefix", workingPath]
+    args = ["node", "--max-old-space-size=180", "--optimize-for-size", npmPath] + args
 
     return nodeCmd(args: args)
 }

diff --git a/CodeApp/HelperFunctions/wasm.swift b/CodeApp/HelperFunctions/wasm.swift
@@ -355,9 +355,8 @@ class wasmWebViewDelegate: NSObject, WKNavigationDelegate, WKScriptMessageHandle
                 completionHandler(result)
                 return
             } else if arguments[1] == "chdir" {
-
-                //                    let result = changeDirectory(path: arguments[2]) // call cd_main and updates the ios current session
-                completionHandler("\(FileManager.default.changeCurrentDirectoryPath(arguments[2]))")  // true or false
+                // true or false
+                completionHandler("\(FileManager.default.changeCurrentDirectoryPath(arguments[2]))")
                 return
             } else if arguments[1] == "fchdir" {
                 if let fd = Int32(arguments[2]) {
@@ -438,11 +437,13 @@ class wasmWebViewDelegate: NSObject, WKNavigationDelegate, WKScriptMessageHandle
                         }
                         return
                     } else {
-                        completionHandler("\(-EFAULT)")  // time points out of process allocated space
+                        // time points out of process allocated space
+                        completionHandler("\(-EFAULT)")
                         return
                     }
                 } else {
-                    completionHandler("\(-EFAULT)")  // time points out of process allocated space
+                    // time points out of process allocated space
+                    completionHandler("\(-EFAULT)")
                     return
                 }
             } else if arguments[1] == "futimes" {
@@ -475,11 +476,11 @@ class wasmWebViewDelegate: NSObject, WKNavigationDelegate, WKScriptMessageHandle
                             }
                             return
                         } else {
-                            completionHandler("\(-EFAULT)")  // time points out of process allocated space
+                            completionHandler("\(-EFAULT)")
                             return
                         }
                     } else {
-                        completionHandler("\(-EFAULT)")  // time points out of process allocated space
+                        completionHandler("\(-EFAULT)")
                         return
                     }
                 }

diff --git a/CodeApp/UI/terminal/problems.swift b/CodeApp/UI/terminal/problems.swift
@@ -27,12 +27,12 @@ struct problemsView: View {
                                         Image(systemName: "xmark.circle").foregroundColor(.red)
                                     case 1:
                                         Image(systemName: "exclamationmark.triangle")
-                                            .foregroundColor(.yellow)  // hint
+                                            .foregroundColor(.yellow)
                                     case 2:
-                                        Image(systemName: "info.circle").foregroundColor(.blue)  // info
+                                        Image(systemName: "info.circle").foregroundColor(.blue)
                                     case 4:
                                         Image(systemName: "exclamationmark.triangle")
-                                            .foregroundColor(.yellow)  // warning
+                                            .foregroundColor(.yellow)
                                     default:
                                         Image(systemName: "xmark.circle").foregroundColor(.red)
                                     }
@@ -49,7 +49,6 @@ struct problemsView: View {
                         } label: {
                             fileIcon(url: url.absoluteString, iconSize: 14, type: .file)
                             Text(url.lastPathComponent).foregroundColor(Color.init("T1"))
-                            //                                Text("monaco-tm").foregroundColor(.gray)
                             Circle()
                                 .fill(Color.init("panel.border"))
                                 .frame(width: 14, height: 14)