Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Fix issue with catalogs that have an empty folder #51

Merged
merged 3 commits into from
May 26, 2017
Merged

Fix issue with catalogs that have an empty folder #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5da64d6
Add empty folder
djbe May 26, 2017
e0cc8b3
Fix templates to handle empty folders
djbe May 26, 2017
ca8be73
Changelog entry
djbe May 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* Fixed `swiftlint` errors for the latest version.
[David Jennes](https://github.com/djbe)
[#46](https://github.com/SwiftGen/templates/pull/46)
* Images: fixed issue with catalogs that have an empty folder.
[David Jennes](https://github.com/djbe)
[#51](https://github.com/SwiftGen/templates/pull/51)

### Breaking Changes

Expand Down
6 changes: 6 additions & 0 deletions Contexts/Images/customname.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
<dict>
<key>assets</key>
<array>
<dict>
<key>items</key>
<array/>
<key>name</key>
<string>Empty</string>
</dict>
<dict>
<key>items</key>
<array>
Expand Down
6 changes: 6 additions & 0 deletions Contexts/Images/defaults.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
<dict>
<key>assets</key>
<array>
<dict>
<key>items</key>
<array/>
<key>name</key>
<string>Empty</string>
</dict>
<dict>
<key>items</key>
<array>
Expand Down
6 changes: 6 additions & 0 deletions Fixtures/Images/Images.xcassets/Empty/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
8 changes: 4 additions & 4 deletions templates/images/swift2.stencil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ struct {{enumName}}Type: StringLiteralConvertible {
{% endmacro %}
{% macro casesBlock images sp %}
{{sp}} {% for image in images %}
{{sp}} {% if not image.items %}
{{sp}} {% if image.value %}
{{sp}} static let {{image.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}: {{enumName}}Type = "{{image.value}}"
{{sp}} {% else %}
{{sp}} {% elif image.items %}
{{sp}} enum {{image.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}} {
{{sp}} {% set sp2 %}{{sp}} {% endset %}
{{sp}} {% call casesBlock image.items sp2 %}
Expand All @@ -64,9 +64,9 @@ struct {{enumName}}Type: StringLiteralConvertible {
{% endmacro %}
{% macro allValuesBlock images prefix isLast sp %}
{{sp}} {% for image in images %}
{{sp}} {% if not image.items %}
{{sp}} {% if image.value %}
{{sp}} {{prefix}}{{image.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}{% if not forloop.last or not isLast %},{% endif %}
{{sp}} {% else %}
{{sp}} {% elif image.items %}
{{sp}} {% set prefix2 %}{{prefix}}{{image.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}.{% endset %}
{{sp}} {% call allValuesBlock image.items prefix2 forloop.last sp %}
{{sp}} {% endif %}
Expand Down
8 changes: 4 additions & 4 deletions templates/images/swift3.stencil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ struct {{enumName}}Type: ExpressibleByStringLiteral {
{% endmacro %}
{% macro casesBlock images sp %}
{{sp}} {% for image in images %}
{{sp}} {% if not image.items %}
{{sp}} {% if image.value %}
{{sp}} static let {{image.name|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}: {{enumName}}Type = "{{image.value}}"
{{sp}} {% else %}
{{sp}} {% elif image.items %}
{{sp}} enum {{image.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}} {
{{sp}} {% set sp2 %}{{sp}} {% endset %}
{{sp}} {% call casesBlock image.items sp2 %}
Expand All @@ -64,9 +64,9 @@ struct {{enumName}}Type: ExpressibleByStringLiteral {
{% endmacro %}
{% macro allValuesBlock images prefix isLast sp %}
{{sp}} {% for image in images %}
{{sp}} {% if not image.items %}
{{sp}} {% if image.value %}
{{sp}} {{prefix}}{{image.name|swiftIdentifier|snakeToCamelCase|lowerFirstWord|escapeReservedKeywords}}{% if not forloop.last or not isLast %},{% endif %}
{{sp}} {% else %}
{{sp}} {% elif image.items %}
{{sp}} {% set prefix2 %}{{prefix}}{{image.name|swiftIdentifier|snakeToCamelCase|escapeReservedKeywords}}.{% endset %}
{{sp}} {% call allValuesBlock image.items prefix2 forloop.last sp %}
{{sp}} {% endif %}
Expand Down