Cleanup file comments, re-indent some files

mac-cain13 · Dec 9, 2022 · b2eddb7 · b2eddb7
1 parent 0acf36e
commit b2eddb7
Show file tree

Hide file tree

Showing 49 changed files with 63 additions and 147 deletions.
diff --git a/Plugins/RswiftGenerateResourcesCommand/RswiftGenerateResourcesCommand.swift b/Plugins/RswiftGenerateResourcesCommand/RswiftGenerateResourcesCommand.swift
@@ -1,6 +1,6 @@
 //
 //  RswiftGenerateResourcesCommand.swift
-//
+//  R.swift
 //
 //  Created by Tom Lokhorst on 2022-10-19.
 //

diff --git a/Plugins/RswiftModifyXcodePackages/RswiftModifyXcodePackages.swift b/Plugins/RswiftModifyXcodePackages/RswiftModifyXcodePackages.swift
@@ -1,6 +1,6 @@
 //
 //  RswiftModifyXcodePackages.swift
-//
+//  R.swift
 //
 //  Created by Tom Lokhorst on 2022-11-07.
 //

diff --git a/Sources/RswiftGenerators/AccessibilityIdentifier+Generator.swift b/Sources/RswiftGenerators/AccessibilityIdentifier+Generator.swift
@@ -9,8 +9,8 @@ import Foundation
 import RswiftResources
 
 private protocol AccessibilityIdentifierContainer {
-  var name: String { get }
-  var usedAccessibilityIdentifiers: [String] { get }
+    var name: String { get }
+    var usedAccessibilityIdentifiers: [String] { get }
 }
 
 extension NibResource: AccessibilityIdentifierContainer {}

diff --git a/Sources/RswiftGenerators/Shared/AssetCatalogMergedNamespaces.swift b/Sources/RswiftGenerators/Shared/AssetCatalogMergedNamespaces.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Tom Lokhorst on 2017-06-06.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation
@@ -31,4 +29,3 @@ struct AssetCatalogMergedNamespaces {
         }
     }
 }
-
diff --git a/Sources/RswiftGenerators/Shared/SwiftIdentifier.swift b/Sources/RswiftGenerators/Shared/SwiftIdentifier.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 11-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation
@@ -165,4 +163,3 @@ private let SwiftKeywords = [
     // Keywords from Swift 2 that are still reserved
     "__COLUMN__", "__FILE__", "__FUNCTION__", "__LINE__",
 ]
