Add indentation to string to quoted

Author: josevalim

lib/eex/lib/eex/compiler.ex

@@ -304,7 +304,7 @@ defmodule EEx.Compiler do
       source: source,
       line: line,
       quoted: [],
-      parser_options: parser_options,
+      parser_options: [indentation: indentation] ++ parser_options,
       indentation: indentation
     }
 

lib/eex/test/eex_test.exs

@@ -502,6 +502,59 @@ defmodule EExTest do
       end
     end
 
+    test "from Elixir parser" do
+      line = __ENV__.line + 6
+
+      message =
+        assert_raise TokenMissingError, fn ->
+          EEx.compile_string(
+            """
+            <li>
+              <strong>Some:</strong>
+              <%= true && @some[ %>
+            </li>
+            """,
+            file: __ENV__.file,
+            line: line,
+            indentation: 12
+          )
+        end
+
+      assert message |> Exception.message() |> strip_ansi() =~ """
+                  │
+              514 │                   true && @some[\s
+                  │                                │ └ missing closing delimiter (expected "]")
+                  │                                └ unclosed delimiter
+             """
+    end
+
+    test "from Elixir parser with line breaks" do
+      line = __ENV__.line + 6
+
+      message =
+        assert_raise TokenMissingError, fn ->
+          EEx.compile_string(
+            """
+            <li>
+              <strong>Some:</strong>
+              <%= true &&
+                @some[ %>
+            </li>
+            """,
+            file: __ENV__.file,
+            line: line,
+            indentation: 12
+          )
+        end
+
+      assert message |> Exception.message() |> strip_ansi() =~ """
+                  │
+              #{line + 3} │                 @some[\s
+                  │                      │ └ missing closing delimiter (expected "]")
+                  │                      └ unclosed delimiter
+             """
+    end
+
     test "honor line numbers" do
       assert_raise EEx.SyntaxError,
                    "nofile:100:6: expected closing '%>' for EEx expression",
@@ -948,6 +1001,12 @@ defmodule EExTest do
     end
   end
 
+  @strip_ansi [IO.ANSI.green(), IO.ANSI.red(), IO.ANSI.reset()]
+
+  defp strip_ansi(doc) do
+    String.replace(doc, @strip_ansi, "")
+  end
+
   defp assert_eval(expected, actual, binding \\ [], opts \\ []) do
     opts = Keyword.merge([file: __ENV__.file, engine: opts[:engine] || EEx.Engine], opts)
     result = EEx.eval_string(actual, binding, opts)

lib/elixir/src/elixir.erl

@@ -490,10 +490,14 @@ parser_location(Meta) ->
         {ok, Forms} ->
           Forms;
         {error, {Meta, Error, Token}} ->
-          elixir_errors:parse_error(Meta, File, Error, Token, {String, StartLine, StartColumn})
+          Indentation = proplists:get_value(indentation, Opts, 0),
+          Input = {String, StartLine, StartColumn, Indentation},
+          elixir_errors:parse_error(Meta, File, Error, Token, Input)
       end;
     {error, {Meta, Error, Token}} ->
-      elixir_errors:parse_error(Meta, File, Error, Token, {String, StartLine, StartColumn})
+      Indentation = proplists:get_value(indentation, Opts, 0),
+      Input = {String, StartLine, StartColumn, Indentation},
+      elixir_errors:parse_error(Meta, File, Error, Token, Input)
   end.
 
 to_binary(List) when is_list(List) -> elixir_utils:characters_to_binary(List);

lib/elixir/src/elixir_errors.erl

@@ -446,11 +446,12 @@ cut_snippet(Location, Input) ->
       nil
   end.
 
-cut_snippet({InputString, StartLine, StartColumn}, Line, Span) ->
+cut_snippet({InputString, StartLine, StartColumn, Indentation}, Line, Span) ->
   %% In case the code is indented, we need to add the indentation back
   %% for the snippets to match the reported columns.
-  Indent = binary:copy(<<" ">>, StartColumn - 1),
-  Lines = string:split(InputString, "\n", all),
+  Prelude = lists:duplicate(max(StartColumn - Indentation - 1, 0), " "),
+  Lines = string:split(Prelude ++ InputString, "\n", all),
+  Indent = binary:copy(<<" ">>, Indentation),
   [Head | Tail] = lists:nthtail(Line - StartLine, Lines),
   IndentedTail = indent_n(Tail, Span - 1, <<"\n", Indent/binary>>),
   elixir_utils:characters_to_binary([Indent, Head, IndentedTail]).

lib/elixir/src/elixir_tokenizer.erl

@@ -130,9 +130,11 @@ tokenize(String, Line, Column, Opts) ->
         Acc#elixir_tokenizer{preserve_comments=PreserveComments};
       ({unescape, Unescape}, Acc) when is_boolean(Unescape) ->
         Acc#elixir_tokenizer{unescape=Unescape};
+      ({indentation, Indentation}, Acc) when Indentation >= 0 ->
+        Acc#elixir_tokenizer{column=Indentation+1};
       (_, Acc) ->
         Acc
-    end, #elixir_tokenizer{identifier_tokenizer=IdentifierTokenizer, column=Column}, Opts),
+    end, #elixir_tokenizer{identifier_tokenizer=IdentifierTokenizer}, Opts),
 
   tokenize(String, Line, Column, Scope, []).