herb 0.8.7-x86_64-linux-gnu → 0.8.8-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ffd98aa2a443b6d486632b5046eee0b46265f3d4febb152749b59bba3a4e3cb
-  data.tar.gz: 490573581d4f9db09142087f8e73d16f340e117e1f25f6097ab898a0ab62769a
+  metadata.gz: c6032d5c4fe9a02ecb37700f9f652cfeee17db41145b7d1aefecce3681b65401
+  data.tar.gz: 8b2b4cb98aa7ae626a88440cf7d570887e644296446343f412100c1fe8adb32c
 SHA512:
-  metadata.gz: 629799777d75e926f8803ac3bd324deeaa8abe0450c3c4c8cb7fedf6c1b0a3299dac46eff2b78fd32e2bde2df0b8747f90997d62187d35f4ee2e1863fe892c54
-  data.tar.gz: bf38746b08eadf1d319b96be5af90fd936a01324cdbf47ceee25cb3049dcd3784c564d4c169efc1106423b47810d3e7d17150d41cc73cc17611eeee3f175a18a
+  metadata.gz: 37dddbb69bbe521479a9a7da83a2fa2e2f803705c620f99df3e11eebd9eadf306bff464da87ae134ef5a528137c3544e6331e1d619a7e93321547a08041f6c6d
+  data.tar.gz: 78d52a028705b93be08302a28f364f6fb7e66e4184c2d6f35bf60390c7f41daff8309746a7dd5d8fd45bdb94a2bba880079d3e8300727b1b603319301d18ad45

data/Rakefile

@@ -159,6 +159,13 @@ namespace :prism do
       puts "Vendoring '#{file}' Prism file to #{vendored_file_path}"
       FileUtils.cp_r(prism_bundle_path + "/#{file}", prism_vendor_path)
     end
+
+    prism_ast_header = "#{prism_vendor_path}/include/prism/ast.h"
+
+    unless File.exist?(prism_ast_header)
+      puts "Generating Prism template files..."
+      system("ruby #{prism_vendor_path}/templates/template.rb", exception: true)
+    end
   end
 
   desc "Clean vendored Prism in vendor/prism/"

data/config.yml

@@ -425,6 +425,9 @@ nodes:
         - name: tag_closing
           type: token
 
+        - name: then_keyword
+          type: location
+
         # - name: predicate
         #   type: prism_node
 
@@ -479,6 +482,9 @@ nodes:
         - name: tag_closing
           type: token
 
+        - name: then_keyword
+          type: location
+
         # - name: conditions
         #   type: array
         #   kind: prism_node
@@ -699,6 +705,9 @@ nodes:
         - name: tag_closing
           type: token
 
+        - name: then_keyword
+          type: location
+
         # - name: predicate
         #   type: prism_node
 
@@ -736,6 +745,9 @@ nodes:
         - name: tag_closing
           type: token
 
+        - name: then_keyword
+          type: location
+
         - name: statements
           type: array
           kind: Node

data/ext/herb/extconf.rb

@@ -2,10 +2,6 @@
 
 require "mkmf"
 
-Dir.chdir(File.expand_path("../..", __dir__)) do
-  system("rake templates", exception: true)
-end
-
 extension_name = "herb"
 
 include_path = File.expand_path("../../src/include", __dir__)

data/ext/herb/nodes.c

