Use (default) stencil join

SwiftGen · May 16, 2017 · 65777fc · 65777fc
2 parents 2fbb558 + 3c1a57d
commit 65777fc
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,9 @@
 * Templates are now organized in subdirectories for each command.  
   [@djbe](https://github.com/djbe)
   [#13](https://github.com/SwiftGen/templates/issues/13)
+* Update templates to use the Stencil built-in `join` filter instead of our own.  
+  [@djbe](https://github.com/djbe)
+  [#22](https://github.com/SwiftGen/templates/issues/22)
 
 ### New Features
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   StencilSwiftKit:
-    :commit: cc2bf33b1e138c8ca068fa460c42a7979adf9947
+    :commit: 21da18cdefe2deda281c134173f7558b37536250
     :git: https://github.com/SwiftGen/StencilSwiftKit
 
 SPEC CHECKSUMS:

diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/StencilSwiftKit/README.md b/Pods/StencilSwiftKit/README.md
diff --git a/Pods/StencilSwiftKit/Sources/Environment.swift b/Pods/StencilSwiftKit/Sources/Environment.swift
diff --git a/Pods/StencilSwiftKit/Sources/Filters.swift b/Pods/StencilSwiftKit/Sources/Filters.swift
diff --git a/Pods/StencilSwiftKit/Sources/Parameters.swift b/Pods/StencilSwiftKit/Sources/Parameters.swift
diff --git a/templates/strings/default.stencil b/templates/strings/default.stencil
@@ -7,7 +7,7 @@ import Foundation
 {% macro recursiveBlock item %}
   {% for string in item.strings %}
   /// {{string.translation}}
-  case {{string.key|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}{% if string.types %}({{string.types|join}}){% endif %}
+  case {{string.key|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}{% if string.types %}({{string.types|join:", "}}){% endif %}
   {% endfor %}
   {% for child in item.children %}
   {% call recursiveBlock child %}

diff --git a/templates/strings/genstrings.stencil b/templates/strings/genstrings.stencil
@@ -7,7 +7,7 @@ import Foundation
 {% macro recursiveBlock item %}
   {% for string in item.strings %}
   /// {{string.translation}}
-  case {{string.key|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}{% if string.types %}({{string.types|join}}){% endif %}
+  case {{string.key|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}{% if string.types %}({{string.types|join:", "}}){% endif %}
   {% endfor %}
   {% for child in item.children %}
   {% call recursiveBlock child %}

diff --git a/templates/strings/no-comments-swift3.stencil b/templates/strings/no-comments-swift3.stencil
@@ -6,7 +6,7 @@ import Foundation
 // swiftlint:disable file_length
 {% macro recursiveBlock item %}
   {% for string in item.strings %}
-  case {{string.key|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}{% if string.types %}({{string.types|join}}){% endif %}
+  case {{string.key|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}{% if string.types %}({{string.types|join:", "}}){% endif %}
   {% endfor %}
   {% for child in item.children %}
   {% call recursiveBlock child %}

diff --git a/templates/strings/structured.stencil b/templates/strings/structured.stencil
@@ -11,7 +11,7 @@ enum {{enumName}} {
 {% macro enumBlock item sp %}
 {{sp}}  {% for string in item.strings %}
 {{sp}}  /// {{string.translation}}
-{{sp}}  case {{string.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}{% if string.types %}({{string.types|join}}){% endif %}
+{{sp}}  case {{string.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}{% if string.types %}({{string.types|join:", "}}){% endif %}
 {{sp}}  {% endfor %}
 {{sp}}  {% for child in item.children %}
 

diff --git a/templates/strings/swift3.stencil b/templates/strings/swift3.stencil
@@ -7,7 +7,7 @@ import Foundation
 {% macro recursiveBlock item %}
   {% for string in item.strings %}
   /// {{string.translation}}
-  case {{string.key|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}{% if string.types %}({{string.types|join}}){% endif %}
+  case {{string.key|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}{% if string.types %}({{string.types|join:", "}}){% endif %}
   {% endfor %}
   {% for child in item.children %}
   {% call recursiveBlock child %}