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

xpath abbreviate: add support for string literal that contains double-quote #96

Merged
merged 3 commits into from
May 26, 2023
Merged

xpath abbreviate: add support for string literal that contains double-quote #96

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b32affc
Add XPathParser#QuoteLiteral.
pulver May 25, 2023
d50d7f3
PR Feedback.
pulver May 26, 2023
d6a02b9
Make quote_literal private.
pulver May 26, 2023
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
17 changes: 16 additions & 1 deletion lib/rexml/parsers/xpathparser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def predicate_to_string( path, &block )
when :literal
path.shift
string << " "
string << path.shift.inspect
string << quote_literal(path.shift)
string << " "
else
string << " "
Expand All @@ -188,6 +188,21 @@ def predicate_to_string( path, &block )
return string.squeeze(" ")
end

def quote_literal( literal )
case literal
when String
# XPath 1.0 does not support escape characters.
# Assumes literal does not contain both single and double quotes.
if literal.include?("'")
"\"#{literal}\""
else
"'#{literal}'"
end
else
literal.inspect
end
end

private
Copy link
Member

Choose a reason for hiding this comment

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

Could you move this private above quote_literal?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done: d6a02b9

#LocationPath
# | RelativeLocationPath
Expand Down