@@ -464,7 +464,7 @@ static VALUE rb_erb_content_node_from_c_struct(AST_ERB_CONTENT_NODE_T* erb_conte
   VALUE erb_content_node_tag_opening = rb_token_from_c_struct(erb_content_node->tag_opening);
   VALUE erb_content_node_content = rb_token_from_c_struct(erb_content_node->content);
   VALUE erb_content_node_tag_closing = rb_token_from_c_struct(erb_content_node->tag_closing);
-  /* #<Herb::Template::AnalyzedRubyField:0x00007f575e7335e0 @name="analyzed_ruby", @options={kind: nil}> */
+  /* #<Herb::Template::AnalyzedRubyField:0x00007f0381d4abf8 @name="analyzed_ruby", @options={kind: nil}> */
   VALUE erb_content_node_analyzed_ruby = Qnil;
   VALUE erb_content_node_parsed = (erb_content_node->parsed) ? Qtrue : Qfalse;
   VALUE erb_content_node_valid = (erb_content_node->valid) ? Qtrue : Qfalse;
@@ -566,23 +566,25 @@ static VALUE rb_erb_if_node_from_c_struct(AST_ERB_IF_NODE_T* erb_if_node) {
   VALUE erb_if_node_tag_opening = rb_token_from_c_struct(erb_if_node->tag_opening);
   VALUE erb_if_node_content = rb_token_from_c_struct(erb_if_node->content);
   VALUE erb_if_node_tag_closing = rb_token_from_c_struct(erb_if_node->tag_closing);
+  VALUE erb_if_node_then_keyword = (erb_if_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_if_node->then_keyword) : Qnil;
   VALUE erb_if_node_statements = rb_nodes_array_from_c_array(erb_if_node->statements);
   VALUE erb_if_node_subsequent = rb_node_from_c_struct((AST_NODE_T*) erb_if_node->subsequent);
   VALUE erb_if_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_if_node->end_node);
 
-  VALUE args[9] = {
+  VALUE args[10] = {
     type,
     location,
     errors,
     erb_if_node_tag_opening,
     erb_if_node_content,
     erb_if_node_tag_closing,
+    erb_if_node_then_keyword,
     erb_if_node_statements,
     erb_if_node_subsequent,
     erb_if_node_end_node
   };
 
-  return rb_class_new_instance(9, args, ERBIfNode);
+  return rb_class_new_instance(10, args, ERBIfNode);
 };
 
 static VALUE rb_erb_block_node_from_c_struct(AST_ERB_BLOCK_NODE_T* erb_block_node) {
@@ -638,19 +640,21 @@ static VALUE rb_erb_when_node_from_c_struct(AST_ERB_WHEN_NODE_T* erb_when_node)
   VALUE erb_when_node_tag_opening = rb_token_from_c_struct(erb_when_node->tag_opening);
   VALUE erb_when_node_content = rb_token_from_c_struct(erb_when_node->content);
   VALUE erb_when_node_tag_closing = rb_token_from_c_struct(erb_when_node->tag_closing);
+  VALUE erb_when_node_then_keyword = (erb_when_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_when_node->then_keyword) : Qnil;
   VALUE erb_when_node_statements = rb_nodes_array_from_c_array(erb_when_node->statements);
 
-  VALUE args[7] = {
+  VALUE args[8] = {
     type,
     location,
     errors,
     erb_when_node_tag_opening,
     erb_when_node_content,
     erb_when_node_tag_closing,
+    erb_when_node_then_keyword,
     erb_when_node_statements
   };
 
-  return rb_class_new_instance(7, args, ERBWhenNode);
+  return rb_class_new_instance(8, args, ERBWhenNode);
 };
 
 static VALUE rb_erb_case_node_from_c_struct(AST_ERB_CASE_NODE_T* erb_case_node) {
@@ -963,23 +967,25 @@ static VALUE rb_erb_unless_node_from_c_struct(AST_ERB_UNLESS_NODE_T* erb_unless_
   VALUE erb_unless_node_tag_opening = rb_token_from_c_struct(erb_unless_node->tag_opening);
   VALUE erb_unless_node_content = rb_token_from_c_struct(erb_unless_node->content);
   VALUE erb_unless_node_tag_closing = rb_token_from_c_struct(erb_unless_node->tag_closing);
+  VALUE erb_unless_node_then_keyword = (erb_unless_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_unless_node->then_keyword) : Qnil;
   VALUE erb_unless_node_statements = rb_nodes_array_from_c_array(erb_unless_node->statements);
   VALUE erb_unless_node_else_clause = rb_node_from_c_struct((AST_NODE_T*) erb_unless_node->else_clause);
   VALUE erb_unless_node_end_node = rb_node_from_c_struct((AST_NODE_T*) erb_unless_node->end_node);
 
-  VALUE args[9] = {
+  VALUE args[10] = {
     type,
     location,
     errors,
     erb_unless_node_tag_opening,
     erb_unless_node_content,
     erb_unless_node_tag_closing,
+    erb_unless_node_then_keyword,
     erb_unless_node_statements,
     erb_unless_node_else_clause,
     erb_unless_node_end_node
   };
 
-  return rb_class_new_instance(9, args, ERBUnlessNode);
+  return rb_class_new_instance(10, args, ERBUnlessNode);
 };
 
 static VALUE rb_erb_yield_node_from_c_struct(AST_ERB_YIELD_NODE_T* erb_yield_node) {
@@ -1031,19 +1037,21 @@ static VALUE rb_erb_in_node_from_c_struct(AST_ERB_IN_NODE_T* erb_in_node) {
   VALUE erb_in_node_tag_opening = rb_token_from_c_struct(erb_in_node->tag_opening);
   VALUE erb_in_node_content = rb_token_from_c_struct(erb_in_node->content);
   VALUE erb_in_node_tag_closing = rb_token_from_c_struct(erb_in_node->tag_closing);
+  VALUE erb_in_node_then_keyword = (erb_in_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_in_node->then_keyword) : Qnil;
   VALUE erb_in_node_statements = rb_nodes_array_from_c_array(erb_in_node->statements);
 
-  VALUE args[7] = {
+  VALUE args[8] = {
     type,
     location,
     errors,
     erb_in_node_tag_opening,
     erb_in_node_content,
     erb_in_node_tag_closing,
+    erb_in_node_then_keyword,
     erb_in_node_statements
   };
 
-  return rb_class_new_instance(7, args, ERBInNode);
+  return rb_class_new_instance(8, args, ERBInNode);
 };
 
 

data/lib/herb/ast/nodes.rb

@@ -1277,16 +1277,18 @@ module Herb
       attr_reader :tag_opening #: Herb::Token
       attr_reader :content #: Herb::Token
       attr_reader :tag_closing #: Herb::Token
+      attr_reader :then_keyword #: Herb::Location
       attr_reader :statements #: Array[Herb::AST::Node]
       attr_reader :subsequent #: Herb::AST::Node
       attr_reader :end_node #: Herb::AST::ERBEndNode
 
-      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node], Herb::AST::Node, Herb::AST::ERBEndNode) -> void
-      def initialize(type, location, errors, tag_opening, content, tag_closing, statements, subsequent, end_node)
+      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node], Herb::AST::Node, Herb::AST::ERBEndNode) -> void
+      def initialize(type, location, errors, tag_opening, content, tag_closing, then_keyword, statements, subsequent, end_node)
         super(type, location, errors)
         @tag_opening = tag_opening
         @content = content
         @tag_closing = tag_closing
+        @then_keyword = then_keyword
         @statements = statements
         @subsequent = subsequent
         @end_node = end_node
@@ -1298,6 +1300,7 @@ module Herb
           tag_opening: tag_opening,
           content: content,
           tag_closing: tag_closing,
+          then_keyword: then_keyword,
           statements: statements,
           subsequent: subsequent,
           end_node: end_node,
@@ -1348,6 +1351,9 @@ module Herb
         output += white("├── tag_closing: ")
         output += tag_closing ? tag_closing.tree_inspect : magenta("∅")
         output += "\n"
+        output += white("├── then_keyword: ")
+        output += then_keyword ? dimmed("(location: #{then_keyword.tree_inspect})") : magenta("∅")
+        output += "\n"
         output += white("├── statements: ")
         output += inspect_array(statements, prefix: "│   ", indent: indent, depth: depth + 1, depth_limit: depth_limit)
         output += white("├── subsequent: ")
@@ -1468,14 +1474,16 @@ module Herb
       attr_reader :tag_opening #: Herb::Token
       attr_reader :content #: Herb::Token
       attr_reader :tag_closing #: Herb::Token
+      attr_reader :then_keyword #: Herb::Location
       attr_reader :statements #: Array[Herb::AST::Node]
 
-      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node]) -> void
-      def initialize(type, location, errors, tag_opening, content, tag_closing, statements)
+      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node]) -> void
+      def initialize(type, location, errors, tag_opening, content, tag_closing, then_keyword, statements)
         super(type, location, errors)
         @tag_opening = tag_opening
         @content = content
         @tag_closing = tag_closing
