Merge Freeze into Develop #960
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
There was a problem where operand types were not converted to the required unsigned or bit types before determining the common result type. Also fix equivalent unsigned type for INT.
Also add exceptions for semantically relevant literal conversions.
Log exceptions in evaluator process to aid in debugging problems related to evaluator execution.
Catch all exceptions when closing shared resources in evaluator to ensure proper termination regardless of exceptions in any of the shared resources.
The call to prepare the evaluator needs to be before resolving the instance event.
Relax the validation of CASE statements to allow comparable types for CASE labels, instead of requiring that the type of the label is assignable to the type of the selector expression.
The current resource in the ST editor also contains the ST algorithms and methods of the copied internal FB type and their parameters. These were subsequently included in the object descriptions of the resource, which caused stale or ambiguous references compared to the actual ST algorithms and methods in the ST source. This filters the ST algorithms and methods of the internal FB type, including their children, when computing the descriptions to avoid the problem.
don't create manifest on resolve if it is missing start resolve on creation of project manifest
There was an NPE when attempting to refactor an FB type with empty contents. This can happen for SIFBs or CFBs, which do not have an ST source, as well as SFBs and BFBs with no algorithms or methods. This fixes the problem by not attempting to refactor such types with Xtext in the first place.
The package name was also updated for simple renames in the ST refactoring participant. This could cause a mismatch between the package name seen by Xtext and the actual package name, in cases where the package name did not conform to the folder structure. This fixes the problem by not updating the package name for simple renames.
The imports were previously only updated for types associated with an Xtext resource. This adds the missing updates for non-Xtext resources, such as structs, attribtes, adapters, subapps, and systems.
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.
No description provided.