Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- Swift: Fix argument labels in labeled *distributions ([#859](https://github.com/mozilla/glean_parser/issues/859))

## 21.0.0

- BREAKING CHANGE: Generate labeled {custom|memory|timing} distribution for mobile ([#857](https://github.com/mozilla/glean_parser/pull/857))
Expand Down
16 changes: 12 additions & 4 deletions glean_parser/templates/swift.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ extension {{ namespace }} {
disabled: {{ obj.is_disabled()|swift }},
)
{% for arg_name in extra_metric_args if obj[arg_name] is defined %}
, {{ obj[arg_name]|swift }}
, {{arg_name|camelize}}: {{ obj[arg_name]|swift }}
{% endfor %}
),
{% elif obj.type == "labeled_memory_distribution" %}
Expand All @@ -240,7 +240,11 @@ extension {{ namespace }} {
disabled: {{ obj.is_disabled()|swift }},
)
{% for arg_name in extra_metric_args if obj[arg_name] is defined %}
, {{ obj[arg_name]|swift }}
{% if arg_name == "memory_unit" %}
, unit: {{ obj[arg_name]|swift }}
{% else %}
, {{arg_name|camelize}}: {{ obj[arg_name]|swift }}
{% endif %}
{% endfor %}
),
{% elif obj.type == "labeled_timing_distribution" %}
Expand All @@ -253,7 +257,11 @@ extension {{ namespace }} {
disabled: {{ obj.is_disabled()|swift }},
)
{% for arg_name in extra_metric_args if obj[arg_name] is defined %}
, {{ obj[arg_name]|swift }}
{% if arg_name == "time_unit" %}
, unit: {{ obj[arg_name]|swift }}
{% else %}
, {{arg_name|camelize}}: {{ obj[arg_name]|swift }}
{% endif %}
{% endfor %}
),
{% elif obj.labeled %}
Expand All @@ -266,7 +274,7 @@ extension {{ namespace }} {
disabled: {{ obj.is_disabled()|swift }},
)
{% for arg_name in extra_metric_args if obj[arg_name] is defined %}
, {{ obj[arg_name]|swift }}
, {{arg_name|camelize}}: {{ obj[arg_name]|swift }}
{% endfor %}
),
{% else %}
Expand Down