Skip to content

Commit 5cef583

Browse files
committed
format
1 parent 4d93205 commit 5cef583

File tree

9 files changed

+26
-16
lines changed

9 files changed

+26
-16
lines changed

apps/language_server/lib/language_server/ast_utils.ex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,12 @@ defmodule ElixirLS.LanguageServer.AstUtils do
9292
line = Keyword.get(meta, :line) - 1
9393
column = Keyword.get(meta, :column) - 1
9494
{end_line, end_column} = get_eoe_by_formatting(ast, {line, column}, options)
95+
9596
# on elixir 1.15-1.17 formatter changes charlist '' to ~c"" sigil so we need to correct columns
9697
# if charlist is single line
9798
correction =
98-
if end_line == line and Version.match?(System.version(), ">= 1.15.0-dev") and Version.match?(System.version(), "< 1.18.0-dev") do
99+
if end_line == line and Version.match?(System.version(), ">= 1.15.0-dev") and
100+
Version.match?(System.version(), "< 1.18.0-dev") do
99101
2
100102
else
101103
0

apps/language_server/lib/language_server/diagnostics.ex

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -472,12 +472,14 @@ defmodule ElixirLS.LanguageServer.Diagnostics do
472472
for typing_trace <- typing_traces, trace <- typing_trace.traces do
473473
case typing_trace.type do
474474
:variable ->
475-
{line, column} = case trace do
476-
%{meta: meta} ->
477-
{Keyword.get(meta, :line, 1), Keyword.get(meta, :column, 1)}
478-
_ ->
479-
{Keyword.get(trace, :line, 1), Keyword.get(trace, :column, 1)}
480-
end
475+
{line, column} =
476+
case trace do
477+
%{meta: meta} ->
478+
{Keyword.get(meta, :line, 1), Keyword.get(meta, :column, 1)}
479+
480+
_ ->
481+
{Keyword.get(trace, :line, 1), Keyword.get(trace, :column, 1)}
482+
end
481483

482484
message = "given type: #{trace.formatted_type}"
483485

apps/language_server/lib/language_server/dialyzer/manifest.ex

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,10 @@ defmodule ElixirLS.LanguageServer.Dialyzer.Manifest do
167167
modules_to_paths =
168168
for app <- @erlang_apps ++ @elixir_apps,
169169
path <-
170-
Path.join([SourceFile.Path.escape_for_wildcard(Application.app_dir(app)), "**/*.beam"])
170+
Path.join([
171+
SourceFile.Path.escape_for_wildcard(Application.app_dir(app)),
172+
"**/*.beam"
173+
])
171174
|> Path.wildcard(),
172175
into: %{},
173176
do: {pathname_to_module(path), path |> String.to_charlist()}

apps/language_server/lib/language_server/markdown_utils.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ defmodule ElixirLS.LanguageServer.MarkdownUtils do
408408
@kernel_special_forms_exports Kernel.SpecialForms.__info__(:macros)
409409
@kernel_exports Kernel.__info__(:macros) ++ Kernel.__info__(:functions)
410410

411-
defp get_module_fun_arity("..///3"), do: {Kernel, :"..//", 3}
411+
defp get_module_fun_arity("..///3"), do: {Kernel, :..//, 3}
412412
defp get_module_fun_arity("../2"), do: {Kernel, :.., 2}
413413
defp get_module_fun_arity("../0"), do: {Kernel, :.., 0}
414414
defp get_module_fun_arity("./2"), do: {Kernel.SpecialForms, :., 2}

apps/language_server/lib/language_server/providers/code_lens/type_spec/contract_translator.ex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeLens.TypeSpec.ContractTranslator
148148
{ast, :__deriving__} ->
149149
# do not change __deriving__ macrocallback
150150
ast
151+
151152
{{:"::", [], [{:foo, [], [_ | rest_args]}, res]}, _} ->
152153
# ordinary defs in defprotocol do not have when and have at least 1 arg
153154
# first arg in defprotocol defs is always of type t

apps/language_server/lib/language_server/providers/completion/reducers/callbacks.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Reducers.Callbacks do
8282
metadata: metadata
8383
} <-
8484
Introspection.get_callbacks_with_docs(mod),
85-
mod != Protocol or {name, arity} not in [impl_for!: 1, impl_for: 1, __protocol__: 1],
85+
mod != Protocol or
86+
{name, arity} not in [impl_for!: 1, impl_for: 1, __protocol__: 1],
8687
hint == "" or def_prefix?(hint, spec) or Matcher.match?("#{name}", hint) do
8788
desc = Introspection.extract_summary_from_docs(doc)
8889

apps/language_server/lib/language_server/providers/completion/reducers/protocol.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Reducers.Protocol do
6969
else
7070
for {{name, arity}, {_type, args, docs, metadata, spec}} <-
7171
Introspection.module_functions_info(protocol),
72-
not match?(%{implementing: Protocol}, metadata),
72+
not match?(%{implementing: Protocol}, metadata),
7373
hint == "" or String.starts_with?("def", hint) or Matcher.match?("#{name}", hint) do
7474
%{
7575
type: :protocol_function,

apps/language_server/lib/language_server/providers/formatting.ex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ defmodule ElixirLS.LanguageServer.Providers.Formatting do
1414
case SourceFile.formatter_for(uri, project_dir, mix_project?) do
1515
{:ok, {formatter, opts}} ->
1616
formatter_exs_dir = opts[:root]
17+
1718
if should_format?(uri, formatter_exs_dir, opts[:inputs], project_dir) do
1819
do_format(source_file, formatter, opts)
1920
else

apps/language_server/test/providers/signature_help/signature_test.exs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,11 +1396,11 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
13961396
assert Signature.signature(code, 2, 8) == :none
13971397
else
13981398
assert %{
1399-
signatures: [
1400-
%{name: "defmodule"}
1401-
],
1402-
active_param: 1
1403-
} = Signature.signature(code, 2, 8)
1399+
signatures: [
1400+
%{name: "defmodule"}
1401+
],
1402+
active_param: 1
1403+
} = Signature.signature(code, 2, 8)
14041404
end
14051405
end
14061406

0 commit comments

Comments
 (0)