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

Experiment: Strict parsing only on Liquid::Variable #1932

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −17
Draft

Experiment: Strict parsing only on Liquid::Variable #1932

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
24 changes: 7 additions & 17 deletions lib/liquid/variable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def initialize(markup, parse_context)
@parse_context = parse_context
@line_number = parse_context.line_number

strict_parse_with_error_mode_fallback(markup)
strict_parse_with_error_context(markup)
end

def raw
Expand All @@ -41,22 +41,12 @@ def markup_context(markup)
"in \"{{#{markup}}}\""
end

def lax_parse(markup)
@filters = []
return unless markup =~ MarkupWithQuotedFragment

name_markup = Regexp.last_match(1)
filter_markup = Regexp.last_match(2)
@name = parse_context.parse_expression(name_markup)
if filter_markup =~ FilterMarkupRegex
filters = Regexp.last_match(1).scan(FilterParser)
filters.each do |f|
next unless f =~ /\w+/
filtername = Regexp.last_match(0)
filterargs = f.scan(FilterArgsRegex).flatten
@filters << parse_filter_expressions(filtername, filterargs)
end
end
def strict_parse_with_error_context(markup)
strict_parse(markup)
rescue SyntaxError => e
e.line_number = line_number
e.markup_context = markup_context(markup)
raise e
end

def strict_parse(markup)
Expand Down
Loading