fix: improves macro param default value handling #524
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improves the regular expression used to detect macro parameter defaults. This should be a bit more permissive with white-space and multiple params on the Jinja2
default
function.Tested with the following example:
[gcode_macro TEST] gcode: {% set A = params.A | default(0, true) | float %} {% set B = params.B | int | default(0.005, true) | float %} {% set C = params.C | default("PLA", true) %} {% set D = params.D | default("PLA") %} {% set E = params.E | int | default(0.2) %}
The above example macro will show like this:
Fixes #376
Signed-off-by: Pedro Lamas [email protected]