Animation Sequence merger rewrite - #16
Merged
Merged
Conversation
Make errors with multiple contexts display more than just the top-most error, so that people stop claiming they get the same error. This is similar to the change that generifies the top-most error message, but I like this one more because it actually gives some info
Need to solve references to objects Currently refers to all objects as their own Needs to use a list of elements and a map of children
There's like 5 commits worth of changes in here. Screw it. Uh... Appeased the linter Implemented diff and merge behavior for subtypes in case I ever figure out how to implement it for the overall AnimSeq type Implemented diff and merge behavior for AnimSeq type as just passing the bas file through to the end Implemented and hooked the traverser into the initial AnimSeq conversion Turned Element extensions into a map of extension type: Extension so that we don't try to diff different extension types Probably some other stuff, I don't know
Linter appeasement!
Use MissingAampKey for missing aamp keys (novel idea!) Specify Self type in invalid-parameter-type errors
Probably way overkill, but better than failure I guess
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Right now it just replaces the AS files wholesale, but it does in-depth checking of just about everything I can think of that might error in a bas file, including...
Also, because the format is so extensively complete, it'll be real easy to trampoline off of this for a real merger again, if I ever figure out how to programmatically solve AnimSeq merging. Probably not gonna happen, though, considering how complex the merging can get.