+        @then_keyword = then_keyword
         @statements = statements
       end
 
@@ -1485,6 +1493,7 @@ module Herb
           tag_opening: tag_opening,
           content: content,
           tag_closing: tag_closing,
+          then_keyword: then_keyword,
           statements: statements,
         }) #: Herb::serialized_erb_when_node
       end
@@ -1533,6 +1542,9 @@ module Herb
         output += white("├── tag_closing: ")
         output += tag_closing ? tag_closing.tree_inspect : magenta("∅")
         output += "\n"
+        output += white("├── then_keyword: ")
+        output += then_keyword ? dimmed("(location: #{then_keyword.tree_inspect})") : magenta("∅")
+        output += "\n"
         output += white("└── statements: ")
         output += inspect_array(statements, prefix: "    ", indent: indent, depth: depth + 1, depth_limit: depth_limit)
         output += "\n"
@@ -2321,16 +2333,18 @@ module Herb
       attr_reader :tag_opening #: Herb::Token
       attr_reader :content #: Herb::Token
       attr_reader :tag_closing #: Herb::Token
+      attr_reader :then_keyword #: Herb::Location
       attr_reader :statements #: Array[Herb::AST::Node]
       attr_reader :else_clause #: Herb::AST::ERBElseNode
       attr_reader :end_node #: Herb::AST::ERBEndNode
 
