fix: incomplete tag parsing

Author: edgurgel

CHANGELOG.md

@@ -1,4 +1,11 @@
-# 1.0.0
+# 1.0.1 (2025-07-04)
+
+## Bug fixes
+
+* Fix parsing error when tags were incomplete
+* Point to the opening tag/object line and column when they are not closed properly
+
+# 1.0.0 (2025-06-16)
 
 ## Enhancements
 

lib/solid/lexer.ex

@@ -34,7 +34,7 @@ defmodule Solid.Lexer do
   @doc "Tokenize the input text inside an object"
   @spec tokenize_object(ParserContext.t()) ::
           {:ok, tokens, ParserContext.t()}
-          | {:error, reason :: term, rest :: binary, loc}
+          | {:error, reason :: binary, rest :: binary, loc}
   def tokenize_object(%ParserContext{rest: "{{" <> text, line: line, column: column} = context) do
     # The actual whitespace control is handled elsewhere
     {text, column} = drop(text, column + 2, "-")
@@ -50,7 +50,7 @@ defmodule Solid.Lexer do
           {:ok, tag_name :: binary, ParserContext.t()}
           | {:liquid_tag, ParserContext.t()}
           | {:end_liquid_tag, ParserContext.t()}
-          | {:error, reason :: term, rest :: binary, loc}
+          | {:error, reason :: binary, rest :: binary, loc}
           | {:error, :not_expected_tag}
   def tokenize_tag_start(context, opts \\ []) do
     allowed_tag_names = Keyword.get(opts, :allowed_tag_names, [])
@@ -112,7 +112,7 @@ defmodule Solid.Lexer do
 
   @doc "Tokenize the rest of the tag after the tag name"
   @spec tokenize_tag_end(ParserContext.t()) ::
-          {:ok, tokens, ParserContext.t()} | {:error, reason :: term, rest :: binary, loc}
+          {:ok, tokens, ParserContext.t()} | {:error, reason :: binary, rest :: binary, loc}
   def tokenize_tag_end(context) do
     if context.mode == :liquid_tag do
       with {:ok, tokens, text, line, column} <-
@@ -133,7 +133,7 @@ defmodule Solid.Lexer do
           {:ok, tag_name :: binary, tokens, ParserContext.t()}
           | {:liquid_tag, ParserContext.t()}
           | {:end_liquid_tag, ParserContext.t()}
-          | {:error, reason :: term, rest :: binary, loc}
+          | {:error, reason :: binary, rest :: binary, loc}
           | {:error, :not_expected_tag}
   def tokenize_tag(context, opts \\ []) do
     with {:ok, tag_name, context} <- tokenize_tag_start(context, opts),

lib/solid/parser.ex

@@ -23,6 +23,13 @@ defmodule Solid.Parser do
     parse(%ParserContext{rest: text, line: 1, column: 1, mode: :normal, tags: tags}, [], [])
   end
 
+  defp parse(%ParserContext{rest: ""}, acc, errors) do
+    case {acc, errors} do
+      {acc, []} -> {:ok, Enum.reverse(acc)}
+      {_, errors} -> {:error, Enum.reverse(errors)}
+    end
+  end
+
   defp parse(context, acc, errors) do
     case parse_liquid_entry(context) do
       {:ok, result, context} ->
@@ -232,6 +239,10 @@ defmodule Solid.Parser do
             {:error, reason, loc, context}
         end
 
+      {:error, "Tag or Object not properly terminated" = reason, rest, loc} ->
+        {:error, reason, %{line: context.line, column: context.column},
+         %{context | rest: rest, line: loc[:line], column: loc[:column]}}
+
       {:error, reason, rest, loc} ->
         {:error, reason, loc, %{context | rest: rest, line: loc[:line], column: loc[:column]}}
     end
@@ -248,6 +259,13 @@ defmodule Solid.Parser do
 
           {:error, reason, loc} ->
             {:error, reason, loc, context}
+
+          {:error, "Tag or Object not properly terminated" = reason, rest, loc} ->
+            {:error, reason, %{line: line, column: column},
+             %{context | rest: rest, line: loc[:line], column: loc[:column]}}
+
+          {:error, reason, rest, loc} ->
+            {:error, reason, loc, %{context | rest: rest, line: loc[:line], column: loc[:column]}}
         end
 
       {:liquid_tag, context} ->

lib/solid/tag.ex

@@ -9,6 +9,7 @@ defmodule Solid.Tag do
             ) ::
               {:ok, Renderable.t(), ParserContext.t()}
               | {:error, reason :: binary, Lexer.loc()}
+              | {:error, reason :: binary, rest :: binary, Lexer.loc()}
 
   def default_tags do
     %{
@@ -35,6 +36,7 @@ defmodule Solid.Tag do
   @spec parse(tag_name :: binary, Loc.t(), ParserContext.t()) ::
           {:ok, Renderable.t(), ParserContext.t()}
           | {:error, reason :: binary, Lexer.loc()}
+          | {:error, reason :: binary, rest :: binary, Lexer.loc()}
   def parse(tag_name, loc, context) do
     module = (context.tags || default_tags())[tag_name]
 

mix.exs

@@ -2,7 +2,7 @@ defmodule Solid.MixProject do
   use Mix.Project
 
   @source_url "https://github.com/edgurgel/solid"
-  @version "1.0.0"
+  @version "1.0.1"
 
   def project do
     [

test/solid/parser_test.exs

@@ -1553,5 +1553,46 @@ defmodule Solid.ParserTest do
                   {"Unexpected tag 'endunless'", %{line: 3, column: 1}}
                 ]}
     end
+
+    test "broken tag" do
+      template = "{% if - %}"
+
+      assert parse(template) == {:error, [{"Unexpected character '-'", %{column: 7, line: 1}}]}
+    end
+
+    test "incomplete object" do
+      template = "{{ abc"
+
+      assert parse(template) ==
+               {:error,
+                [
+                  {
+                    "Tag or Object not properly terminated",
+                    %{column: 1, line: 1}
+                  }
+                ]}
+    end
+
+    test "incomplete tag" do
+      template = "{% if a == 3"
+
+      assert parse(template) ==
+               {:error,
+                [
+                  {
+                    "Tag or Object not properly terminated",
+                    %{column: 1, line: 1}
+                  }
+                ]}
+    end
+
+    test "incomplete liquid tag" do
+      template = """
+      {% liquid
+      if true
+      """
+
+      assert {:error, _} = parse(template)
+    end
   end
 end

test/solid_test.exs

@@ -45,7 +45,7 @@ defmodule SolidTest do
                %Solid.TemplateError{
                  errors: [
                    %Solid.ParserError{
-                     meta: %{line: 1, column: 14},
+                     meta: %{line: 1, column: 1},
                      reason: "Tag or Object not properly terminated",
                      text: "{{ form.title"
                    }