Skip to content
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.

Sign up for GitHub

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

Fix the problem with inner double quotes #195

Merged
merged 12 commits into from
Aug 13, 2018
Merged

Fix the problem with inner double quotes #195

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eca21da
Fix for ParseLambda with itType and resultType: correct order of argu…
Aug 1, 2018
4b7d15a
Add references for missing classes
Aug 1, 2018
cd4b420
Fix for missing classes: UserState and UserProfileDetails
Aug 1, 2018
c7d29f4
Small update on unit-test (no need to check for `DoesNotThrow`)
StefH Aug 2, 2018
e6ddce6
add comment to appveyor
StefH Aug 2, 2018
9a5e5e3
Only run SonarScanner on master branch
StefH Aug 2, 2018
02bda33
APPVEYOR_REPO_BRANCH
StefH Aug 2, 2018
e77c116
APPVEYOR_PULL_REQUEST_NUMBER
StefH Aug 2, 2018
d7d432b
No working unit test for inner double quotes
Aug 10, 2018
2c840f8
Fix for inner double quotes
Aug 10, 2018
8590347
Merge branch 'master' into pull-requests-branch
OlegNadymov Aug 10, 2018
e13c9d1
Using {}
Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,16 @@ Expression ParseStringLiteral()
_textParser.ValidateToken(TokenId.StringLiteral);
char quote = _textParser.CurrentToken.Text[0];
string s = _textParser.CurrentToken.Text.Substring(1, _textParser.CurrentToken.Text.Length - 2);
int index1 = 0;
while (true)
{
int index2 = s.IndexOf(quote, index1);
if (index2 < 0)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use {} in this new code. Example:

if (index2 < 0)
{
    break;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok! I'm done.

break;
if (index2 + 1 < s.Length && s[index2 + 1] == quote)
s = s.Remove(index2, 1);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use {} in this new code. Example:

if (index2 < 0)
{
    break;
}

Copy link
Contributor Author

@OlegNadymov OlegNadymov Aug 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StefH Ok! It was done.

index1 = index2 + 1;
}

if (quote == '\'')
{
Expand Down