Fix to #17236 - Improve readability of expressions in client evaluation exception #18228
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
|
ping |
smitpatel
reviewed
Oct 16, 2019
|
@AndriySvyryd @smitpatel new version up |
smitpatel
reviewed
Oct 16, 2019
smitpatel
reviewed
Oct 16, 2019
smitpatel
reviewed
Oct 16, 2019
| [ConditionalFact] | ||
| public void BinaryExpression_printed_correctly() | ||
| { | ||
| Assert.Equal("7 == 42", _expressionPrinter.Print(Expression.MakeBinary(ExpressionType.Equal, Expression.Constant(7), Expression.Constant(42)))); |
There was a problem hiding this comment.
May be.
new ExpressionPrinter().Print(((Expression<Func<int, bool>>)(e => e > 42)).Body)
maumar
force-pushed
the
fix17236
branch
2 times, most recently
from
350facc
to
2ffc3f4
Compare
AndriySvyryd
approved these changes
Oct 17, 2019
smitpatel
reviewed
Oct 17, 2019
| Visit(methodArguments[0]); | ||
|
|
||
| var methodDeclaringType = methodCallExpression.Method.DeclaringType; | ||
| if (methodDeclaringType == typeof(Queryable) |
There was a problem hiding this comment.
I thought checking for extension method was sufficient to remove this specific type checks.
There was a problem hiding this comment.
Also this increments the indent but check below to decrement the indent check only for simplified method.
There was a problem hiding this comment.
this special cases Enumerable/Queryable to be printed as:
souce
.Method(arguments)
rather than single line
smitpatel
reviewed
Oct 17, 2019
| expressionPrinter.Append($"MaterializeCollectionNavigation({Navigation}, "); | ||
| expressionPrinter.Visit(Subquery); | ||
| expressionPrinter.Append(")"); | ||
| expressionPrinter.AppendLine("MaterializeCollectionNavigation("); |
There was a problem hiding this comment.
Remove ( after the expression type. Use nameof syntax.
…on exception Adding a new switch to ExpressionPrinter that creates simplified output for Print and verbose (i.e. what we had before this change) for PrintDebug. Simplified output means: - displaying extension methods as extension methods rather than regular static methods, - simplifying display of Navigation object, - not showing if lambda body references parameter that is out of scope. Also fixed minor display bugs in expression printer. Also some changes in testing: - added unit tests for ExpressionPrinter, - DRY the "translation failed" tests, - "translation failed" tests no longer verify expression in the exception message and instead just make sure that right exception is thrown.
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.
Adding a new switch to ExpressionPrinter that creates simplified output for Print and verbose (i.e. what we had before this change) for PrintDebug.
Simplified output means:
Also fixed minor display bugs in expression printer.
Also some changes in testing:
Resolves #17236