Skip to content

Parser: fix escape_single_quoted_newlines with nested string #5630

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

Merged
rmosolgo merged 1 commit into from
May 13, 2026
+9 −2
Merged

Parser: fix escape_single_quoted_newlines with nested string #5630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 2 deletions lib/graphql/language.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,19 @@ def self.serialize(value)
def self.escape_single_quoted_newlines(query_str)
scanner = StringScanner.new(query_str)
inside_single_quoted_string = false
inside_triple_quoted_string = false
new_query_str = nil
while !scanner.eos?
if scanner.skip(/(?:\\"|[^"\n\r]|""")+/m)
if scanner.skip('"""')
inside_triple_quoted_string = !inside_triple_quoted_string
new_query_str && (new_query_str << scanner.matched)
elsif scanner.skip(/(?:\\"|[^"\n\r])+/m)
new_query_str && (new_query_str << scanner.matched)
elsif scanner.skip('"')
new_query_str && (new_query_str << '"')
inside_single_quoted_string = !inside_single_quoted_string
if !inside_triple_quoted_string
inside_single_quoted_string = !inside_single_quoted_string
end
elsif scanner.skip("\n")
if inside_single_quoted_string
new_query_str ||= query_str[0, scanner.pos - 1]
Expand Down
1 change: 1 addition & 0 deletions spec/graphql/language/parser_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
# No modification to block strings:
"{ a(\"\"\"\n abc\n\"\"\") }" => "{ a(\"\"\"\n abc\n\"\"\") }",
"{ a(\"\"\"\r\n abc\r\n\"\"\") }" => "{ a(\"\"\"\r\n abc\r\n\"\"\") }",
"{ x(s: \"\"\"The user said \"Did\n\"you change my input ?\"\"\") }" => "{ x(s: \"\"\"The user said \"Did\n\"you change my input ?\"\"\") }",
}

replacements.each_with_index do |(before_str, after_str), idx|
Expand Down