Add expression support across properties #1431
Merged
Conversation
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
…rious view models and editors
…ons in property editor
…tter expression handling
…roperty editor menu
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Contributor
There was a problem hiding this comment.
Pull request overview
This PR implements comprehensive expression support across properties in the Beutl application. It introduces a new expression evaluation system using C# scripting (Roslyn), enables circular reference detection, and provides UI components for editing expressions. The change also systematically replaces Observable.Return with a new Observable.ReturnThenNever pattern throughout the codebase to prevent observables from completing prematurely.
Key Changes
- Adds expression infrastructure with
IExpression<T>,ExpressionContext,PropertyLookup, andExpressionGlobalsfor evaluating mathematical expressions on properties - Implements circular reference detection during expression evaluation to prevent infinite loops
- Introduces new UI components (
ExpressionEditorFlyout, updatedPropertyEditorMenu) with visual indicators for expression status - Replaces
Observable.ReturnwithObservable.ReturnThenNeverpattern across 30+ files to maintain observable streams
Reviewed changes
Copilot reviewed 51 out of 53 changed files in this pull request and generated 18 comments.
Show a summary per file
| File | Description |
|---|---|
| src/Beutl.Core/Reactive/ObservableExtensions.cs | Defines new ReturnThenNever extension method (has syntax error) |
| src/Beutl.Core/CoreObjectExtensions.cs | Modifies FindById logic with potential infinite recursion issue |
| src/Beutl.Engine/Engine/Expressions/* | New expression evaluation infrastructure with scripting support |
| src/Beutl.Engine/Engine/AnimatableProperty.cs | Adds expression support with evaluation priority over animations |
| src/Beutl.Engine/Engine/IProperty.cs | Extends property interface with expression support |
| src/Beutl.Engine/Engine/SimpleProperty.cs | Stubs out expression support with validation |
| src/Beutl.Engine/Engine/ListProperty.cs | Stubs out expression support (incomplete validation) |
| src/Beutl.Engine/Beutl.Engine.csproj | Adds Microsoft.CodeAnalysis.CSharp.Scripting dependency |
| src/Beutl.Extensibility/IPropertyAdapter.cs | Adds IExpressionPropertyAdapter interfaces |
| src/Beutl.ProjectSystem/Operation/AnimatablePropertyAdapter.cs | Implements expression property adapter |
| src/Beutl.ProjectSystem/NodeTree/NodePropertyAdapter.cs | Stubs expression support for node tree (incomplete) |
| src/Beutl/Views/Editors/ExpressionEditorFlyout.cs | New flyout UI for expression editing with keyboard shortcuts |
| src/Beutl/Views/Editors/PropertyEditorMenu.axaml* | Updated menu with expression edit/remove options and visual indicators |
| src/Beutl/ViewModels/Editors/BaseEditorViewModel.cs | Adds expression methods and disables editing when expression is set |
| src/Beutl/ViewModels/Editors/ValueEditorViewModel.cs | Updates value display to show evaluated expression result |
| src/Beutl.Language/* | Adds localized strings for expression features (English and Japanese) |
| Directory.Packages.props | Adds Microsoft.CodeAnalysis.CSharp.Scripting version |
| Various Views/ViewModels | Systematic replacement of Observable.Return with ReturnThenNever |
Files not reviewed (2)
- src/Beutl.Language/Message.Designer.cs: Language not supported
- src/Beutl.Language/Strings.Designer.cs: Language not supported
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…lar reference detection
Co-authored-by: Copilot <[email protected]>
Member
Author
|
Member
Author
|
@copilot Expressionに問題がある場合、エラーを表示してください。 |
Contributor
Co-authored-by: yuto-trd <[email protected]>
… error Co-authored-by: yuto-trd <[email protected]>
Co-authored-by: yuto-trd <[email protected]>
Co-authored-by: yuto-trd <[email protected]>
Add expression support across properties
…on editing experience
Contributor
|
The following TODO comments were found: |
Contributor
Minimum allowed line rate is |
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.
Description
Implement expression support across various properties. Introduce new functionality for expression editing, circular reference detection, and status indication in the property editor menu. Replace certain observable patterns for improved handling of expressions.
Breaking changes
The changes to observable patterns may affect existing implementations relying on the previous
Observable.Returnbehavior.Fixed issues