#108 Fixed equatable enums

angelolloqui · Mar 21, 2020 · 62d9ed7 · 62d9ed7
1 parent 4b20e0c
commit 62d9ed7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Assets/Tests/KotlinTokenizer/enums.swift b/Assets/Tests/KotlinTokenizer/enums.swift
@@ -6,7 +6,7 @@ enum CompassPoint {
     case west
 }
 
-private enum Planet {
+private enum Planet: Equatable {
     case mercury, venus, earth
     case mars, jupiter, saturn, uranus, neptune
 }

diff --git a/Sources/SwiftKotlinFramework/KotlinTokenizer.swift b/Sources/SwiftKotlinFramework/KotlinTokenizer.swift
@@ -439,8 +439,11 @@ public class KotlinTokenizer: SwiftTokenizer {
 
         // Simple enums (no tuple values)
         if !simpleCases.contains(where: { $0.tuple != nil }) {
-            if declaration.typeInheritanceClause != nil {
-                return tokenizeSimpleValueEnum(declaration:declaration, simpleCases: simpleCases)
+            let typeInheritanceList = declaration.typeInheritanceClause?.typeInheritanceList.filter {
+                $0.names.contains { $0.name.textDescription != "Equatable" }
+            }
+            if typeInheritanceList?.isEmpty == false {
+                return tokenizeSimpleValueEnum(declaration: declaration, simpleCases: simpleCases)
             } else {
                 return tokenizeNoValueEnum(declaration: declaration, simpleCases: simpleCases)
             }