-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
OnlyCheckWhitespaceInsideParenthesis Fixes #5863 #5868
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ff68e80
Only check whitespace inside parenthesis
Forgind e9bce0b
Only check first and last parenthesis
Forgind ea47c80
Add test
Forgind e1e5926
Account for non-zero starting index
Forgind 2984301
Scans for a property with a space and no non-ID chars
Forgind 51b0232
Cleaner check
Forgind dd8a689
Apply suggestions from code review
Forgind 78cf00a
Add relevant test
Forgind 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 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 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 |
---|---|---|
|
@@ -27,7 +27,7 @@ internal sealed class Scanner | |
private string _expression; | ||
private int _parsePoint; | ||
private Token _lookahead; | ||
private bool _errorState; | ||
internal bool _errorState; | ||
private int _errorPosition; | ||
// What we found instead of what we were looking for | ||
private string _unexpectedlyFound = null; | ||
|
@@ -321,36 +321,39 @@ private string ParsePropertyOrItemMetadata() | |
private static bool ScanForPropertyExpressionEnd(string expression, int index, out int indexResult) | ||
{ | ||
int nestLevel = 0; | ||
bool whitespaceCheck = false; | ||
|
||
unsafe | ||
{ | ||
fixed (char* pchar = expression) | ||
{ | ||
if (expression.Length > 1 && pchar[0] == '(' && char.IsWhiteSpace(pchar[1]) && ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave16_10)) | ||
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. is the first character in the expression guaranteed to be a '('? Should this maybe move under the `if (character == '(')? Something like: if (character == '(')
{
if (nestLevel == 0 && index + 1 > expression.Length && pchar[index + 1] == '(' && char.IsWhiteSpace(pchar[1]) && ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave16_10))
{
indexResult = 1;
return false;
}
nestLevel++;
} 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. Yes |
||
{ | ||
indexResult = 1; | ||
return false; | ||
} | ||
|
||
while (index < expression.Length) | ||
{ | ||
char character = pchar[index]; | ||
if (character == '(') | ||
{ | ||
nestLevel++; | ||
whitespaceCheck = true; | ||
} | ||
else if (character == ')') | ||
{ | ||
nestLevel--; | ||
whitespaceCheck = false; | ||
} | ||
else if (whitespaceCheck && char.IsWhiteSpace(character) && ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave16_10)) | ||
{ | ||
indexResult = index; | ||
return false; | ||
} | ||
|
||
// We have reached the end of the parenthesis nesting | ||
// this should be the end of the property expression | ||
// If it is not then the calling code will determine that | ||
if (nestLevel == 0) | ||
{ | ||
if (index > 0 && char.IsWhiteSpace(pchar[index - 1]) && ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave16_10)) | ||
{ | ||
indexResult = index - 1; | ||
return false; | ||
} | ||
|
||
indexResult = index; | ||
return true; | ||
} | ||
|
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.
These are examples of things we wish we could catch but we can't with current limitations. Can you instead use examples we want to work like
?
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.
Actually, looking at this, I think even starts/ends with space is too aggressive.
$( x.StartsWith ( y ) )
is a bit ugly but works just fine today. Maybe it has to be "has a space and is otherwise only identifier characters"? That would correctly reject$(x x)
from your examples here.