Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-20 11:20:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use parse_context or options instead of @options.

Browse Source
This commit is contained in:
Dylan Thacker-Smith
2015-07-08 19:21:59 -04:00
parent 920e1df643
commit c45310170b
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/block.rb
+5 -5
View File
@@ -26,14 +26,14 @@ module Liquid
def unknown_tag(tag, _params, _tokens)
case tag
when 'else'.freeze
raise SyntaxError.new(options[:locale].t("errors.syntax.unexpected_else".freeze,
raise SyntaxError.new(parse_context.locale.t("errors.syntax.unexpected_else".freeze,
block_name: block_name))
when 'end'.freeze
raise SyntaxError.new(options[:locale].t("errors.syntax.invalid_delimiter".freeze,
raise SyntaxError.new(parse_context.locale.t("errors.syntax.invalid_delimiter".freeze,
block_name: block_name,
block_delimiter: block_delimiter))
else
raise SyntaxError.new(options[:locale].t("errors.syntax.unknown_tag".freeze, tag: tag))
raise SyntaxError.new(parse_context.locale.t("errors.syntax.unknown_tag".freeze, tag: tag))
end
end
@@ -48,12 +48,12 @@ module Liquid
protected
def parse_body(body, tokens)
body.parse(tokens, options) do |end_tag_name, end_tag_params|
body.parse(tokens, parse_context) do |end_tag_name, end_tag_params|
@blank &&= body.blank?
return false if end_tag_name == block_delimiter
unless end_tag_name
raise SyntaxError.new(@options[:locale].t("errors.syntax.tag_never_closed".freeze, block_name: block_name))
raise SyntaxError.new(parse_context.locale.t("errors.syntax.tag_never_closed".freeze, block_name: block_name))
end
# this tag is not registered with the system