-
diff --git a/Sources/RswiftParsers/Resources/AssetCatalog+Parser.swift b/Sources/RswiftParsers/Resources/AssetCatalog+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftParsers/Resources/FileResource+Parser.swift b/Sources/RswiftParsers/Resources/FileResource+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation
@@ -13,10 +11,10 @@ import RswiftResources
 extension FileResource {
     // These are all extensions of resources that are passed to some special compiler step and not directly available at runtime
     static public let unsupportedExtensions: Set<String> = [
-      AssetCatalog.supportedExtensions,
-      StringsTable.supportedExtensions,
-      NibResource.supportedExtensions,
-      StoryboardResource.supportedExtensions,
+        AssetCatalog.supportedExtensions,
+        StringsTable.supportedExtensions,
+        NibResource.supportedExtensions,
+        StoryboardResource.supportedExtensions,
     ]
     .reduce([]) { $0.union($1) }
 

diff --git a/Sources/RswiftParsers/Resources/FontResource+Parser.swift b/Sources/RswiftParsers/Resources/FontResource+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftParsers/Resources/ImageResource+Parser.swift b/Sources/RswiftParsers/Resources/ImageResource+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftParsers/Resources/Nib+Parser.swift b/Sources/RswiftParsers/Resources/Nib+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftParsers/Resources/PropertyList+Parser.swift b/Sources/RswiftParsers/Resources/PropertyList+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Tom Lokhorst on 2018-07-08.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation
@@ -13,10 +11,10 @@ import RswiftResources
 extension PropertyListResource {
     static public func parse(url: URL, buildConfigurationName: String) throws -> PropertyListResource {
         guard
-          let nsDictionary = NSDictionary(contentsOf: url),
-          let dictionary = nsDictionary as? [String: Any]
+            let nsDictionary = NSDictionary(contentsOf: url),
+            let dictionary = nsDictionary as? [String: Any]
         else {
-          throw ResourceParsingError("File could not be parsed as InfoPlist from URL: \(url.absoluteString)")
+            throw ResourceParsingError("File could not be parsed as InfoPlist from URL: \(url.absoluteString)")
         }
 
         return PropertyListResource(buildConfigurationName: buildConfigurationName, contents: dictionary, url: url)

diff --git a/Sources/RswiftParsers/Resources/Storyboard+Parser.swift b/Sources/RswiftParsers/Resources/Storyboard+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftParsers/Resources/StringsTable+Parser.swift b/Sources/RswiftParsers/Resources/StringsTable+Parser.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Tom Lokhorst on 2016-04-24.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftParsers/Shared/FormatPart+Extensions.swift b/Sources/RswiftParsers/Shared/FormatPart+Extensions.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Tom Lokhorst on 2016-04-18.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 //  Parts of the content of this file are loosly based on StringsFileParser.swift from SwiftGen/GenumKit.
 //  We don't feel this is a "substantial portion of the Software" so are not including their MIT license,

diff --git a/Sources/RswiftParsers/Shared/GeneratedId.swift b/Sources/RswiftParsers/Shared/GeneratedId.swift
@@ -1,6 +1,6 @@
 //
 //  GeneratedId.swift
-//
+//  R.swift
 //
 //  Created by Tom Lokhorst on 2022-07-15.
 //

diff --git a/Sources/RswiftParsers/Shared/ResourceParsingError.swift b/Sources/RswiftParsers/Shared/ResourceParsingError.swift
@@ -1,6 +1,6 @@
 //
 //  ResourceParsingError.swift
-//  RswiftCore
+//  R.swift
 //
 //  Created by Tom Lokhorst on 2021-04-16.
 //

diff --git a/Sources/RswiftParsers/Shared/SupportedExtensions.swift b/Sources/RswiftParsers/Shared/SupportedExtensions.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 10-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftParsers/Shared/Xcodeproj.swift b/Sources/RswiftParsers/Shared/Xcodeproj.swift
@@ -1,10 +1,9 @@
 //
 //  Xcodeproj.swift
-//  RswiftCore
+//  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
 //  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftResources/FileResource.swift b/Sources/RswiftResources/FileResource.swift
@@ -3,36 +3,27 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation
 
 public struct FileResource {
 
-//    public let filename: String
     public let name: String
     public let pathExtension: String
     public let bundle: Bundle
     public let locale: LocaleReference?
-//
-//    public init(filename: String, bundle: Bundle?, locale: LocaleReference?) {
-//        self.filename = filename
-//        self.bundle = bundle
-//        self.locale = locale
-//    }
-
-    public var filename: String {
-        name.isEmpty || pathExtension.isEmpty
-            ? "\(name)\(pathExtension)"
-            : "\(name).\(pathExtension)"
-    }
 
     public init(name: String, pathExtension: String, bundle: Bundle, locale: LocaleReference?) {
         self.name = name
         self.pathExtension = pathExtension
         self.bundle = bundle
         self.locale = locale
     }
+
+    public var filename: String {
+        name.isEmpty || pathExtension.isEmpty
+            ? "\(name)\(pathExtension)"
+            : "\(name).\(pathExtension)"
+    }
 }
diff --git a/Sources/RswiftResources/FontResource.swift b/Sources/RswiftResources/FontResource.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftResources/ImageResource.swift b/Sources/RswiftResources/ImageResource.swift
@@ -3,8 +3,6 @@
 //  R.swift
 //
 //  Created by Mathijs Kadijk on 09-12-15.
-//  From: https://github.com/mac-cain13/R.swift
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftResources/Integrations/Bundle+Extensions.swift b/Sources/RswiftResources/Integrations/Bundle+Extensions.swift
@@ -1,6 +1,6 @@
 //
 //  Bundle+Extensions.swift
-//  
+//  R.swift
 //
 //  Created by Tom Lokhorst on 2022-07-30.
 //
@@ -13,8 +13,8 @@ extension Bundle {
     public func infoDictionaryString(path: [String], key: String) -> String? {
         var dict = infoDictionary
         for step in path {
-          guard let obj = dict?[step] as? [String: Any] else { return nil }
-          dict = obj
+            guard let obj = dict?[step] as? [String: Any] else { return nil }
+            dict = obj
         }
         return dict?[key] as? String
     }

diff --git a/Sources/RswiftResources/Integrations/ColorResource+Integrations.swift b/Sources/RswiftResources/Integrations/ColorResource+Integrations.swift
@@ -1,10 +1,8 @@
 //
 //  UIColor+ColorResource.swift
-//  R.swift.Library
+//  R.swift
 //
 //  Created by Tom Lokhorst on 2017-06-06.
-//  From: https://github.com/mac-cain13/R.swift.Library
-//  License: MIT License
 //
 
 import Foundation
@@ -37,7 +35,7 @@ extension ColorResource {
 
      - returns: A color that exactly or best matches the desired traits with the given resource (`R.color.*`), or nil if no suitable color was found.
      */
-//    @available(*, deprecated, message: "Use UIColor(resource:) initializer instead")
+    //    @available(*, deprecated, message: "Use UIColor(resource:) initializer instead")
     public func callAsFunction(compatibleWith traitCollection: UITraitCollection? = nil) -> UIColor? {
         UIColor(named: name, in: bundle, compatibleWith: traitCollection)
     }

diff --git a/Sources/RswiftResources/Integrations/FileResource+Integrations.swift b/Sources/RswiftResources/Integrations/FileResource+Integrations.swift
@@ -1,10 +1,8 @@
 //
 //  Bundle+FileResource.swift
-//  R.swift.Library
+//  R.swift
 //
 //  Created by Mathijs Kadijk on 10-01-16.
-//  From: https://github.com/mac-cain13/R.swift.Library
-//  License: MIT License
 //
 
 import Foundation

diff --git a/Sources/RswiftResources/Integrations/FontResource+Integrations.swift b/Sources/RswiftResources/Integrations/FontResource+Integrations.swift
@@ -1,10 +1,8 @@
 //
 //  UIFont+FontResource.swift
-//  R.swift.Library
+//  R.swift
 //
 //  Created by Mathijs Kadijk on 06-01-16.
-//  From: https://github.com/mac-cain13/R.swift.Library
-//  License: MIT License
 //
 
 import Foundation
@@ -38,7 +36,6 @@ extension Font {
     }
 }
 
-
 #if canImport(UIKit)
 import UIKit
 
@@ -52,24 +49,24 @@ extension FontResource {
 
      - returns: A color that exactly or best matches the desired traits with the given resource (R.color.\*), or nil if no suitable color was found.
      */
-//    @available(*, deprecated, message: "Use UIFont(resource:size:) initializer instead")
+    //    @available(*, deprecated, message: "Use UIFont(resource:size:) initializer instead")
     public func callAsFunction(size: CGFloat) -> UIFont? {
         UIFont(name: name, size: size)
     }
 }
 
 public extension UIFont {
-  /**
-   Creates and returns a font object for the specified font resource (`R.font.*`) and size.
+    /**
+     Creates and returns a font object for the specified font resource (`R.font.*`) and size.
 
-   - parameter resource: The font resource (`R.font.*`) for the specific font to load
-   - parameter size: The size (in points) to which the font is scaled. This value must be greater than 0.0.
+     - parameter resource: The font resource (`R.font.*`) for the specific font to load
+     - parameter size: The size (in points) to which the font is scaled. This value must be greater than 0.0.
 
-   - returns: A font object of the specified font resource and size.
-   */
-  convenience init?(resource: FontResource, size: CGFloat) {
-    self.init(name: resource.name, size: size)
-  }
+     - returns: A font object of the specified font resource and size.
+     */
+    convenience init?(resource: FontResource, size: CGFloat) {
+        self.init(name: resource.name, size: size)
+    }
 }
 #endif