Skip to content

Add parens meta to stab operator and empty block #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Add parens meta to stab operator and empty block #13973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions lib/elixir/src/elixir_parser.yrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ access_expr -> fn_eoe stab_eoe 'end' : build_fn('$1', '$2', '$3').
access_expr -> open_paren stab_eoe ')' : build_paren_stab('$1', '$2', '$3').
access_expr -> open_paren ';' stab_eoe ')' : build_paren_stab('$1', '$3', '$4').
access_expr -> open_paren ';' close_paren : build_paren_stab('$1', [], '$3').
access_expr -> empty_paren : warn_empty_paren('$1'), {'__block__', [], []}.
access_expr -> empty_paren : warn_empty_paren('$1'), {'__block__', parens_meta('$1'), []}.
access_expr -> int : handle_number(number_value('$1'), '$1', ?exprs('$1')).
access_expr -> flt : handle_number(number_value('$1'), '$1', ?exprs('$1')).
access_expr -> char : handle_number(?exprs('$1'), '$1', number_value('$1')).
Expand Down Expand Up @@ -342,15 +342,15 @@ stab_expr -> expr :
stab_expr -> stab_op_eol_and_expr :
build_op([], '$1').
stab_expr -> empty_paren stab_op_eol_and_expr :
build_op([], '$2').
build_op_with_meta([], '$2', parens_meta('$1')).
stab_expr -> empty_paren when_op expr stab_op_eol_and_expr :
build_op([{'when', meta_from_token('$2'), ['$3']}], '$4').
build_op_with_meta([{'when', meta_from_token('$2'), ['$3']}], '$4', parens_meta('$1')).
stab_expr -> call_args_no_parens_all stab_op_eol_and_expr :
build_op(unwrap_when(unwrap_splice('$1')), '$2').
stab_expr -> stab_parens_many stab_op_eol_and_expr :
build_op(unwrap_splice('$1'), '$2').
build_op_with_meta(unwrap_splice(element(2, '$1')), '$2', parens_meta('$1')).
stab_expr -> stab_parens_many when_op expr stab_op_eol_and_expr :
build_op([{'when', meta_from_token('$2'), unwrap_splice('$1') ++ ['$3']}], '$4').
build_op_with_meta([{'when', meta_from_token('$2'), unwrap_splice(element(2, '$1')) ++ ['$3']}], '$4', parens_meta('$1')).

stab_op_eol_and_expr -> stab_op_eol expr : {'$1', '$2'}.
stab_op_eol_and_expr -> stab_op_eol : warn_empty_stab_clause('$1'), {'$1', handle_literal(nil, '$1')}.
Expand All @@ -370,7 +370,7 @@ open_paren -> '(' eol : next_is_eol('$1', '$2').
close_paren -> ')' : '$1'.
close_paren -> eol ')' : '$2'.

empty_paren -> open_paren ')' : '$1'.
empty_paren -> open_paren ')' : {'$1', '$2'}.

open_bracket -> '[' : '$1'.
open_bracket -> '[' eol : next_is_eol('$1', '$2').
Expand Down Expand Up @@ -515,8 +515,8 @@ call_args_no_parens_many_strict -> call_args_no_parens_many : '$1'.
call_args_no_parens_many_strict -> open_paren call_args_no_parens_kw close_paren : error_no_parens_strict('$1').
call_args_no_parens_many_strict -> open_paren call_args_no_parens_many close_paren : error_no_parens_strict('$1').

stab_parens_many -> open_paren call_args_no_parens_kw close_paren : ['$2'].
stab_parens_many -> open_paren call_args_no_parens_many close_paren : '$2'.
stab_parens_many -> open_paren call_args_no_parens_kw close_paren : {'$1', ['$2'], '$3'}.
stab_parens_many -> open_paren call_args_no_parens_many close_paren : {'$1', '$2', '$3'}.

% Containers

