Removed Equatable from enums

angelolloqui · Mar 29, 2020 · 5c30c68 · 5c30c68
1 parent be4a00f
commit 5c30c68
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Assets/Tests/KotlinTokenizer/enums.swift b/Assets/Tests/KotlinTokenizer/enums.swift
@@ -44,7 +44,7 @@ enum AnimationLength {
     }
 }
 
-enum AnimationLengthAdvanced {
+enum AnimationLengthAdvanced: Equatable {
     case short
     case long
     case custom(Double)

diff --git a/Sources/SwiftKotlinFramework/utils/AST+Operations.swift b/Sources/SwiftKotlinFramework/utils/AST+Operations.swift
@@ -274,6 +274,16 @@ extension GuardStatement {
     }
 }
 
+extension TypeInheritanceClause {
+    var nonEquatable: TypeInheritanceClause? {
+        let typeInheritanceList = self.typeInheritanceList.nonEquatable
+        if typeInheritanceList.isEmpty {
+            return nil
+        }
+        return TypeInheritanceClause(classRequirement: classRequirement, typeInheritanceList: typeInheritanceList)
+    }
+}
+
 extension Collection where Iterator.Element == TypeIdentifier {
     var nonEquatable: [TypeIdentifier] {
         return filter { $0.names.contains { $0.name.textDescription != "Equatable" } }

diff --git a/Sources/SwiftKotlinFramework/utils/EnumDeclaration+Operations.swift b/Sources/SwiftKotlinFramework/utils/EnumDeclaration+Operations.swift
@@ -107,7 +107,7 @@ extension KotlinTokenizer {
         let lineBreak = declaration.newToken(.linebreak, "\n")
         let attrsTokens = tokenize(declaration.attributes, node: declaration)
         let modifierTokens = declaration.accessLevelModifier.map { tokenize($0, node: declaration) } ?? []
-        let inheritanceTokens = declaration.typeInheritanceClause.map { tokenize($0, node: declaration) } ?? []
+        let inheritanceTokens = declaration.typeInheritanceClause?.nonEquatable.map { tokenize($0, node: declaration) } ?? []
         let headTokens = [
             attrsTokens,
             modifierTokens,