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

Reimplement typespec expansion and keyword param provider #298

Merged
merged 9 commits into from
Dec 10, 2024
Merged

Reimplement typespec expansion and keyword param provider #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e32b5cd
wip
lukaszsamson Nov 13, 2024
af957a3
nest steps
lukaszsamson Nov 23, 2024
4007f49
wip
lukaszsamson Dec 4, 2024
7d0aeb6
multiple specs and default args
lukaszsamson Dec 6, 2024
f10b933
callbacks
lukaszsamson Dec 7, 2024
fbb78e2
make callbacks params work
lukaszsamson Dec 10, 2024
501a8b3
handle multiple matching defs
lukaszsamson Dec 10, 2024
1c61439
drop not needed and broken typespec expansion code
lukaszsamson Dec 10, 2024
c5b058e
fix tests
lukaszsamson Dec 10, 2024
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
22 changes: 4 additions & 18 deletions lib/elixir_sense/core/introspection.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,7 @@ defmodule ElixirSense.Core.Introspection do
case get_callbacks_and_docs(mod) do
{callbacks, []} ->
Enum.map(callbacks, fn {{name, arity}, [spec | _]} ->
spec_ast =
Typespec.spec_to_quoted(name, spec)
|> Macro.prewalk(&drop_macro_env/1)
spec_ast = Typespec.spec_to_quoted(name, spec)

signature = get_typespec_signature(spec_ast, arity)
definition = format_spec_ast(spec_ast)
Expand Down Expand Up @@ -315,7 +313,6 @@ defmodule ElixirSense.Core.Introspection do
def format_spec_ast(spec_ast) do
parts =
spec_ast
|> Macro.prewalk(&drop_macro_env/1)
|> extract_spec_ast_parts

name_str = Macro.to_string(parts.name)
Expand Down Expand Up @@ -359,9 +356,7 @@ defmodule ElixirSense.Core.Introspection do

case found do
{{name, _}, [spec | _]} ->
ast =
Typespec.spec_to_quoted(name, spec)
|> Macro.prewalk(&drop_macro_env/1)
ast = Typespec.spec_to_quoted(name, spec)

get_returns_from_spec_ast(ast)

Expand Down Expand Up @@ -444,9 +439,7 @@ defmodule ElixirSense.Core.Introspection do
}

{_, [spec | _]} ->
spec_ast =
Typespec.spec_to_quoted(spec_name, spec)
|> Macro.prewalk(&drop_macro_env/1)
spec_ast = Typespec.spec_to_quoted(spec_name, spec)

spec_ast =
if kind == :macrocallback do
Expand Down Expand Up @@ -477,11 +470,6 @@ defmodule ElixirSense.Core.Introspection do
{callbacks, docs || []}
end

defp drop_macro_env({name, meta, [{:"::", _, [_, {{:., _, [Macro.Env, :t]}, _, _}]} | args]}),
do: {name, meta, args}

defp drop_macro_env(other), do: other

defp get_typespec_signature({:when, _, [{:"::", _, [{name, meta, args}, _]}, _]}, arity) do
to_string_with_parens({name, meta, strip_types(args, arity)})
end
Expand Down Expand Up @@ -787,9 +775,7 @@ defmodule ElixirSense.Core.Introspection do

specs
|> Enum.map_join("\n", fn spec ->
quoted =
Typespec.spec_to_quoted(name, spec)
|> Macro.prewalk(&drop_macro_env/1)
quoted = Typespec.spec_to_quoted(name, spec)

quoted =
if is_macro do
Expand Down
Loading
Loading