-      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node], Herb::AST::ERBElseNode, Herb::AST::ERBEndNode) -> void
-      def initialize(type, location, errors, tag_opening, content, tag_closing, statements, else_clause, end_node)
+      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node], Herb::AST::ERBElseNode, Herb::AST::ERBEndNode) -> void
+      def initialize(type, location, errors, tag_opening, content, tag_closing, then_keyword, statements, else_clause, end_node)
         super(type, location, errors)
         @tag_opening = tag_opening
         @content = content
         @tag_closing = tag_closing
+        @then_keyword = then_keyword
         @statements = statements
         @else_clause = else_clause
         @end_node = end_node
@@ -2342,6 +2356,7 @@ module Herb
           tag_opening: tag_opening,
           content: content,
           tag_closing: tag_closing,
+          then_keyword: then_keyword,
           statements: statements,
           else_clause: else_clause,
           end_node: end_node,
@@ -2392,6 +2407,9 @@ module Herb
         output += white("├── tag_closing: ")
         output += tag_closing ? tag_closing.tree_inspect : magenta("∅")
         output += "\n"
+        output += white("├── then_keyword: ")
+        output += then_keyword ? dimmed("(location: #{then_keyword.tree_inspect})") : magenta("∅")
+        output += "\n"
         output += white("├── statements: ")
         output += inspect_array(statements, prefix: "│   ", indent: indent, depth: depth + 1, depth_limit: depth_limit)
         output += white("├── else_clause: ")
@@ -2496,14 +2514,16 @@ module Herb
       attr_reader :tag_opening #: Herb::Token
       attr_reader :content #: Herb::Token
       attr_reader :tag_closing #: Herb::Token
+      attr_reader :then_keyword #: Herb::Location
       attr_reader :statements #: Array[Herb::AST::Node]
 
-      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node]) -> void
-      def initialize(type, location, errors, tag_opening, content, tag_closing, statements)
+      #: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node]) -> void
+      def initialize(type, location, errors, tag_opening, content, tag_closing, then_keyword, statements)
         super(type, location, errors)
         @tag_opening = tag_opening
         @content = content
         @tag_closing = tag_closing
+        @then_keyword = then_keyword
         @statements = statements
       end
 
@@ -2513,6 +2533,7 @@ module Herb
           tag_opening: tag_opening,
           content: content,
           tag_closing: tag_closing,
+          then_keyword: then_keyword,
           statements: statements,
         }) #: Herb::serialized_erb_in_node
       end
@@ -2561,6 +2582,9 @@ module Herb
         output += white("├── tag_closing: ")
         output += tag_closing ? tag_closing.tree_inspect : magenta("∅")
         output += "\n"
+        output += white("├── then_keyword: ")
+        output += then_keyword ? dimmed("(location: #{then_keyword.tree_inspect})") : magenta("∅")
+        output += "\n"
         output += white("└── statements: ")
         output += inspect_array(statements, prefix: "    ", indent: indent, depth: depth + 1, depth_limit: depth_limit)
         output += "\n"

data/lib/herb/engine/debug_visitor.rb

@@ -301,7 +301,7 @@ module Herb
       end
 
       def in_excluded_context?
-        excluded_tags = ["script", "style", "head", "textarea", "pre"]
+        excluded_tags = ["script", "style", "head", "textarea", "pre", "svg", "math"]
         return true if excluded_tags.any? { |tag| @element_stack.include?(tag) }
 
         return true if @erb_block_stack.any? { |node| javascript_tag?(node.content.value.strip) }

data/lib/herb/version.rb

@@ -2,5 +2,5 @@
 # typed: true
 
 module Herb
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/lib/herb.rb

@@ -31,9 +31,36 @@ require_relative "herb/engine"
 
 begin
   major, minor, _patch = RUBY_VERSION.split(".") #: [String, String, String]
-  require_relative "herb/#{major}.#{minor}/herb"
-rescue LoadError
-  require_relative "herb/herb"
+
+  if RUBY_PATCHLEVEL == -1
+    require_relative "herb/herb"
+  else
+    begin
+      require_relative "herb/#{major}.#{minor}/herb"
+    rescue LoadError
+      require_relative "herb/herb"
+    end
+  end
+rescue LoadError => e
+  raise LoadError, <<~MESSAGE
+    Failed to load the Herb native extension.
+
+    Tried to load: #{e.message.split(" -- ").last}
+
+    This can happen when:
+      1. You're using a preview/development version of Ruby (RUBY_PATCHLEVEL=#{RUBY_PATCHLEVEL})
+      2. The native extension wasn't compiled during gem installation
+      3. Required build tools (C compiler) were missing during installation
+
+    To fix, try reinstalling with source compilation:
+      gem install herb --platform ruby
+
+    If compilation fails, install a C compiler first:
+      - macOS:          xcode-select --install
+      - Ubuntu/Debian:  apt-get install build-essential
+      - Fedora/RHEL:    dnf install make gcc
+      - Alpine:         apk add build-base
+  MESSAGE
 end
 
 module Herb