Expand Down Expand Up @@ -719,6 +719,10 @@ number_value({_, {_, _, Value}, _}) ->

%% Operators

build_op_with_meta(Left, {Op, Right}, Meta) ->
{Op1, OpMeta, Args} = build_op(Left, Op, Right),
{Op1, Meta ++ OpMeta, Args}.

build_op(Left, {Op, Right}) ->
build_op(Left, Op, Right).

Expand Down Expand Up @@ -1139,6 +1143,18 @@ unwrap_when(Args) ->
Args
end.

parens_meta({Open, Close}) ->
case ?token_metadata() of
true ->
ParensEntry = meta_from_token(Open) ++ [{closing, meta_from_token(Close)}],
[{parens, [ParensEntry]}];
false ->
[]
end;
parens_meta({Open, _Args, Close}) ->
parens_meta({Open, Close}).


%% Warnings and errors

return_error({Line, Column, _}, ErrorMessage, ErrorToken) ->
Expand Down Expand Up @@ -1290,7 +1306,7 @@ warn_nested_no_parens_keyword(Key, Value) when is_atom(Key) ->
warn_nested_no_parens_keyword(_Key, _Value) ->
ok.

warn_empty_paren({_, {Line, Column, _}}) ->
warn_empty_paren({{_, {Line, Column, _}}, _}) ->
warn(
{Line, Column},
"invalid expression (). "
Expand Down
86 changes: 86 additions & 0 deletions lib/elixir/test/elixir/kernel/parser_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,92 @@ defmodule Kernel.ParserTest do
]}
end

test "adds opening and closing information for empty block" do
string_to_quoted =
&Code.string_to_quoted!(&1, token_metadata: true, columns: true, emit_warnings: false)

file = "()"

assert string_to_quoted.(file) ==
{:__block__, [parens: [[line: 1, column: 1, closing: [line: 1, column: 2]]]], []}

file = "(())"

assert string_to_quoted.(file) ==
{:__block__,
[
parens: [
[line: 1, column: 1, closing: [line: 1, column: 4]],
[line: 1, column: 2, closing: [line: 1, column: 3]]
]
], []}
end

test "adds opening and closing information for stab arguments" do
file = "fn () -> x end "

assert Code.string_to_quoted!(file, token_metadata: true, columns: true) ==
{:fn, [closing: [line: 1, column: 12], line: 1, column: 1],
[
{:->,
[
parens: [[line: 1, column: 4, closing: [line: 1, column: 5]]],
line: 1,
column: 7
], [[], {:x, [line: 1, column: 10], nil}]}
]}

file = "fn (x, y) -> x end "

assert Code.string_to_quoted!(file, token_metadata: true, columns: true) ==
{
:fn,
[{:closing, [line: 1, column: 16]}, {:line, 1}, {:column, 1}],
[
{:->,
[
parens: [[line: 1, column: 4, closing: [line: 1, column: 9]]],
line: 1,
column: 11
],
[
[{:x, [line: 1, column: 5], nil}, {:y, [line: 1, column: 8], nil}],
{:x, [line: 1, column: 14], nil}
]}
]
}

file = "if true do (x, y) -> x end"

assert Code.string_to_quoted!(file, token_metadata: true, columns: true) ==
{
:if,
[
{:do, [line: 1, column: 9]},
{:end, [line: 1, column: 24]},
{:line, 1},
{:column, 1}
],
[
true,
[
do: [
{:->,
[
parens: [[line: 1, column: 12, closing: [line: 1, column: 17]]],
line: 1,
column: 19
],
[
[{:x, [line: 1, column: 13], nil}, {:y, [line: 1, column: 16], nil}],
{:x, [line: 1, column: 22], nil}
]}
]
]
]
}
end

test "with :literal_encoder" do
opts = [literal_encoder: &{:ok, {:__block__, &2, [&1]}}, token_metadata: true]
string_to_quoted = &Code.string_to_quoted!(&1, opts)
Expand Down
Loading