Skip to content
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

Jump to bottom

Add heuristic to improve completion in exports. #1490

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Add heuristic to improve completion in exports. #1490

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
42 changes: 41 additions & 1 deletion apps/els_lsp/src/els_completion_provider.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ definitions(Document, POIKind, ItemFormat, ExportedOnly) ->
{item_format(), els_poi:poi_kind() | any}.
completion_context(#{text := Text} = Document, Line, Column, Tokens) ->
ItemFormat =
case is_in(Document, Line, Column, [export, export_type]) of
case is_in_export(Document, Line, Column) of
true ->
arity_only;
false ->
Expand Down Expand Up @@ -801,6 +801,28 @@ completion_context(#{text := Text} = Document, Line, Column, Tokens) ->
end,
{ItemFormat, POIKind}.

-spec is_in_export(els_dt_document:item(), line(), column()) -> boolean().
is_in_export(#{text := Text} = Document, Line, Column) ->
%% Sometimes is_in will be confused because -export() failed to be parsed.
%% In such case we can use a heuristic to determine if we are inside
%% an export.
is_in(Document, Line, Column, [export, export_type]) orelse
is_in_export_heuristic(Text, Line - 1).

-spec is_in_export_heuristic(binary(), line()) -> boolean().
is_in_export_heuristic(Text, Line) ->
case els_text:line(Text, Line) of
<<"-export", _/binary>> ->
%% In export
true;
<<" ", _/binary>> when Line > 1 ->
%% Indented line, continue to search previous line
is_in_export_heuristic(Text, Line - 1);
_ ->
%% Not in export
false
end.

-spec resolve_definitions(
uri(),
[els_poi:poi()],
Expand Down Expand Up @@ -1335,4 +1357,22 @@ parse_record_test() ->
parse_record(<<"#foo{x = #bar{y = #baz{}}">>, <<"}.">>)
).

is_exported_heuristic_test_() ->
Text = <<
"-module(test).\n"
"-export([foo/0\n"
" bar/0\n"
" baz/0\n"
" ]).\n"
"-define(FOO, foo).\n"
>>,
[
?_assertEqual(false, is_in_export_heuristic(Text, 0)),
?_assertEqual(true, is_in_export_heuristic(Text, 1)),
?_assertEqual(true, is_in_export_heuristic(Text, 2)),
?_assertEqual(true, is_in_export_heuristic(Text, 3)),
?_assertEqual(true, is_in_export_heuristic(Text, 4)),
?_assertEqual(false, is_in_export_heuristic(Text, 5))
].

-endif.
Loading