Fix Rooibos_init injection causing duplicate calls #247
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
luis-j-soares
commented
Jan 5, 2024
| walkMode: WalkMode.visitAllRecursive | ||
| }); | ||
| if (!initCall) { | ||
| editor.addToArray(mainFunction.func.body.statements, 0, new RawCodeStatement(`Rooibos_init("${this.config?.testSceneName ?? 'RooibosScene'}")`)); |
There was a problem hiding this comment.
I've considered changing this line to use codegen methods instead of RawCodeStatement, but decided not to in order to keep the PR small and concise. It's something that could be considered in a future refactor if we want more safety.
Suggested change
| editor.addToArray(mainFunction.func.body.statements, 0, new RawCodeStatement(`Rooibos_init("${this.config?.testSceneName ?? 'RooibosScene'}")`)); | |
| editor.addToArray(mainFunction.func.body.statements, 0, new ExpressionStatement(createCall( | |
| createVariableExpression('rooibos_init'), | |
| [ | |
| createVariableExpression(`"${this.config?.testSceneName ?? 'RooibosScene'}"`) | |
| ] | |
| ))); |
There was a problem hiding this comment.
It's probably not a bad idea. @TwitchBronBron and I where looking today to move the modifyAssertions to proper ast transformations.
There was a problem hiding this comment.
agree; good idea, we can revisit in another pr.
georgejecook
approved these changes
Jan 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The rooibos plugin will create a main function if it doesn't exist. And if it does, it will inject a
Rooibos_init(...)call as its first statement.However, the way this is set up creates a duplicate call when both the function and statement already exist in the original source code. This causes problems when you need your project to control when/where it's called (i.e. to support sockets, as seen in #212).
This PR helps by detecting if such a call is already made, and only inject it if it's not found.