Rename CaptureModifiers -> CaptureModifier

Author: thecoolwinter

…ourceEditor/Enums/CaptureModifiers.swift …SourceEditor/Enums/CaptureModifier.swiftSources/CodeEditSourceEditor/Enums/CaptureModifiers.swift renamed to Sources/CodeEditSourceEditor/Enums/CaptureModifier.swift Sources/CodeEditSourceEditor/Enums/CaptureModifiers.swift renamed to Sources/CodeEditSourceEditor/Enums/CaptureModifier.swift

@@ -7,7 +7,7 @@
 
 // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#semanticTokenModifiers
 
-public enum CaptureModifiers: Int8, CaseIterable, Sendable {
+public enum CaptureModifier: Int8, CaseIterable, Sendable {
     case declaration
     case definition
     case readonly
@@ -18,9 +18,59 @@ public enum CaptureModifiers: Int8, CaseIterable, Sendable {
     case modification
     case documentation
     case defaultLibrary
+
+    var stringValue: String {
+        switch self {
+        case .declaration:
+            return "declaration"
+        case .definition:
+            return "definition"
+        case .readonly:
+            return "readonly"
+        case .static:
+            return "static"
+        case .deprecated:
+            return "deprecated"
+        case .abstract:
+            return "abstract"
+        case .async:
+            return "async"
+        case .modification:
+            return "modification"
+        case .documentation:
+            return "documentation"
+        case .defaultLibrary:
+            return "defaultLibrary"
+        }
+    }
+
+    static func fromString(_ string: String) -> CaptureModifier {
+        switch string {
+        case "declaration":
+            return .declaration
+        case "definition":
+            return .definition
+        case "readonly":
+            return .readonly
+        case "static`":
+            return .static
+        case "deprecated":
+            return .deprecated
+        case "abstract":
+            return .abstract
+        case "async":
+            return .async
+        case "modification":
+            return .modification
+        case "documentation":
+            return .documentation
+        case "defaultLibrary":
+            return .defaultLibrary
+        }
+    }
 }
 
-extension CaptureModifiers: CustomDebugStringConvertible {
+extension CaptureModifier: CustomDebugStringConvertible {
     public var debugDescription: String {
         switch self {
         case .declaration: return "declaration"
@@ -45,25 +95,25 @@ public struct CaptureModifierSet: OptionSet, Equatable, Hashable, Sendable {
         self.rawValue = rawValue
     }
 
-    static let declaration = CaptureModifierSet(rawValue: 1 << CaptureModifiers.declaration.rawValue)
-    static let definition = CaptureModifierSet(rawValue: 1 << CaptureModifiers.definition.rawValue)
-    static let readonly = CaptureModifierSet(rawValue: 1 << CaptureModifiers.readonly.rawValue)
-    static let `static` = CaptureModifierSet(rawValue: 1 << CaptureModifiers.static.rawValue)
-    static let deprecated = CaptureModifierSet(rawValue: 1 << CaptureModifiers.deprecated.rawValue)
-    static let abstract = CaptureModifierSet(rawValue: 1 << CaptureModifiers.abstract.rawValue)
-    static let async = CaptureModifierSet(rawValue: 1 << CaptureModifiers.async.rawValue)
-    static let modification = CaptureModifierSet(rawValue: 1 << CaptureModifiers.modification.rawValue)
-    static let documentation = CaptureModifierSet(rawValue: 1 << CaptureModifiers.documentation.rawValue)
-    static let defaultLibrary = CaptureModifierSet(rawValue: 1 << CaptureModifiers.defaultLibrary.rawValue)
+    static let declaration = CaptureModifierSet(rawValue: 1 << CaptureModifier.declaration.rawValue)
+    static let definition = CaptureModifierSet(rawValue: 1 << CaptureModifier.definition.rawValue)
+    static let readonly = CaptureModifierSet(rawValue: 1 << CaptureModifier.readonly.rawValue)
+    static let `static` = CaptureModifierSet(rawValue: 1 << CaptureModifier.static.rawValue)
+    static let deprecated = CaptureModifierSet(rawValue: 1 << CaptureModifier.deprecated.rawValue)
+    static let abstract = CaptureModifierSet(rawValue: 1 << CaptureModifier.abstract.rawValue)
+    static let async = CaptureModifierSet(rawValue: 1 << CaptureModifier.async.rawValue)
+    static let modification = CaptureModifierSet(rawValue: 1 << CaptureModifier.modification.rawValue)
+    static let documentation = CaptureModifierSet(rawValue: 1 << CaptureModifier.documentation.rawValue)
+    static let defaultLibrary = CaptureModifierSet(rawValue: 1 << CaptureModifier.defaultLibrary.rawValue)
 
     /// All values in the set.
-    var values: [CaptureModifiers] {
+    var values: [CaptureModifier] {
         var rawValue = self.rawValue
         var values: [Int8] = []
         while rawValue > 0 {
             values.append(Int8(rawValue.trailingZeroBitCount))
             rawValue &= ~UInt(1 << rawValue.trailingZeroBitCount)
         }
-        return values.compactMap({ CaptureModifiers(rawValue: $0) })
+        return values.compactMap({ CaptureModifier(rawValue: $0) })
     }
 }

Sources/CodeEditSourceEditor/Enums/CaptureName.swift

@@ -46,7 +46,7 @@ public enum CaptureName: Int8, CaseIterable, Sendable {
     /// - Note: See ``CaptureName`` docs for why this enum isn't a raw representable.
     /// - Parameter string: A string to get the capture name from
     /// - Returns: A `CaptureNames` case
-    static func fromString(_ string: String?) -> CaptureName? { // swiftlint:disable:this cyclomatic_complexity
+    public static func fromString(_ string: String?) -> CaptureName? { // swiftlint:disable:this cyclomatic_complexity
         guard let string else { return nil }
         switch string {
         case "include":