data/sig/herb/ast/nodes.rbs

@@ -540,14 +540,16 @@ module Herb
 
       attr_reader tag_closing: Herb::Token
 
+      attr_reader then_keyword: Herb::Location
+
       attr_reader statements: Array[Herb::AST::Node]
 
       attr_reader subsequent: Herb::AST::Node
 
       attr_reader end_node: Herb::AST::ERBEndNode
 
-      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node], Herb::AST::Node, Herb::AST::ERBEndNode) -> void
-      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node], Herb::AST::Node, Herb::AST::ERBEndNode) -> void
+      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node], Herb::AST::Node, Herb::AST::ERBEndNode) -> void
+      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node], Herb::AST::Node, Herb::AST::ERBEndNode) -> void
 
       # : () -> serialized_erb_if_node
       def to_hash: () -> serialized_erb_if_node
@@ -612,10 +614,12 @@ module Herb
 
       attr_reader tag_closing: Herb::Token
 
+      attr_reader then_keyword: Herb::Location
+
       attr_reader statements: Array[Herb::AST::Node]
 
-      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node]) -> void
-      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node]) -> void
+      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node]) -> void
+      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node]) -> void
 
       # : () -> serialized_erb_when_node
       def to_hash: () -> serialized_erb_when_node
@@ -937,14 +941,16 @@ module Herb
 
       attr_reader tag_closing: Herb::Token
 
+      attr_reader then_keyword: Herb::Location
+
       attr_reader statements: Array[Herb::AST::Node]
 
       attr_reader else_clause: Herb::AST::ERBElseNode
 
       attr_reader end_node: Herb::AST::ERBEndNode
 
-      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node], Herb::AST::ERBElseNode, Herb::AST::ERBEndNode) -> void
-      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node], Herb::AST::ERBElseNode, Herb::AST::ERBEndNode) -> void
+      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node], Herb::AST::ERBElseNode, Herb::AST::ERBEndNode) -> void
+      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node], Herb::AST::ERBElseNode, Herb::AST::ERBEndNode) -> void
 
       # : () -> serialized_erb_unless_node
       def to_hash: () -> serialized_erb_unless_node
@@ -1005,10 +1011,12 @@ module Herb
 
       attr_reader tag_closing: Herb::Token
 
+      attr_reader then_keyword: Herb::Location
+
       attr_reader statements: Array[Herb::AST::Node]
 
-      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node]) -> void
-      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Array[Herb::AST::Node]) -> void
+      # : (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node]) -> void
+      def initialize: (String, Location, Array[Herb::Errors::Error], Herb::Token, Herb::Token, Herb::Token, Herb::Location, Array[Herb::AST::Node]) -> void
 
       # : () -> serialized_erb_in_node
       def to_hash: () -> serialized_erb_in_node

data/sig/serialized_ast_nodes.rbs

@@ -112,6 +112,7 @@ module Herb
     tag_opening: Herb::Token,
     content: Herb::Token,
     tag_closing: Herb::Token,
+    then_keyword: Herb::Location,
     statements: Array[Herb::AST::Node],
     subsequent: Herb::AST::Node,
     end_node: Herb::AST::ERBEndNode,
@@ -129,6 +130,7 @@ module Herb
     tag_opening: Herb::Token,
     content: Herb::Token,
     tag_closing: Herb::Token,
+    then_keyword: Herb::Location,
     statements: Array[Herb::AST::Node],
   }
 
@@ -206,6 +208,7 @@ module Herb
     tag_opening: Herb::Token,
     content: Herb::Token,
     tag_closing: Herb::Token,
+    then_keyword: Herb::Location,
     statements: Array[Herb::AST::Node],
     else_clause: Herb::AST::ERBElseNode,
     end_node: Herb::AST::ERBEndNode,
@@ -221,6 +224,7 @@ module Herb
     tag_opening: Herb::Token,
     content: Herb::Token,
     tag_closing: Herb::Token,
+    then_keyword: Herb::Location,
     statements: Array[Herb::AST::Node],
   }