Parser: Treat javascript_tag content as foreign content

Author: marcoroth

src/analyze/action_view/tag_helpers.c

@@ -687,7 +687,7 @@ static AST_NODE_T* transform_erb_block_to_tag_helper(
   AST_NODE_T* close_tag = (AST_NODE_T*) block_node->end_node;
 
   if (tag_name && parser_is_foreign_content_tag(hb_string_from_c_string(tag_name)) && context->source
-      && block_node->body && hb_array_size(block_node->body) > 0) {
+      && block_node->end_node != NULL) {
     size_t start_offset = block_node->tag_closing->range.to;
     size_t end_offset = block_node->end_node->tag_opening->range.from;
 
@@ -959,6 +959,18 @@ void transform_tag_helper_blocks(const AST_NODE_T* node, analyze_ruby_context_T*
     case AST_HTML_OPEN_TAG_NODE: array = ((AST_HTML_OPEN_TAG_NODE_T*) node)->children; break;
     case AST_HTML_ATTRIBUTE_VALUE_NODE: array = ((AST_HTML_ATTRIBUTE_VALUE_NODE_T*) node)->children; break;
     case AST_ERB_BLOCK_NODE: array = ((AST_ERB_BLOCK_NODE_T*) node)->body; break;
+    case AST_ERB_IF_NODE: array = ((AST_ERB_IF_NODE_T*) node)->statements; break;
+    case AST_ERB_UNLESS_NODE: array = ((AST_ERB_UNLESS_NODE_T*) node)->statements; break;
+    case AST_ERB_ELSE_NODE: array = ((AST_ERB_ELSE_NODE_T*) node)->statements; break;
+    case AST_ERB_WHILE_NODE: array = ((AST_ERB_WHILE_NODE_T*) node)->statements; break;
+    case AST_ERB_UNTIL_NODE: array = ((AST_ERB_UNTIL_NODE_T*) node)->statements; break;
+    case AST_ERB_FOR_NODE: array = ((AST_ERB_FOR_NODE_T*) node)->statements; break;
+    case AST_ERB_BEGIN_NODE: array = ((AST_ERB_BEGIN_NODE_T*) node)->statements; break;
+    case AST_ERB_RESCUE_NODE: array = ((AST_ERB_RESCUE_NODE_T*) node)->statements; break;
+    case AST_ERB_ENSURE_NODE: array = ((AST_ERB_ENSURE_NODE_T*) node)->statements; break;
+    case AST_ERB_WHEN_NODE: array = ((AST_ERB_WHEN_NODE_T*) node)->statements; break;
+    case AST_ERB_CASE_NODE: array = ((AST_ERB_CASE_NODE_T*) node)->children; break;
+    case AST_ERB_CASE_MATCH_NODE: array = ((AST_ERB_CASE_MATCH_NODE_T*) node)->children; break;
     default: return;
   }
 

test/analyze/action_view/javascript_helper/javascript_tag_test.rb

@@ -55,5 +55,23 @@ class JavaScriptTagTest < Minitest::Spec
         <% end %>
       HTML
     end
+
+    test "javascript_tag with HTML-like content in block (gh-1426)" do
+      assert_parsed_snapshot(<<~HTML, action_view_helpers: true)
+        <%= javascript_tag do %>
+          n <o.length
+        <% end %>
+      HTML
+    end
+
+    test "javascript_tag with HTML-like content in block (gh-1426)" do
+      assert_parsed_snapshot(<<~HTML, action_view_helpers: true)
+        <%= javascript_tag do %>
+          const html = "<code><%= content %></code>";
+
+          console.log(html)
+        <% end %>
+      HTML
+    end
   end
 end

test/parser/tags_test.rb

@@ -305,5 +305,13 @@ class TagsTest < Minitest::Spec
     test "case-insensitive style tag" do
       assert_parsed_snapshot(%(<STYLE>.class { color: red; }</style>))
     end
+
+    test "less-than operator with dot method access is parsed as text not a tag (gh-1426)" do
+      assert_parsed_snapshot("n <o.length")
+    end
+
+    test "less-than operator followed by lowercase identifier and dot is parsed as text" do
+      assert_parsed_snapshot("<foo.bar")
+    end
   end
 end