From 5f767953d3211242cd6157bcb58abe7b703267c1 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Wed, 11 Apr 2018 23:09:34 +0300 Subject: [PATCH] fix equatable --- Swift/macroses/common.utils.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Swift/macroses/common.utils.twig b/Swift/macroses/common.utils.twig index 58d197e..cd55fd8 100644 --- a/Swift/macroses/common.utils.twig +++ b/Swift/macroses/common.utils.twig @@ -58,9 +58,9 @@ {%- endif -%} {% endmacro %} -{% macro mappingTransformForField(field) %} +{%- macro mappingTransformForField(field) -%} ApiDateFormattingService.mappingTransform(with: .{{ dateFormatToName(field.type.dateFormat) }}) -{% endmacro %} +{%- endmacro -%} {% macro enumValueName(value) %} {%- import _self as self -%} @@ -106,7 +106,7 @@ {%- elseif (valueType.parent is not null) -%} {%- import _self as self -%} - self.valueTypeHasGenerics(valueType.parent) + {{ self.valueTypeHasGenerics(valueType.parent) }} {%- endif -%} {% endmacro %} @@ -118,7 +118,7 @@ {%- if self.valueTypeHasGenerics(valueType) != null -%} {{ true }} {%- elseif valueType.baseTypeName == "Array" -%} - {%- if valueType.itemsType.parent is not null -%} + {%- if (valueType.itemsType.typeParameters is not null) -%} {{ true }} {%- else -%} {{ self.hasGenericsOrNonEqutableCollections(valueType.itemsType) }}