Repository navigation
Added support for runtime expressions embedded in string literals #290
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bb59c5f
Scaffolded the CompositeRuntime key
darrelmiller 81581aa
CompositeExpression is working
darrelmiller 267daff
Added extra test based on issue #287
darrelmiller aae0c00
Added copyright header
darrelmiller 0338e60
Merge remote-tracking branch 'origin/vnext' into dm/callbackkey
darrelmiller File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||
| // Licensed under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Text.RegularExpressions; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Microsoft.OpenApi.Expressions | ||
| { | ||
| /// <summary> | ||
| /// String literal with embedded expressions | ||
| /// </summary> | ||
| public class CompositeExpression : RuntimeExpression | ||
| { | ||
| private readonly string template; | ||
| private Regex expressionPattern = new Regex("{(?<exp>[^}]+)"); | ||
| /// <summary> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit, please add one newline for readability |
||
| /// Expressions embedded into string literal | ||
| /// </summary> | ||
| public List<RuntimeExpression> ContainedExpressions = new List<RuntimeExpression>(); | ||
|
|
||
| /// <summary> | ||
| /// Create a composite expression from a string literal with an embedded expression | ||
| /// </summary> | ||
| /// <param name="expression"></param> | ||
| public CompositeExpression(string expression) | ||
| { | ||
| template = expression; | ||
|
|
||
| // Extract subexpressions and convert to RuntimeExpressions | ||
| var matches = expressionPattern.Matches(expression); | ||
|
|
||
| foreach (var item in matches.Cast<Match>()) | ||
| { | ||
| var value = item.Groups["exp"].Captures.Cast<Capture>().First().Value; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
nit, call this runtimeExpression instead of value |
||
| ContainedExpressions.Add(RuntimeExpression.Build(value)); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Return original string literal with embedded expression | ||
| /// </summary> | ||
| public override string Expression => template; | ||
| } | ||
| } | ||
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure if template is the right word here... maybe "originalExpression" ?