herb 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f46fd278cb8e2a63d2b01da3f6774ba977468011af8f7b7a507c93ec5bec185
-  data.tar.gz: f79d15dfe1eb91d3043c5bb68afc10c0bff3192d2b803e43da90a1c598ca5220
+  metadata.gz: 8111ad1345234b5a96f1160876dd46d1c2ff7ed7909d6911231304ce2d21f633
+  data.tar.gz: 83b468456e7460ced71ee1db276e3a4be294e3c0fcae2c562b8b6eabfe812e91
 SHA512:
-  metadata.gz: 400ea668d34d47125d14c9d993001285ce8cff47a35c7452954b9196bcea8e1ec592dff0fa237060fa3106470ef63edbe3c78da96101ce9b308fe65fc802db52
-  data.tar.gz: f6df589dbc62c39b363c61aedb0f7e18f5b6f42021b6b76c91ae291f0d2de022957156c0ddfb72dac6d50343891c718af652f822882b7b755f4cefbe4c4aa9cc
+  metadata.gz: 1e6e97ebf077cbe5d13b899396b0bda7e41738792660a1fb9f0ae4e9eb94085a4166d88ca11a83e8348d159c41b64b7e8073b8a94729b396003633cbc9d90ac5
+  data.tar.gz: 600f96a221124533f445e9df3f8eeed0600b69811c0c8852d861aa33bfa4fedd5632f1cde1d11284afc6bbb006d7a5776251fae5bcb6a05f6091fcb2dc47b476

data/Rakefile

@@ -7,7 +7,8 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  # TODO: Drop the `test/rubocop` exclusion once https://github.com/rubocop/rubocop-ast/pull/420 is released and RuboCop is back in the main `Gemfile`.
+  t.test_files = FileList["test/**/*_test.rb"].exclude("test/rubocop/**/*")
 end
 
 Rake::TestTask.new("test:engine") do |t|
@@ -25,7 +26,8 @@ end
 Rake::TestTask.new("test:all") do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  # TODO: Drop the `test/rubocop` exclusion once https://github.com/rubocop/rubocop-ast/pull/420 is released and RuboCop is back in the main `Gemfile`.
+  t.test_files = FileList["test/**/*_test.rb"].exclude("test/rubocop/**/*")
 end
 
 task "make" do

data/config.yml

@@ -759,6 +759,12 @@ parser_options:
       default: false
       description: "Whether ActionView render call detection was enabled during parsing."
 
+    - name: "ruby_version"
+      type: "string"
+      default: "4.0"
+      validator: "herb_ruby_version_supported"
+      description: "Ruby version whose syntax Prism parses the ERB content with, such as `\"3.4\"`. Defaults to the latest released Ruby."
+
     - name: "strict"
       type: "boolean"
       default: true

data/ext/herb/extconf.rb

@@ -11,6 +11,7 @@ if Herb::Bootstrap.git_source? && !Herb::Bootstrap.templates_generated?
   unless Herb::Bootstrap.prism_vendored?
     prism_path = Herb::Bootstrap.find_prism_gem_path
 
+    # TODO: Point this back at the `ruby/prism` release tag the `Gemfile` uses once it moves off the fork.
     abort <<~MSG unless prism_path
       ERROR: Could not find Prism C source files.
 
@@ -19,7 +20,7 @@ if Herb::Bootstrap.git_source? && !Herb::Bootstrap.templates_generated?
 
       Add it to your Gemfile before the herb git reference:
 
-        gem "prism", github: "ruby/prism", tag: "v1.9.0"
+        gem "prism", github: "marcoroth/prism", ref: "4691667e2215831ae855add71d9925c0b871a709"
         gem "herb", github: "...", branch: "..."
 
       Then run `bundle install` again.
@@ -55,13 +56,10 @@ $VPATH << "$(srcdir)/../../src/parser"
 $VPATH << "$(srcdir)/../../src/prism"
 $VPATH << "$(srcdir)/../../src/lib"
 $VPATH << "$(srcdir)/../../src/util"
-$VPATH << prism_src_path
-$VPATH << "#{prism_src_path}/util"
 
 $INCFLAGS << " -I#{prism_include_path}"
 $INCFLAGS << " -I#{include_path}"
 $INCFLAGS << " -I#{prism_src_path}"
-$INCFLAGS << " -I#{prism_src_path}/util"
 
 $CFLAGS << " -fvisibility=hidden"
 $CFLAGS << " -DHERB_EXCLUDE_PRETTYPRINT"
