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

complete with parens if there are remote calls #916

Merged
merged 2 commits into from
Jun 26, 2023
Merged

complete with parens if there are remote calls #916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
050dd67
complete with parens if there are remote calls
oo6 Jun 23, 2023
d2af014
move to context and using Code.Fragment.cursor_context/1
oo6 Jun 24, 2023
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
5 changes: 4 additions & 1 deletion apps/language_server/lib/language_server/providers/completion.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
} = info

%{
prefix: prefix,
pipe_before?: pipe_before?,
capture_before?: capture_before?,
text_after_cursor: text_after_cursor
Expand All @@ -1038,7 +1039,9 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
locals_without_parens = Keyword.get(options, :locals_without_parens)
signature_help_supported? = Keyword.get(options, :signature_help_supported, false)
signature_after_complete? = Keyword.get(options, :signature_after_complete, true)
with_parens? = function_name_with_parens?(name, arity, locals_without_parens)

remote_calls? = String.contains?(prefix, ".")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move this to context so the check is done once and not for every completion. Also consider using match?({:dot, _, _}, Code.Fragment.cursor_context(prefix))

iex(2)> Code.Fragment.cursor_context("a.")
{:dot, {:var, ~c"a"}, []}
iex(3)> Code.Fragment.cursor_context("a.a")
{:dot, {:var, ~c"a"}, ~c"a"}
iex(4)> Code.Fragment.cursor_context("A.a")
{:dot, {:alias, ~c"A"}, ~c"a"}
iex(5)> Code.Fragment.cursor_context("A.") 
{:dot, {:alias, ~c"A"}, []}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL, do we need to exclude a. or A.... ?

remote_calls? = match?({:dot, _, [_ | _]}, Code.Fragment.cursor_context(prefix))

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it's good now

with_parens? = remote_calls? || function_name_with_parens?(name, arity, locals_without_parens)

trigger_signature? = signature_help_supported? && ((arity == 1 && !pipe_before?) || arity > 1)

Expand Down
19 changes: 19 additions & 0 deletions apps/language_server/test/providers/completion_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,25 @@ defmodule ElixirLS.LanguageServer.Providers.CompletionTest do
assert item["command"] == @signature_command
end

test "complete with parens if there are remote calls" do
text = """
defmodule MyModule do
def dummy_function() do
Map.drop
# ^
end
end
"""

{line, char} = {2, 12}
TestUtils.assert_has_cursor_char(text, line, char)

opts = Keyword.merge(@supports, locals_without_parens: MapSet.new(drop: 2))
{:ok, %{"items" => [item]}} = Completion.completion(text, line, char, opts)

assert item["insertText"] == "drop($1)$0"
end

test "function with arity 0 does not triggers signature" do
text = """
defmodule MyModule do
Expand Down