Merge pull request #471 from digital-atelier/issue-470-swift-4-multiple-enum-error

Issue 470 - swift 4 multiple enum error

Author: HugoMario

src/main/resources/handlebars/swift4/modelInlineEnumDeclaration.mustache

@@ -1,3 +1,3 @@
     public enum {{enumName}}: {{#isNot this 'container'}}{{datatype}}{{/isNot}}{{#is this 'container'}}String{{/is}}, Codable { {{#allowableValues}}{{#enumVars}}
         case {{name}} = {{#is ../../this 'container'}}"{{/is}}{{#is ../../this 'string'}}"{{/is}}{{{value}}}{{#is ../../this 'string'}}"{{/is}}{{#is ../../this 'container'}}"{{/is}}{{/enumVars}}{{/allowableValues}}
-    }
+    }

src/main/resources/handlebars/swift4/modelObject.mustache

@@ -1,7 +1,8 @@
 
 public struct {{classname}}: Codable {
 
-{{#allVars}}{{#is this 'enum'}}{{> modelInlineEnumDeclaration}}{{/is}}{{/allVars}}{{#allVars}}{{#is this 'enum'}}    {{#description}}/** {{description}} */
+{{#allVars}}{{#is this 'enum'}}{{> modelInlineEnumDeclaration}}
+{{/is}}{{/allVars}}{{#allVars}}{{#is this 'enum'}}    {{#description}}/** {{description}} */
     {{/description}}public var {{name}}: {{{datatypeWithEnum}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{/is}}
 {{#isNot this 'enum'}}    {{#description}}/** {{description}} */
     {{/description}}public var {{name}}: {{{datatype}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}