Squash curly brace bug

Author: SirGoodenough

color_multi_tool.jinja

@@ -435,9 +435,9 @@
 {#- First a test to make sure this is a list -#}
 {%- if hsl is list -%}
   {%- set _hs2rgb = hs2rgb(hsl).split(",") | list -%}
-  {%- set _hs2rgb_list = [_hs2rgb[0]|int(0),_hs2rgb[1]|int(0),_hs2rgb[2]|int(0)] -%}}
+  {%- set _hs2rgb_list = [_hs2rgb[0]|int(0),_hs2rgb[1]|int(0),_hs2rgb[2]|int(0)] | list -%}
   {%- set _rgb2xy = rgb2xy(_hs2rgb_list).split(",") | list -%}
-  {%- set _rgb2xy_list = [_rgb2xy[0]|float(0)|round(3),_rgb2xy[1]|float(0)|round(3)] -%}
+  {%- set _rgb2xy_list = [_rgb2xy[0]|float(0)|round(3),_rgb2xy[1]|float(0)|round(3)] | list -%}
 {#- Calculated output -#}
   {%- set X = _rgb2xy_list[0] | float(0.0) | round(3) -%}
   {%- set Y = _rgb2xy_list[1] | float(0.0) | round(3) -%}
@@ -471,9 +471,9 @@
 {#- First a test to make sure this is a list -#}
 {%- if xyl is list -%}
   {%- set _xy2rgb = xy2rgb(xyl).split(",") | list -%}
-  {%- set _xy2rgb_list = [_xy2rgb[0]|int(0),_xy2rgb[1]|int(0),_xy2rgb[2]|int(0)] -%}
+  {%- set _xy2rgb_list = [_xy2rgb[0]|int(0),_xy2rgb[1]|int(0),_xy2rgb[2]|int(0)] | list -%}
   {%- set _rgb2hs = rgb2hs(_xy2rgb_list).split(",") | list -%}
-  {%- set _rgb2hs_list = [_rgb2hs[0]|float(0)|round(3),_rgb2hs[1]|float(0)|round(3)] -%}
+  {%- set _rgb2hs_list = [_rgb2hs[0]|float(0)|round(3),_rgb2hs[1]|float(0)|round(3)] | list -%}
 {#- Calculated output -#}
   {%- set H = _rgb2hs_list[0] | float(0.0) | round(3) -%}
   {%- set S = _rgb2hs_list[1] | float(0.0) | round(3) -%}
@@ -1088,33 +1088,41 @@
 } -%}
 
 {#-
-TESTING CODE FOR DEVELOPER TAB TO TEST THIS CUSTOMK JINJA:
+TESTING CODE FOR DEVELOPER TAB TO TEST THIS CUSTOM JINJA:
 
-{% from 'color_multi_tool.jinja' import random_name, random_xy, random_hs, random_rgb, name2rgb, rgb2xy, xy2rgb, hs2rgb, rgb2hs, xy2hs, hs2xy %}
-macro random name: {{ random_name() }}
-macro random xy list: {% set _rxy = random_xy().split(",") | list -%}
-{{ [_rxy[0]|float|round(3),_rxy[1]|float|round(3)] }}
-macro random hs list: {% set _rhs = random_hs().split(",") | list -%}
-{{ [_rhs[0]|float|round(3),_rhs[1]|float|round(2)] }}
-macro random rgb list: {% set _rrgb = random_rgb().split(",") | list -%}
-{{ [_rrgb[0]|int(0),_rrgb[1]|int(0),_rrgb[2]|int(0)] }}
-
-macro name to rgb list: {% set _nrgb_name = random_name() %}
-{%- set _nrgb = name2rgb(_nrgb_name).split(",") | list -%}
-{{- _nrgb_name }} {{ [_nrgb[0]|int(0),_nrgb[1]|int(0),_nrgb[2]|int(0)] }}
-macro rgb to xy list: {% set _rgb2xy = rgb2xy(_nrgb).split(",") | list -%}
-{{ [_rgb2xy[0]|float(0)|round(3),_rgb2xy[1]|float(0)|round(3)] }}
-macro xy to rgb list: {% set _xy2rgb = xy2rgb(_rgb2xy).split(",") | list -%}
-{{ [_xy2rgb[0]|int(0),_xy2rgb[1]|int(0),_xy2rgb[2]|int(0)] }}
-
-macro hs to rgb list: {% set _hs2rgb = hs2rgb(_rhs).split(",") | list -%}
-{{ [_hs2rgb[0]|int(0),_hs2rgb[1]|int(0),_hs2rgb[2]|int(0)] }}
-macro rgb to hs list: {% set _rgb2hs = rgb2hs(_hs2rgb).split(",") | list -%}
-{{ [_rgb2hs[0]|float(0)|round(3),_rgb2hs[1]|float(0)|round(3)] }}
-
-macro xy to hs list: {% set _xy2hs = xy2hs(_rxy).split(",") | list -%}
-{{ [_xy2hs[0]|float(0)|round(3),_xy2hs[1]|float(0)|round(3)] }}
-macro hs to xy list: {% set _hs2xy = hs2xy(_xy2hs).split(",") | list -%}
-{{ [_hs2xy[0]|float(0)|round(3),_hs2xy[1]|float(0)|round(3)] }}
+{% from 'color_multi_tool.jinja' import random_name, random_xy, random_hs, random_rgb,
+  name2rgb, rgb2xy, xy2rgb, hs2rgb, rgb2hs, xy2hs, hs2xy %}
+0 macro random name: {{ random_name() }}
+1 macro random xy list: {% set _rxy1 = random_xy().split(",") | list -%}
+{% set _rxy1_list = [_rxy1[0]|float|round(3),_rxy1[1]|float|round(3)] -%}
+{{ _rxy1_list }}
+2 macro random hs list: {% set _rhs2 = random_hs().split(",") | list -%}
+{% set _rhs2_list =  [_rhs2[0]|float|round(3),_rhs2[1]|float|round(2)] -%}
+{{ _rhs2_list }} 
+3 macro random rgb list: {% set _rrgb3 = random_rgb().split(",") | list -%}
+{% set _rrgb3_list = [_rrgb3[0]|int(0),_rrgb3[1]|int(0),_rrgb3[2]|int(0)] -%}
+{{ _rrgb3_list }} 
 
+4 macro name to rgb list: {% set _nrgb4_name = random_name() %}
+{%- set _nrgb4 = name2rgb(_nrgb4_name).split(",") | list -%}
+{% set _nrgb4_list = [_nrgb4[0]|int(0),_nrgb4[1]|int(0),_nrgb4[2]|int(0)] -%}
+{{- _nrgb4_name }} {{ _nrgb4_list }}
+5 (using #4) macro rgb to xy list: {% set _rgb2zy5 = rgb2xy(_nrgb4_list).split(",") | list -%}
+{% set _rgb2zy5_list = [_rgb2zy5[0]|float(0)|round(3),_rgb2zy5[1]|float(0)|round(3)] -%}
+{{ _rgb2zy5_list }}
+6 (using #5) macro xy to rgb list: {% set _xy2rgb6 = xy2rgb(_rgb2zy5_list).split(",") | list -%}
+{% set _xy2rgb6_list = [_xy2rgb6[0]|int(0),_xy2rgb6[1]|int(0),_xy2rgb6[2]|int(0)] -%}
+{{ _xy2rgb6_list }}
+8 (using #6) macro rgb to hs list: {% set _rgb2hs8 = rgb2hs(_xy2rgb6_list).split(",") | list -%}
+{% set _rgb2hs8_list = [_rgb2hs8[0]|float(0)|round(3),_rgb2hs8[1]|float(0)|round(3)] -%}
+{{ _rgb2hs8_list }}
+7 (using #8) macro hs to rgb list: {% set _hs2rgb7 = hs2rgb(_rgb2hs8_list).split(",") | list -%}
+{% set _hs2rgb7_list = [_hs2rgb7[0]|int(0),_hs2rgb7[1]|int(0),_hs2rgb7[2]|int(0)] -%}
+{{ _hs2rgb7_list }}
+A (using #8) macro hs to xy list: {% set _hs2xyA = hs2xy(_rgb2hs8_list).split(",") | list -%}
+{% set _hs2xyA_list = [_hs2xyA[0]|float(0)|round(3),_hs2xyA[1]|float(0)|round(3)] -%}
+{{ _hs2xyA_list }}
+9 (using #A) macro xy to hs list: {% set _xy2hs9 = xy2hs(_hs2xyA_list).split(",") | list -%}
+{% set _xy2hs9_list = [_xy2hs9[0]|float(0)|round(3),_xy2hs9[1]|float(0)|round(3)] -%}
+{{ _xy2hs9_list }}
 -#}