@@ -71,32 +69,11 @@ $CFLAGS << " -DPRISM_EXCLUDE_PACK"
 
 herb_src_files = Dir.glob("#{$srcdir}/../../src/**/*.c").map { |file| file.delete_prefix("../../../../ext/herb/") }.sort
 
-prism_main_files = [
-  "diagnostic.c",
-  "encoding.c",
-  "node.c",
-  "options.c",
-  "pack.c",
-  "prettyprint.c",
-  "prism.c",
-  "regexp.c",
-  "serialize.c",
-  "static_literals.c",
-  "token_type.c"
-]
-
-prism_util_files = [
-  "pm_buffer.c",
-  "pm_char.c",
-  "pm_constant_pool.c",
-  "pm_integer.c",
-  "pm_list.c",
-  "pm_memchr.c",
-  "pm_newline_list.c",
-  "pm_string.c",
-  "pm_strncasecmp.c",
-  "pm_strpbrk.c"
-]
+prism_src_files = Dir.glob("#{prism_src_path}/*.c").map do |file|
+  wrapper = "prism_#{File.basename(file)}"
+  File.write(wrapper, "#include \"#{file}\"\n")
+  wrapper
+end
 
 core_src_files = [
   "extension.c",
@@ -106,7 +83,7 @@ core_src_files = [
   "parser_options_helpers.c"
 ]
 
-$srcs = core_src_files + herb_src_files + prism_main_files + prism_util_files
+$srcs = core_src_files + herb_src_files + prism_src_files
 
 puts "Sources to be compiled: #{$srcs.inspect}"
 

data/ext/herb/nodes.c

@@ -140,17 +140,17 @@ static VALUE rb_document_node_from_c_struct(AST_DOCUMENT_NODE_T* document_node,
   VALUE document_node_prism_context = Qnil;
   VALUE document_node_prism_node;
   if (document_node->prism_node.node != NULL && document_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(document_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(document_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      document_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      document_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(document_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(document_node_prism_node);
     } else {
       document_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     document_node_prism_node = Qnil;
   }
@@ -820,17 +820,17 @@ static VALUE rb_erb_content_node_from_c_struct(AST_ERB_CONTENT_NODE_T* erb_conte
   VALUE erb_content_node_valid = (erb_content_node->valid) ? Qtrue : Qfalse;
   VALUE erb_content_node_prism_node;
   if (erb_content_node->prism_node.node != NULL && erb_content_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_content_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_content_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_content_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_content_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_content_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_content_node_prism_node);
     } else {
       erb_content_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_content_node_prism_node = Qnil;
   }
@@ -933,17 +933,17 @@ static VALUE rb_erb_if_node_from_c_struct(AST_ERB_IF_NODE_T* erb_if_node, const
   VALUE erb_if_node_then_keyword = (options->track_locations && erb_if_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_if_node->then_keyword) : Qnil;
   VALUE erb_if_node_prism_node;
   if (erb_if_node->prism_node.node != NULL && erb_if_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_if_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_if_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_if_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_if_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_if_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_if_node_prism_node);
     } else {
       erb_if_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_if_node_prism_node = Qnil;
   }
@@ -987,17 +987,17 @@ static VALUE rb_erb_block_node_from_c_struct(AST_ERB_BLOCK_NODE_T* erb_block_nod
   VALUE erb_block_node_tag_closing = rb_token_from_c_struct(erb_block_node->tag_closing, options);
   VALUE erb_block_node_prism_node;
   if (erb_block_node->prism_node.node != NULL && erb_block_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_block_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_block_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_block_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_block_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_block_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_block_node_prism_node);
     } else {
       erb_block_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_block_node_prism_node = Qnil;
   }
@@ -1046,17 +1046,17 @@ static VALUE rb_erb_iteration_block_node_from_c_struct(AST_ERB_ITERATION_BLOCK_N
   VALUE erb_iteration_block_node_tag_closing = rb_token_from_c_struct(erb_iteration_block_node->tag_closing, options);
   VALUE erb_iteration_block_node_prism_node;
   if (erb_iteration_block_node->prism_node.node != NULL && erb_iteration_block_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_iteration_block_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_iteration_block_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_iteration_block_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_iteration_block_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_iteration_block_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_iteration_block_node_prism_node);
     } else {
       erb_iteration_block_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_iteration_block_node_prism_node = Qnil;
   }
@@ -1150,17 +1150,17 @@ static VALUE rb_erb_case_node_from_c_struct(AST_ERB_CASE_NODE_T* erb_case_node,
   VALUE erb_case_node_children = rb_nodes_array_from_c_array(erb_case_node->children, options);
   VALUE erb_case_node_prism_node;
   if (erb_case_node->prism_node.node != NULL && erb_case_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_case_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_case_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_case_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_case_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_case_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_case_node_prism_node);
     } else {
       erb_case_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_case_node_prism_node = Qnil;
   }
@@ -1205,17 +1205,17 @@ static VALUE rb_erb_case_match_node_from_c_struct(AST_ERB_CASE_MATCH_NODE_T* erb
   VALUE erb_case_match_node_children = rb_nodes_array_from_c_array(erb_case_match_node->children, options);
   VALUE erb_case_match_node_prism_node;
   if (erb_case_match_node->prism_node.node != NULL && erb_case_match_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_case_match_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_case_match_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_case_match_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_case_match_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_case_match_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_case_match_node_prism_node);
     } else {
       erb_case_match_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_case_match_node_prism_node = Qnil;
   }
@@ -1259,17 +1259,17 @@ static VALUE rb_erb_while_node_from_c_struct(AST_ERB_WHILE_NODE_T* erb_while_nod
   VALUE erb_while_node_tag_closing = rb_token_from_c_struct(erb_while_node->tag_closing, options);
   VALUE erb_while_node_prism_node;
   if (erb_while_node->prism_node.node != NULL && erb_while_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_while_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_while_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_while_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_while_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_while_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_while_node_prism_node);
     } else {
       erb_while_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_while_node_prism_node = Qnil;
   }
@@ -1310,17 +1310,17 @@ static VALUE rb_erb_until_node_from_c_struct(AST_ERB_UNTIL_NODE_T* erb_until_nod
   VALUE erb_until_node_tag_closing = rb_token_from_c_struct(erb_until_node->tag_closing, options);
   VALUE erb_until_node_prism_node;
   if (erb_until_node->prism_node.node != NULL && erb_until_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_until_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_until_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_until_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_until_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_until_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_until_node_prism_node);
     } else {
       erb_until_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_until_node_prism_node = Qnil;
   }
@@ -1361,17 +1361,17 @@ static VALUE rb_erb_for_node_from_c_struct(AST_ERB_FOR_NODE_T* erb_for_node, con
   VALUE erb_for_node_tag_closing = rb_token_from_c_struct(erb_for_node->tag_closing, options);
   VALUE erb_for_node_prism_node;
   if (erb_for_node->prism_node.node != NULL && erb_for_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_for_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_for_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_for_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_for_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_for_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_for_node_prism_node);
     } else {
       erb_for_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_for_node_prism_node = Qnil;
   }
@@ -1478,17 +1478,17 @@ static VALUE rb_erb_begin_node_from_c_struct(AST_ERB_BEGIN_NODE_T* erb_begin_nod
   VALUE erb_begin_node_tag_closing = rb_token_from_c_struct(erb_begin_node->tag_closing, options);
   VALUE erb_begin_node_prism_node;
   if (erb_begin_node->prism_node.node != NULL && erb_begin_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_begin_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_begin_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_begin_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_begin_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_begin_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_begin_node_prism_node);
     } else {
       erb_begin_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_begin_node_prism_node = Qnil;
   }
@@ -1536,17 +1536,17 @@ static VALUE rb_erb_unless_node_from_c_struct(AST_ERB_UNLESS_NODE_T* erb_unless_
   VALUE erb_unless_node_then_keyword = (options->track_locations && erb_unless_node->then_keyword != NULL) ? rb_location_from_c_struct(*erb_unless_node->then_keyword) : Qnil;
   VALUE erb_unless_node_prism_node;
   if (erb_unless_node->prism_node.node != NULL && erb_unless_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_unless_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_unless_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_unless_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_unless_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_unless_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_unless_node_prism_node);
     } else {
       erb_unless_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_unless_node_prism_node = Qnil;
   }
@@ -1684,17 +1684,17 @@ static VALUE rb_erb_render_node_from_c_struct(AST_ERB_RENDER_NODE_T* erb_render_
   VALUE erb_render_node_analyzed_ruby = Qnil;
   VALUE erb_render_node_prism_node;
   if (erb_render_node->prism_node.node != NULL && erb_render_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_render_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_render_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_render_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_render_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_render_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_render_node_prism_node);
     } else {
       erb_render_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_render_node_prism_node = Qnil;
   }
@@ -1780,17 +1780,17 @@ static VALUE rb_erb_strict_locals_node_from_c_struct(AST_ERB_STRICT_LOCALS_NODE_
   VALUE erb_strict_locals_node_analyzed_ruby = Qnil;
   VALUE erb_strict_locals_node_prism_node;
   if (erb_strict_locals_node->prism_node.node != NULL && erb_strict_locals_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_strict_locals_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_strict_locals_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_strict_locals_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_strict_locals_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_strict_locals_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_strict_locals_node_prism_node);
     } else {
       erb_strict_locals_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_strict_locals_node_prism_node = Qnil;
   }
@@ -1830,17 +1830,17 @@ static VALUE rb_erb_yield_node_from_c_struct(AST_ERB_YIELD_NODE_T* erb_yield_nod
   VALUE erb_yield_node_tag_closing = rb_token_from_c_struct(erb_yield_node->tag_closing, options);
   VALUE erb_yield_node_prism_node;
   if (erb_yield_node->prism_node.node != NULL && erb_yield_node->prism_node.parser != NULL) {
-    pm_buffer_t pm_buffer = { 0 };
-    herb_prism_node_serialize(erb_yield_node->prism_node, &pm_buffer);
+    pm_buffer_t* pm_buffer = pm_buffer_new();
+    herb_prism_node_serialize(erb_yield_node->prism_node, pm_buffer);
 
-    if (pm_buffer.length > 0) {
-      erb_yield_node_prism_node = rb_str_new(pm_buffer.value, pm_buffer.length);
+    if (pm_buffer_length(pm_buffer) > 0) {
+      erb_yield_node_prism_node = rb_str_new(pm_buffer_value(pm_buffer), pm_buffer_length(pm_buffer));
       rb_enc_associate(erb_yield_node_prism_node, rb_ascii8bit_encoding());
       OBJ_FREEZE(erb_yield_node_prism_node);
     } else {
       erb_yield_node_prism_node = Qnil;
     }
-    pm_buffer_free(&pm_buffer);
+    pm_buffer_free(pm_buffer);
   } else {
     erb_yield_node_prism_node = Qnil;
   }

data/ext/herb/parser_options_helpers.c

@@ -3,6 +3,8 @@
 
 #include "parser_options_helpers.h"
 
+#include <string.h>
+
 void herb_extract_parser_options(VALUE options, parser_options_T* parser_options) {
   if (NIL_P(options)) { return; }
 
@@ -74,6 +76,25 @@ void herb_extract_parser_options(VALUE options, parser_options_T* parser_options
     if (!NIL_P(value)) { parser_options->render_nodes = RTEST(value); }
   }
 
+  {
+    VALUE value = rb_hash_lookup(options, rb_utf8_str_new_cstr("ruby_version"));
+    if (NIL_P(value)) { value = rb_hash_lookup(options, ID2SYM(rb_intern("ruby_version"))); }
+
+    if (!NIL_P(value)) {
+      Check_Type(value, T_STRING);
+
+      const char* data = RSTRING_PTR(value);
+      size_t length = (size_t) RSTRING_LEN(value);
+
+      if (!herb_ruby_version_supported(data, length)) {
+        rb_raise(rb_eArgError, "ruby_version %+" PRIsVALUE " is not supported", value);
+      }
+
+      memcpy(parser_options->ruby_version, data, length);
+      parser_options->ruby_version[length] = '\0';
+    }
+  }
+
   {
     VALUE value = rb_hash_lookup(options, rb_utf8_str_new_cstr("strict"));
     if (NIL_P(value)) { value = rb_hash_lookup(options, ID2SYM(rb_intern("strict"))); }
@@ -140,6 +161,11 @@ VALUE herb_build_parser_options_hash(const parser_options_T* options) {
   rb_hash_aset(kwargs, ID2SYM(rb_intern("prism_nodes_deep")), options->prism_nodes_deep ? Qtrue : Qfalse);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("prism_program")), options->prism_program ? Qtrue : Qfalse);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("render_nodes")), options->render_nodes ? Qtrue : Qfalse);
+  rb_hash_aset(
+    kwargs,
+    ID2SYM(rb_intern("ruby_version")),
+    options->ruby_version[0] == '\0' ? Qnil : rb_utf8_str_new_cstr(options->ruby_version)
+  );
   rb_hash_aset(kwargs, ID2SYM(rb_intern("strict")), options->strict ? Qtrue : Qfalse);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("strict_locals")), options->strict_locals ? Qtrue : Qfalse);
   rb_hash_aset(kwargs, ID2SYM(rb_intern("timeout")), DBL2NUM((double) options->timeout_ms / 1000.0));

data/lib/herb/analysis/partial_index.rb

@@ -83,7 +83,7 @@ module Herb
 
       #: (String?, String?) -> PartialDeclaration?
       def lookup(partial_name, source_file)
-        file = resolve(partial_name, source_file).first
+        file = PartialResolution.preferred_for(resolve(partial_name, source_file), source_file)
 
         return nil unless file
 

data/lib/herb/analysis/partial_resolution.rb

@@ -6,6 +6,7 @@ module Herb
   module Analysis
     module PartialResolution
       PARTIAL_PREFIX = "_" #: String
+      VARIANT_SEPARATOR = "+" #: String
 
       EXTENSIONS = [
         ".html.erb",
@@ -84,6 +85,32 @@ module Herb
           files.sort { |a, b| outranks_template?(a, b) ? -1 : 1 }
         end
 
+        #: (String?) -> String?
+        def template_variant(file)
+          return nil unless file
+
+          basename = File.basename(file)
+          start = basename.index(VARIANT_SEPARATOR)
+
+          return nil unless start
+
+          variant = basename[(start + 1)..].to_s.sub(/\..*\z/, "")
+
+          variant.empty? ? nil : variant
+        end
+
+        #: (Array[String], String?) -> String?
+        def preferred_for(files, source_file)
+          variant = template_variant(source_file)
+
+          return files.first unless variant
+
+          matching = files.select { |file| template_variant(file) == variant }
+          preferred = matching.min_by { |file| [template_rank(File.basename(file).sub("#{VARIANT_SEPARATOR}#{variant}", "")), file] }
+
+          preferred || files.first
+        end
+
         #: (String, String | Pathname) -> String?
         def template_name_for(file, view_root)
           return nil if partial_path?(file)

data/lib/herb/ast/helpers.rb

@@ -32,7 +32,7 @@ module Herb
 
         opening = erb_opening(node)
 
-        opening.start_with?("<%") && !erb_output?(opening) && !erb_comment?(opening)
+        opening.start_with?("<%") && !erb_output?(opening) && !erb_omitted?(opening)
       end
 
       #: (String) -> bool

data/lib/herb/configuration.rb

@@ -100,11 +100,21 @@ module Herb
       parser["erb_openers"] || []
     end
 
+    #: () -> String?
+    def ruby_version
+      parser["ruby_version"]
+    end
+
     #: () -> Hash[Symbol, untyped]
     def parser_options
+      options = {} #: Hash[Symbol, untyped]
       openers = erb_openers
+      version = ruby_version
+
+      options[:erb_openers] = openers unless openers.empty?
+      options[:ruby_version] = version if version
 
-      openers.empty? ? {} : { erb_openers: openers }
+      options
     end
 
     def linter

data/lib/herb/dev/classifier.rb

@@ -61,7 +61,7 @@ module Herb
 
         return classification(:whitespace, operations: operations) if significant.empty?
 
-        kind = self.class.can_patch?(significant) && @parser_options.empty? ? :static : :dynamic
+        kind = self.class.can_patch?(significant) && @parser_options.except(:ruby_version).empty? ? :static : :dynamic
 
         classification(kind, operations: operations, node_path: covering_path(significant))
       end

data/lib/herb/engine/compiler.rb

@@ -875,10 +875,8 @@ module Herb
           @tokens << [:code, "#{effective_leading_space}#{code}#{right_space}", current_context]
           @trim_next_whitespace = true
 
-          if right_space.end_with?(" \n")
-            @pending_trim_newline_index = @tokens.length - 1
-            @pending_trim_owns_next_whitespace = true
-          end
+          @pending_trim_newline_index = @tokens.length - 1 if right_space.end_with?(" \n")
+          @pending_trim_owns_next_whitespace = true if right_space.end_with?(" \n") || without_source?(node)
         else
           @tokens << [:code, code, current_context]
         end
@@ -911,17 +909,16 @@ module Herb
       #: (bool) -> void
       def settle_pending_trim_newline!(keep)
         index = @pending_trim_newline_index
-
-        return unless index
-
         owned = @pending_trim_owns_next_whitespace
 
+        return unless index || owned
+
         @pending_trim_newline_index = nil
         @pending_trim_owns_next_whitespace = false
 
         return if keep
 
-        @tokens[index][1] = @tokens[index][1].chomp
+        @tokens[index][1] = @tokens[index][1].chomp if index
         @trim_next_whitespace = false if owned
       end