Project upgrade tool: Better space handling in "export" #86598
Merged
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
the regex had two problems; they were not recognizing export statements that had spaces after "export", or export statements with no space before "var". These are both valid syntax, but the conversion was unsuccessful. This commit fixes both cases. test case 1: `export(int)var x = 1` old conversion: `@export(int)var x = 1` new conversion: `@export var x: int = 1` test case 2: `export (int) var y = 2` old conversion: `@export (int) var y = 2` new conversion: `@export var y: int = 2`
AThousandShips
approved these changes
Dec 29, 2023
akien-mga
changed the title
|
Thanks! |
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 regexes to convert "export" lines from godot 3 to godot 4 had two small issues: they weren't recognizing export statements with 1. spaces after "export" or 2. no space before "var".
These are both valid syntax, but the conversion tool did not recognize them. This commit fixes both cases.
test case 1:
export(int)var x = 1old conversion:
@export(int)var x = 1new conversion:
@export var x: int = 1test case 2:
export (int) var y = 2old conversion:
@export (int) var y = 2new conversion:
@export var y: int = 2These were tested by converting projects using the Import button in the project manager.