Refactor getMacroMatches & fix a couple of bugs #863
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.
What this PR does / why we need it:
This refactors and updates
getMacroMatches
andparseArgs
to remove duplicated logic and address two bugs.Refactoring: previously
getMacroMatches
andparseArgs
did quite a bit of overlapping work:getMacroMatches
would parse the input string to find a bracketed substring string representing macro arguments, thenparseArgs
would take that string and parse it again to extract the arguments. The logic was also implemented differently in each. I've moved all the work of parsing arguments intoparseArgs
.Bugs addressed:
getMacroMatches
to panicWhich issue(s) this PR fixes:
Fixes #859, #861.
Special notes for your reviewer:
Once the base branch (
858-changes_from_sqlds
) is merged I'll retarget this tomain
.