[apex] Merge main (7.x) branch into experimental-apex-parser and fix tests#4479
Merged
adangel merged 6669 commits intoSep 22, 2023
Merged
Conversation
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.
Part of #3766
Merge main (7.x) branch into experimental-apex-parser and fix tests.
Conflict resolution and fixes include:
* Create root
ASTApexFilenodes* Correct source locations
* Insert comments by offset rather than line/column, using more of the mainline code
* Removed some unused methods
* Suppress Summit logger INFO output
* Suppress some (but not all) ANTLR version mismatch output
* Replace
ASTFormalComment.getToken()withgetImage()* Remove deleted APIs:
getLocation,hasSuppressWarningsAnnotationsFor,getModifiers* Remove code that was factored into
BaseApexClass* Replace all references to Jorje in rules
* Passing
AbstractApexNodeinstead ofApexNodeduring tree building* Extending and using
TextFileContentto convert line+column (as is native in Summit) to offset* Using the new visitor method and interface
* Replace
ApexRootNodewithBaseApexClass* Remove
AbstractApexNodeBase